From a17949e73077541437e05d42faed7ed44f5f6fce Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Thu, 16 Mar 2023 13:47:38 +1100 Subject: [PATCH] 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 --- docs/tutorial/advanced_control_flow.md | 92 +++---- docs/tutorial/documenting.md | 4 +- docs/tutorial/other_functions.md | 4 +- include/functions.h | 4 +- include/macros.h | 2 +- include/z64message.h | 2 +- include/z64save.h | 11 +- src/code/code_800E8EA0.c | 2 +- src/code/z_demo.c | 8 +- src/code/z_game_over.c | 2 +- src/code/z_message.c | 6 +- .../actors/ovl_Bg_Ingate/z_bg_ingate.c | 6 +- .../actors/ovl_Dm_Char08/z_dm_char08.c | 2 +- .../actors/ovl_Door_Warp1/z_door_warp1.c | 2 +- .../ovl_En_Akindonuts/z_en_akindonuts.c | 4 +- .../actors/ovl_En_Aob_01/z_en_aob_01.c | 24 +- src/overlays/actors/ovl_En_Az/z_en_az.c | 6 +- .../actors/ovl_En_Baisen/z_en_baisen.c | 4 +- .../actors/ovl_En_Bji_01/z_en_bji_01.c | 22 +- .../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c | 12 +- .../actors/ovl_En_Bombers/z_en_bombers.c | 6 +- .../actors/ovl_En_Bombers2/z_en_bombers2.c | 14 +- .../actors/ovl_En_Bomjima/z_en_bomjima.c | 24 +- .../actors/ovl_En_Bomjimb/z_en_bomjimb.c | 4 +- src/overlays/actors/ovl_En_Cow/z_en_cow.c | 8 +- src/overlays/actors/ovl_En_Daiku/z_en_daiku.c | 2 +- .../actors/ovl_En_Daiku2/z_en_daiku2.c | 4 +- .../ovl_En_Demo_heishi/z_en_demo_heishi.c | 2 +- src/overlays/actors/ovl_En_Dno/z_en_dno.c | 22 +- src/overlays/actors/ovl_En_Elf/z_en_elf.c | 18 +- src/overlays/actors/ovl_En_Fish2/z_en_fish2.c | 2 +- .../actors/ovl_En_Fishing/z_en_fishing.c | 60 ++--- src/overlays/actors/ovl_En_Fsn/z_en_fsn.c | 20 +- src/overlays/actors/ovl_En_Fu/z_en_fu.c | 16 +- .../actors/ovl_En_Gakufu/z_en_gakufu.c | 2 +- src/overlays/actors/ovl_En_Geg/z_en_geg.c | 4 +- .../actors/ovl_En_Ginko_Man/z_en_ginko_man.c | 4 +- src/overlays/actors/ovl_En_Gs/z_en_gs.c | 2 +- .../ovl_En_Guard_Nuts/z_en_guard_nuts.c | 6 +- .../actors/ovl_En_Guruguru/z_en_guruguru.c | 4 +- src/overlays/actors/ovl_En_Hgo/z_en_hgo.c | 2 +- .../ovl_En_Hidden_Nuts/z_en_hidden_nuts.c | 2 +- .../actors/ovl_En_Hint_Skb/z_en_hint_skb.c | 2 +- src/overlays/actors/ovl_En_Hs/z_en_hs.c | 10 +- src/overlays/actors/ovl_En_In/z_en_in.c | 4 +- .../actors/ovl_En_Invadepoh/z_en_invadepoh.c | 4 +- .../actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c | 6 +- src/overlays/actors/ovl_En_Js/z_en_js.c | 70 ++--- .../actors/ovl_En_Kaizoku/z_en_kaizoku.c | 8 +- .../actors/ovl_En_Kakasi/z_en_kakasi.c | 14 +- .../actors/ovl_En_Kendo_Js/z_en_kendo_js.c | 10 +- src/overlays/actors/ovl_En_Kgy/z_en_kgy.c | 28 +- .../actors/ovl_En_Kujiya/z_en_kujiya.c | 4 +- .../actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c | 10 +- .../actors/ovl_En_Look_Nuts/z_en_look_nuts.c | 2 +- src/overlays/actors/ovl_En_Ma4/z_en_ma4.c | 10 +- .../actors/ovl_En_Ma_Yto/z_en_ma_yto.c | 4 +- .../actors/ovl_En_Minifrog/z_en_minifrog.c | 73 +++-- src/overlays/actors/ovl_En_Mk/z_en_mk.c | 28 +- src/overlays/actors/ovl_En_Mm2/z_en_mm2.c | 2 +- src/overlays/actors/ovl_En_Mm3/z_en_mm3.c | 16 +- src/overlays/actors/ovl_En_Ms/z_en_ms.c | 12 +- .../actors/ovl_En_Mt_tag/z_en_mt_tag.c | 6 +- src/overlays/actors/ovl_En_Muto/z_en_muto.c | 2 +- .../actors/ovl_En_Onpuman/z_en_onpuman.c | 6 +- src/overlays/actors/ovl_En_Ossan/z_en_ossan.c | 28 +- src/overlays/actors/ovl_En_Ot/z_en_ot.c | 4 +- src/overlays/actors/ovl_En_Owl/z_en_owl.c | 36 +-- .../actors/ovl_En_Pamera/z_en_pamera.c | 2 +- .../actors/ovl_En_Rail_Skb/z_en_rail_skb.c | 4 +- .../actors/ovl_En_Recepgirl/z_en_recepgirl.c | 2 +- src/overlays/actors/ovl_En_Rz/z_en_rz.c | 10 +- .../actors/ovl_En_Sekihi/z_en_sekihi.c | 10 +- .../actors/ovl_En_Sellnuts/z_en_sellnuts.c | 8 +- src/overlays/actors/ovl_En_Sob1/z_en_sob1.c | 24 +- src/overlays/actors/ovl_En_Ssh/z_en_ssh.c | 4 +- src/overlays/actors/ovl_En_Sth/z_en_sth.c | 40 +-- .../ovl_En_Stone_heishi/z_en_stone_heishi.c | 18 +- .../ovl_En_Stop_heishi/z_en_stop_heishi.c | 4 +- .../ovl_En_Syateki_Man/z_en_syateki_man.c | 56 ++-- .../ovl_En_Talk_Gibud/z_en_talk_gibud.c | 2 +- src/overlays/actors/ovl_En_Test3/z_en_test3.c | 4 +- .../actors/ovl_En_Time_Tag/z_en_time_tag.c | 254 ++++++++++-------- .../actors/ovl_En_Time_Tag/z_en_time_tag.h | 55 +++- src/overlays/actors/ovl_En_Tk/z_en_tk.c | 24 +- src/overlays/actors/ovl_En_Toto/z_en_toto.c | 4 +- src/overlays/actors/ovl_En_Trt/z_en_trt.c | 30 +-- src/overlays/actors/ovl_En_Trt2/z_en_trt2.c | 2 +- src/overlays/actors/ovl_En_Tsn/z_en_tsn.c | 56 ++-- src/overlays/actors/ovl_En_Yb/z_en_yb.c | 10 +- src/overlays/actors/ovl_En_Zob/z_en_zob.c | 30 +-- src/overlays/actors/ovl_En_Zod/z_en_zod.c | 20 +- src/overlays/actors/ovl_En_Zog/z_en_zog.c | 16 +- src/overlays/actors/ovl_En_Zos/z_en_zos.c | 36 +-- src/overlays/actors/ovl_En_Zot/z_en_zot.c | 80 +++--- src/overlays/actors/ovl_En_Zov/z_en_zov.c | 14 +- src/overlays/actors/ovl_En_Zow/z_en_zow.c | 4 +- .../actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c | 2 +- src/overlays/actors/ovl_Obj_Um/z_obj_um.c | 2 +- .../ovl_Obj_Warpstone/z_obj_warpstone.c | 2 +- tools/disasm/functions.txt | 34 +-- tools/namefixer.py | 2 + tools/sizes/code_functions.csv | 4 +- tools/weekeventregconvert.py | 4 +- 104 files changed, 904 insertions(+), 815 deletions(-) diff --git a/docs/tutorial/advanced_control_flow.md b/docs/tutorial/advanced_control_flow.md index 95b0d6b863..528b052f99 100644 --- a/docs/tutorial/advanced_control_flow.md +++ b/docs/tutorial/advanced_control_flow.md @@ -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; } } diff --git a/docs/tutorial/documenting.md b/docs/tutorial/documenting.md index 68c90ef665..e7e82e5e68 100644 --- a/docs/tutorial/documenting.md +++ b/docs/tutorial/documenting.md @@ -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); } } ``` diff --git a/docs/tutorial/other_functions.md b/docs/tutorial/other_functions.md index 1c8ba6b5bc..c6ac63a649 100644 --- a/docs/tutorial/other_functions.md +++ b/docs/tutorial/other_functions.md @@ -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); } } ``` diff --git a/include/functions.h b/include/functions.h index d3521cfc97..e5f0ccca61 100644 --- a/include/functions.h +++ b/include/functions.h @@ -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); diff --git a/include/macros.h b/include/macros.h index 77d3eadad5..a4923ac060 100644 --- a/include/macros.h +++ b/include/macros.h @@ -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))) diff --git a/include/z64message.h b/include/z64message.h index 7d4723e7be..82c84a3f82 100644 --- a/include/z64message.h +++ b/include/z64message.h @@ -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; diff --git a/include/z64save.h b/include/z64save.h index 60d3a9a2b2..d34b5f0d95 100644 --- a/include/z64save.h +++ b/include/z64save.h @@ -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) diff --git a/src/code/code_800E8EA0.c b/src/code/code_800E8EA0.c index 7485f2d3a7..93970cc6a2 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 7d0c1ade37..c3e3ecff09 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 1e87a6a17a..ec5d3b05ca 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 97db5e72d4..cc1e0c8769 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; } diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c index 67fedd58c6..c1cc4daa6b 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -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; } } diff --git a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c index 5f08b839fd..66d4a7f860 100644 --- a/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c +++ b/src/overlays/actors/ovl_Dm_Char08/z_dm_char08.c @@ -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; diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 51e2ca6617..57fa310e18 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -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); diff --git a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c index 3f4f714159..d22c2d2581 100644 --- a/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c +++ b/src/overlays/actors/ovl_En_Akindonuts/z_en_akindonuts.c @@ -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; } } diff --git a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c index fa75439ea8..2da9566edb 100644 --- a/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c +++ b/src/overlays/actors/ovl_En_Aob_01/z_en_aob_01.c @@ -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); } diff --git a/src/overlays/actors/ovl_En_Az/z_en_az.c b/src/overlays/actors/ovl_En_Az/z_en_az.c index 69fda707cc..ff865d99f4 100644 --- a/src/overlays/actors/ovl_En_Az/z_en_az.c +++ b/src/overlays/actors/ovl_En_Az/z_en_az.c @@ -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: diff --git a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c index 8812ae6d35..3021ffbd2c 100644 --- a/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c +++ b/src/overlays/actors/ovl_En_Baisen/z_en_baisen.c @@ -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 { diff --git a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c index ed7b8c194e..5b753ba54e 100644 --- a/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c +++ b/src/overlays/actors/ovl_En_Bji_01/z_en_bji_01.c @@ -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); diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index a0ab44eb9d..8481b88a96 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -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; diff --git a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c index 7d678b8add..f96809878b 100644 --- a/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c +++ b/src/overlays/actors/ovl_En_Bombers/z_en_bombers.c @@ -338,7 +338,7 @@ void func_80C03FAC(EnBombers* this, PlayState* play) { if ((this->unk_2A6 == Message_GetState(&play->msgCtx)) && Message_ShouldAdvance(play)) { sp2A = 0; - func_801477B4(play); + Message_CloseTextbox(play); this->unk_2A6 = TEXT_STATE_5; if ((this->actor.textId == 0x73D) || (this->actor.textId == 0x73E) || (this->actor.textId == 0x73F)) { @@ -420,7 +420,7 @@ void func_80C03FAC(EnBombers* this, PlayState* play) { break; case 1: - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); break; } } @@ -449,7 +449,7 @@ void func_80C04354(EnBombers* this, PlayState* play) { void func_80C043C8(EnBombers* this, PlayState* play) { Math_SmoothStepToS(&this->unk_288, this->unk_28E, 1, 0x3E8, 0); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80C042F8(this); } } diff --git a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c index 5d4432de12..d479e0745e 100644 --- a/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c +++ b/src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c @@ -233,7 +233,7 @@ void func_80C04D8C(EnBombers2* this, PlayState* play) { if (correctDigits >= 5) { this->textIdIndex = 6; this->actor.textId = sTextIds[this->textIdIndex]; - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); Actor_PlaySfx(&this->actor, NA_SE_SY_PIECE_OF_HEART); this->talkState = TEXT_STATE_5; return; @@ -241,7 +241,7 @@ void func_80C04D8C(EnBombers2* this, PlayState* play) { } if (Text_GetFaceReaction(play, 0x15) != 0) { this->unk_28E = 0; - func_801477B4(play); + Message_CloseTextbox(play); func_80C04B40(this); } else { s32 j; @@ -252,13 +252,13 @@ void func_80C04D8C(EnBombers2* this, PlayState* play) { case 5: case 7: this->unk_28E = 0; - func_801477B4(play); + Message_CloseTextbox(play); func_80C04B40(this); break; case 2: this->textIdIndex = 3; this->actor.textId = sTextIds[this->textIdIndex]; - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); this->talkState = TEXT_STATE_15; break; case 3: @@ -268,13 +268,13 @@ void func_80C04D8C(EnBombers2* this, PlayState* play) { this->textIdIndex = 4; Actor_PlaySfx(&this->actor, NA_SE_SY_ERROR); this->actor.textId = sTextIds[this->textIdIndex]; - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); this->talkState = TEXT_STATE_5; break; case 4: this->textIdIndex = 5; this->actor.textId = sTextIds[this->textIdIndex]; - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); this->talkState = TEXT_STATE_5; break; case 6: @@ -324,7 +324,7 @@ void func_80C0520C(EnBombers2* this, PlayState* play) { this->unk_2B6 = this->actor.yawTowardsPlayer; this->actor.speed = 0.0f; if (fabsf(this->actor.world.rot.y - this->actor.yawTowardsPlayer) < 100.0f) { - func_801477B4(play); + Message_CloseTextbox(play); this->talkState = TEXT_STATE_5; this->textIdIndex = 7; EnBombers2_ChangeAnim(this, 6, 1.0f); diff --git a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c index b0c879d0e7..8f3b4d3f3a 100644 --- a/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c +++ b/src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c @@ -580,7 +580,7 @@ void func_80BFF430(EnBomjima* this, PlayState* play) { Actor_ChangeFocus(&this->actor, play, &bombal->actor); CLEAR_WEEKEVENTREG(WEEKEVENTREG_83_04); func_80BFE65C(this); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BFEA94; } } @@ -594,7 +594,7 @@ void func_80BFF4F4(EnBomjima* this) { void func_80BFF52C(EnBomjima* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); if (play->msgCtx.choiceIndex == 0) { Player* player = GET_PLAYER(play); @@ -608,7 +608,7 @@ void func_80BFF52C(EnBomjima* this, PlayState* play) { } else { this->actor.textId = D_80C00A70[this->unk_2C8]; } - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); play_sound(NA_SE_SY_FOUND); func_80BFE494(this, 15, 1.0f); this->action = EN_BOMJIMA_ACTION_5; @@ -626,7 +626,7 @@ void func_80BFF52C(EnBomjima* this, PlayState* play) { this->actor.textId = D_80C00A70[this->unk_2C8]; this->unk_2EA = 1; } - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); func_80C00234(this); } } @@ -637,7 +637,7 @@ void func_80BFF6CC(EnBomjima* this, PlayState* play) { if (this->animLastFrame <= curFrame) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80BFE494(this, 1, 1.0f); this->actionFunc = func_80BFF754; } @@ -735,14 +735,14 @@ void func_80BFF9B0(EnBomjima* this, PlayState* play) { } else { this->actor.textId = D_80C00A70[this->unk_2C8]; } - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); this->actionFunc = func_80BFFB40; } } void func_80BFFB40(EnBomjima* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80BFE494(this, 15, 1.0f); D_80C009F0 = 100; this->unk_2DC = 0; @@ -768,7 +768,7 @@ void func_80BFFBC4(EnBomjima* this, PlayState* play) { Math_SmoothStepToS(&this->unk_290, this->unk_2DC, 1, 5000, 0); if (D_80C009F0 >= 104) { D_80C009F0 = 0; - func_801477B4(play); + Message_CloseTextbox(play); play->nextEntrance = Entrance_CreateFromSpawn(6); gSaveContext.nextCutsceneIndex = 0; play->transitionTrigger = TRANS_TRIGGER_START; @@ -944,13 +944,13 @@ void func_80C00284(EnBomjima* this, PlayState* play) { func_80BFF3F0(this); } else { func_80BFE65C(this); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BFEA94; } return; } - func_801477B4(play); + Message_CloseTextbox(play); switch (this->unk_2CA) { case 0: @@ -984,7 +984,7 @@ void func_80C00284(EnBomjima* this, PlayState* play) { } this->actor.textId = D_80C00A70[this->unk_2C8]; } - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); if ((this->unk_2C8 == 7) || (this->unk_2C8 == 12)) { func_80BFF4F4(this); } @@ -993,7 +993,7 @@ void func_80C00284(EnBomjima* this, PlayState* play) { case 3: this->unk_2C8++; this->actor.textId = D_80C00A8C[this->unk_2C8]; - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); if (this->unk_2C8 >= 2) { func_80BFE494(this, 17, 1.0f); } diff --git a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c index e1a5ef42f6..c8de769c77 100644 --- a/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c +++ b/src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c @@ -760,7 +760,7 @@ void func_80C02A14(EnBomjimb* this, PlayState* play) { } if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); if ((this->unk_2CA == 8) && (gSaveContext.save.bombersCaughtNum >= 5)) { func_80C02CA4(this, play); } else { @@ -779,7 +779,7 @@ void func_80C02BCC(EnBomjimb* this, PlayState* play) { if (this->unk_2C0 == 0) { player->actor.freezeTimer = 3; if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->unk_2C0 = 1; player->stateFlags1 &= ~PLAYER_STATE1_10000000; } diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index 67af5c22d0..1de5d137e1 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -202,7 +202,7 @@ void EnCow_UpdateAnimation(EnCow* this, PlayState* play) { void EnCow_TalkEnd(EnCow* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { this->actor.flags &= ~ACTOR_FLAG_10000; - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnCow_Idle; } } @@ -226,7 +226,7 @@ void EnCow_GiveMilkWait(EnCow* this, PlayState* play) { void EnCow_GiveMilk(EnCow* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { this->actor.flags &= ~ACTOR_FLAG_10000; - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnCow_GiveMilkWait; Actor_OfferGetItem(&this->actor, play, GI_MILK, 10000.0f, 100.0f); } @@ -235,10 +235,10 @@ void EnCow_GiveMilk(EnCow* this, PlayState* play) { void EnCow_CheckForEmptyBottle(EnCow* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { if (Inventory_HasEmptyBottle()) { - func_80151938(play, 0x32C9); // Text to give milk. + Message_ContinueTextbox(play, 0x32C9); // Text to give milk. this->actionFunc = EnCow_GiveMilk; } else { - func_80151938(play, 0x32CA); // Text if you don't have an empty bottle. + Message_ContinueTextbox(play, 0x32CA); // Text if you don't have an empty bottle. this->actionFunc = EnCow_TalkEnd; } } diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index 5b4c8bb058..b68634f81d 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -244,7 +244,7 @@ void func_80943BDC(EnDaiku* this, PlayState* play) { } if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80943820(this); } } diff --git a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c index f0c1dd47ad..e93cf44931 100644 --- a/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c +++ b/src/overlays/actors/ovl_En_Daiku2/z_en_daiku2.c @@ -297,7 +297,7 @@ void func_80BE6BC0(EnDaiku2* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { s32 day = gSaveContext.save.day - 1; - func_801477B4(play); + Message_CloseTextbox(play); if (this->unk_288 == 2) { this->actionFunc = func_80BE6D40; @@ -305,7 +305,7 @@ void func_80BE6BC0(EnDaiku2* this, PlayState* play) { this->actionFunc = func_80BE6EF0; } else if ((this->unk_28A == 0) || (this->unk_28A == 2)) { this->unk_28A++; - func_80151938(play, sTextIds[this->unk_28A]); + Message_ContinueTextbox(play, sTextIds[this->unk_28A]); } else { switch (day) { case 0: diff --git a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c index 2e92f06847..0d7de9cf13 100644 --- a/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c +++ b/src/overlays/actors/ovl_En_Demo_heishi/z_en_demo_heishi.c @@ -143,7 +143,7 @@ void EnDemoheishi_SetupTalk(EnDemoheishi* this) { void EnDemoheishi_Talk(EnDemoheishi* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); EnDemoheishi_SetupIdle(this); } } diff --git a/src/overlays/actors/ovl_En_Dno/z_en_dno.c b/src/overlays/actors/ovl_En_Dno/z_en_dno.c index 59d7707b79..2a60cec767 100644 --- a/src/overlays/actors/ovl_En_Dno/z_en_dno.c +++ b/src/overlays/actors/ovl_En_Dno/z_en_dno.c @@ -441,7 +441,7 @@ void func_80A71F18(EnDno* this, PlayState* play) { case EN_DNO_ANIM_IMPLORE_END: if (this->skelAnime.curFrame == this->skelAnime.endFrame) { - func_801477B4(play); + Message_CloseTextbox(play); SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE, &this->animIndex); func_80A71B68(this, play); @@ -474,7 +474,7 @@ void func_80A71F18(EnDno* this, PlayState* play) { case EN_DNO_ANIM_IMPLORE_END: if (this->skelAnime.curFrame == this->skelAnime.endFrame) { - func_801477B4(play); + Message_CloseTextbox(play); SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimations, EN_DNO_ANIM_IDLE, &this->animIndex); func_80A71B68(this, play); @@ -485,13 +485,13 @@ void func_80A71F18(EnDno* this, PlayState* play) { case 0x80C: if (Message_ShouldAdvance(play)) { - func_80151938(play, 0x80D); + Message_ContinueTextbox(play, 0x80D); } break; case 0x80D: if (Message_ShouldAdvance(play)) { - func_80151938(play, 0x80E); + Message_ContinueTextbox(play, 0x80E); } break; @@ -505,21 +505,21 @@ void func_80A71F18(EnDno* this, PlayState* play) { &this->animIndex); } } else if ((this->animIndex == EN_DNO_ANIM_IDLE) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80A71B68(this, play); } break; case 0x80F: if (Message_ShouldAdvance(play)) { - func_80151938(play, 0x810); + Message_ContinueTextbox(play, 0x810); } break; case 0x810: if (Message_ShouldAdvance(play)) { this->unk_3B0 |= 0x20; - func_801477B4(play); + Message_CloseTextbox(play); func_80A71B68(this, play); break; } @@ -541,7 +541,7 @@ void func_80A71F18(EnDno* this, PlayState* play) { case 0x811: if (Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80A71B68(this, play); } break; @@ -676,7 +676,7 @@ void func_80A725F8(EnDno* this, PlayState* play) { this->getItemId = GI_MASK_SCENTS; } Actor_OfferGetItem(&this->actor, play, this->getItemId, 60.0f, 60.0f); - func_801477B4(play); + Message_CloseTextbox(play); func_80A72B84(this, play); } break; @@ -699,14 +699,14 @@ void func_80A725F8(EnDno* this, PlayState* play) { } } else if ((this->animIndex == EN_DNO_ANIM_GREETING_WITH_CANDLE) && (this->skelAnime.curFrame == this->skelAnime.endFrame)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80A72438(this, play); } break; case 0x806: if (Message_ShouldAdvance(play)) { - func_80151938(play, 0x800); + Message_ContinueTextbox(play, 0x800); } break; diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c index 3c3b99551f..13075fd55c 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1376,11 +1376,11 @@ void func_8088FE64(Actor* thisx, PlayState* play2) { switch (play->msgCtx.choiceIndex) { case 0: - func_80151938(play, play->msgCtx.currentTextId - 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId - 1); break; case 1: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; } } @@ -1390,7 +1390,7 @@ void func_8088FE64(Actor* thisx, PlayState* play2) { if (Message_ShouldAdvance(play)) { switch (play->msgCtx.currentTextId) { case 0x240: - func_80151938(play, 0x245); + Message_ContinueTextbox(play, 0x245); break; case 0x21D: @@ -1407,28 +1407,28 @@ void func_8088FE64(Actor* thisx, PlayState* play2) { case 0x244: switch (CURRENT_DAY) { case 1: - func_80151938(play, 0x246); + Message_ContinueTextbox(play, 0x246); break; case 2: - func_80151938(play, 0x247); + Message_ContinueTextbox(play, 0x247); break; case 3: if (!gSaveContext.save.isNight) { - func_80151938(play, 0x248); + Message_ContinueTextbox(play, 0x248); } else if ((gSaveContext.save.time < CLOCK_TIME(6, 0)) && CHECK_WEEKEVENTREG(WEEKEVENTREG_74_20)) { - func_80151938(play, 0x225); + Message_ContinueTextbox(play, 0x225); } else { - func_80151938(play, 0x249); + Message_ContinueTextbox(play, 0x249); } break; } break; default: - func_801477B4(play); + Message_CloseTextbox(play); func_8088FDCC(this); break; } diff --git a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c index 985ea9f8b5..a533932842 100644 --- a/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c +++ b/src/overlays/actors/ovl_En_Fish2/z_en_fish2.c @@ -436,7 +436,7 @@ void func_80B29128(EnFish2* this) { void func_80B2913C(EnFish2* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80B28B5C(this); } } diff --git a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c index 11a3959be2..d76c39d38c 100644 --- a/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c +++ b/src/overlays/actors/ovl_En_Fishing/z_en_fishing.c @@ -1131,7 +1131,7 @@ void EnFishing_UpdateEffects(FishingEffect* effect, PlayState* play) { if ((effect->unk_2C >= 100) && (Message_GetState(&play->msgCtx) == TEXT_STATE_5)) { if (Message_ShouldAdvance(play) || (Message_GetState(&play->msgCtx) == TEXT_STATE_NONE)) { - func_801477B4(play); + Message_CloseTextbox(play); Rupees_ChangeBy(-50); effect->unk_2C = -1; } @@ -2160,7 +2160,7 @@ void EnFishing_UpdateLure(EnFishing* this, PlayState* play) { if (D_80917204 == 0) { if ((D_80917200 == 0) && (player->unk_B28 == 1)) { D_80917204 = 37; - func_801477B4(play); + Message_CloseTextbox(play); } } else { sLureRot.x = sReelLineRot[LINE_SEG_COUNT - 2].x + M_PI; @@ -3863,7 +3863,7 @@ void EnFishing_UpdateFish(Actor* thisx, PlayState* play2) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) || Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) { if (Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); if (play->msgCtx.choiceIndex == 0) { if (D_8090CCF0 == 0.0f) { D_8090CCF0 = this->unk_1A4; @@ -3895,7 +3895,7 @@ void EnFishing_UpdateFish(Actor* thisx, PlayState* play2) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) || Message_GetState(&play->msgCtx) == TEXT_STATE_NONE) { if (Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); if (play->msgCtx.choiceIndex != 0) { f32 temp1 = D_8090CCF0; s16 temp2 = D_809171D0; @@ -4715,7 +4715,7 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { case 1: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); switch (play->msgCtx.choiceIndex) { case 0: @@ -4726,15 +4726,15 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { } else { this->actor.textId = 0x407D; } - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); this->unk_154 = 2; } else { - func_80151938(play, 0x407E); + Message_ContinueTextbox(play, 0x407E); this->unk_154 = 3; } break; case 1: - func_80151938(play, 0x2D); + Message_ContinueTextbox(play, 0x2D); this->unk_154 = 3; break; } @@ -4743,15 +4743,15 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { case 2: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); - func_80151938(play, 0x407F); + Message_CloseTextbox(play); + Message_ContinueTextbox(play, 0x407F); this->unk_154 = 4; } break; case 3: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->unk_154 = 0; } if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE) { @@ -4761,16 +4761,16 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { case 4: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); switch (play->msgCtx.choiceIndex) { case 0: D_8090CCF8 = D_809171CC; - func_80151938(play, 0x4080); + Message_ContinueTextbox(play, 0x4080); this->unk_154 = 5; break; case 1: - func_80151938(play, 0x407F); + Message_ContinueTextbox(play, 0x407F); break; } } @@ -4778,7 +4778,7 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { case 5: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); play->interfaceCtx.unk_27E = 1; play->startPlayerFishing(play); @@ -4795,11 +4795,11 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { case 10: if (D_8090CD0C != 0) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); switch (play->msgCtx.choiceIndex) { case 0: - func_80151938(play, 0x40B2); + Message_ContinueTextbox(play, 0x40B2); D_8090CD08 = 1; D_8090CD0C = 0; this->unk_154 = 20; @@ -4811,7 +4811,7 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { } } else { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); switch (play->msgCtx.choiceIndex) { case 0: @@ -4835,12 +4835,12 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { this->actor.textId = 0x409B; this->unk_154 = 11; } - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); break; case 1: if (D_8090CD00 > 36000) { D_8090CD00 = 30000; - func_80151938(play, 0x4088); + Message_ContinueTextbox(play, 0x4088); } else { if (D_809171CA == 0) { if (D_809171D6 == 0) { @@ -4849,9 +4849,9 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { } if ((D_80917206 == 2) && (D_8090D638[D_809171D6] == 0x408D)) { - func_80151938(play, 0x40AF); + Message_ContinueTextbox(play, 0x40AF); } else { - func_80151938(play, D_8090D638[D_809171D6]); + Message_ContinueTextbox(play, D_8090D638[D_809171D6]); } D_809171D6++; @@ -4870,9 +4870,9 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { break; case 2: if (D_809171D8 == 0) { - func_80151938(play, 0x4085); + Message_ContinueTextbox(play, 0x4085); } else if (sLinkAge == 1) { - func_80151938(play, 0x4092); + Message_ContinueTextbox(play, 0x4092); } this->unk_154 = 22; break; @@ -4887,7 +4887,7 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { Message_ShouldAdvance(play)) { s32 getItemId; - func_801477B4(play); + Message_CloseTextbox(play); if (D_809171D0 == 0) { D_809171CC = D_8090CCF0; @@ -4960,14 +4960,14 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { case 20: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->unk_154 = 0; } break; case 21: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); switch (play->msgCtx.choiceIndex) { case 0: @@ -4975,9 +4975,9 @@ void EnFishing_HandleOwnerDialog(EnFishing* this, PlayState* play) { break; case 1: if (D_809171D8 == 0) { - func_80151938(play, 0x4085); + Message_ContinueTextbox(play, 0x4085); } else if (sLinkAge == 1) { - func_80151938(play, 0x4092); + Message_ContinueTextbox(play, 0x4092); } this->unk_154 = 22; break; @@ -5407,7 +5407,7 @@ void EnFishing_UpdateOwner(Actor* thisx, PlayState* play2) { if (Message_ShouldAdvance(play)) { Camera* mainCam = Play_GetCamera(play, CAM_ID_MAIN); - func_801477B4(play); + Message_CloseTextbox(play); if (play->msgCtx.choiceIndex == 0) { D_80917206 = 2; D_809171D6 = 0; diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c index acfd68f22a..c9844abb6a 100644 --- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c +++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c @@ -417,7 +417,7 @@ s32 EnFsn_TestEndInteraction(EnFsn* this, PlayState* play, Input* input) { s32 EnFsn_TestCancelOption(EnFsn* this, PlayState* play, Input* input) { if (CHECK_BTN_ALL(input->press.button, BTN_B)) { this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); return true; } return false; @@ -468,7 +468,7 @@ s32 EnFsn_HasPlayerSelectedItem(EnFsn* this, PlayState* play, Input* input) { if (EnFsn_TestItemSelected(play)) { if (!this->items[this->cursorIndex]->isOutOfStock) { this->prevActionFunc = this->actionFunc; - func_80151938(play, this->items[this->cursorIndex]->choiceTextId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->choiceTextId); play_sound(NA_SE_SY_DECIDE); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -933,7 +933,7 @@ void EnFsn_DeterminePrice(EnFsn* this, PlayState* play) { this->actionFunc = EnFsn_StartBuying; } this->actor.textId = player->actor.textId; - func_801477B4(play); + Message_CloseTextbox(play); } else if (itemAction <= PLAYER_IA_MINUS1) { if (CURRENT_DAY == 3) { this->actor.textId = 0x29DF; @@ -1082,7 +1082,7 @@ void EnFsn_LookToShelf(EnFsn* this, PlayState* play) { this->cutsceneState = ENFSN_CUTSCENESTATE_PLAYING; EnFsn_UpdateCursorPos(this, play); this->actionFunc = EnFsn_BrowseShelf; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } else { ActorCutscene_SetIntentToPlay(this->cutscene); } @@ -1108,7 +1108,7 @@ void EnFsn_BrowseShelf(EnFsn* this, PlayState* play) { EnFsn_CursorLeftRight(this); if (this->cursorIndex != prevCursorIdx) { play_sound(NA_SE_SY_CURSOR); - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } } } @@ -1131,7 +1131,7 @@ void EnFsn_LookToShopkeeperFromShelf(EnFsn* this, PlayState* play) { this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = true; this->actor.textId = 0x29D6; - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); this->actionFunc = EnFsn_FaceShopkeeperSelling; } else { ActorCutscene_SetIntentToPlay(this->cutscene); @@ -1173,12 +1173,12 @@ void EnFsn_HandleCanPlayerBuyItem(EnFsn* this, PlayState* play) { break; case CANBUY_RESULT_NEED_RUPEES: play_sound(NA_SE_SY_ERROR); - func_80151938(play, 0x29F0); + Message_ContinueTextbox(play, 0x29F0); this->actionFunc = EnFsn_PlayerCannotBuy; break; case CANBUY_RESULT_CANNOT_GET_NOW: play_sound(NA_SE_SY_ERROR); - func_80151938(play, 0x29DD); + Message_ContinueTextbox(play, 0x29DD); this->actionFunc = EnFsn_PlayerCannotBuy; break; } @@ -1214,7 +1214,7 @@ void EnFsn_SelectItem(EnFsn* this, PlayState* play) { case 1: func_8019F230(); this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } } } @@ -1223,7 +1223,7 @@ void EnFsn_SelectItem(EnFsn* this, PlayState* play) { void EnFsn_PlayerCannotBuy(EnFsn* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } } diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.c b/src/overlays/actors/ovl_En_Fu/z_en_fu.c index f499a26682..6aaf29cda4 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -229,7 +229,7 @@ void EnFu_Init(Actor* thisx, PlayState* play) { void EnFu_Destroy(Actor* thisx, PlayState* play) { EnFu* this = THIS; - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); CLEAR_WEEKEVENTREG(WEEKEVENTREG_08_01); Collider_DestroyCylinder(play, &this->collider); } @@ -532,9 +532,9 @@ void func_80962660(EnFu* this, PlayState* play) { break; case 0x287D: - SET_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); - func_801477B4(play); + SET_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); + Message_CloseTextbox(play); player->stateFlags1 |= PLAYER_STATE1_20; this->unk_53C = 0; Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); @@ -560,7 +560,7 @@ void func_80962660(EnFu* this, PlayState* play) { case 0x287E: case 0x2880: case 0x2883: - func_801477B4(play); + Message_CloseTextbox(play); func_80963540(this); func_80963560(this, play); break; @@ -605,8 +605,8 @@ void func_809628D0(EnFu* this, PlayState* play) { case 0x2884: case 0x2887: case 0x288A: - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); func_809622FC(this); break; @@ -843,7 +843,7 @@ void func_80963350(EnFu* this, PlayState* play) { if ((this->unk_54A == 0) && (((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) || ((Message_GetState(&play->msgCtx) == TEXT_STATE_CLOSING) && (play->msgCtx.stateTimer == 1)))) { - func_801477B4(play); + Message_CloseTextbox(play); this->unk_54A = 2; D_80964C24 = 1; } diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c index 55dc237374..b4542956c9 100644 --- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c +++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c @@ -210,7 +210,7 @@ void EnGakufu_GiveReward(EnGakufu* this, PlayState* play) { play_sound(NA_SE_SY_CORRECT_CHIME); - hour = gSaveContext.save.time * (24.0f / 0x10000); // TIME_TO_HOURS_F + hour = TIME_TO_HOURS_F(gSaveContext.save.time); for (i = 0; i < 3; i++) { Item_DropCollectible(play, &sRewardDropsSpawnTerminaFieldPos, sRewardDrops[i + sRewardDropsIndex[hour]]); } diff --git a/src/overlays/actors/ovl_En_Geg/z_en_geg.c b/src/overlays/actors/ovl_En_Geg/z_en_geg.c index 0105d5f4e2..04353d9544 100644 --- a/src/overlays/actors/ovl_En_Geg/z_en_geg.c +++ b/src/overlays/actors/ovl_En_Geg/z_en_geg.c @@ -624,7 +624,7 @@ void func_80BB2944(EnGeg* this, PlayState* play) { this->actionFunc = func_80BB2520; } else { this->unk_496 = func_80BB16D0(this); - func_80151938(play, this->unk_496); + Message_ContinueTextbox(play, this->unk_496); } } } @@ -663,7 +663,7 @@ void func_80BB2B1C(EnGeg* this, PlayState* play) { this->unk_230 |= 0x10; ActorCutscene_StartAndSetFlag(this->unk_498, &this->actor); this->unk_496 = 0xD68; - func_80151938(play, this->unk_496); + Message_ContinueTextbox(play, this->unk_496); this->unk_248 = Object_GetIndex(&play->objectCtx, OBJECT_TAISOU); if (this->unk_248 >= 0) { this->unk_4AC = 13; diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index b217ffeb5b..350ce734c9 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -199,7 +199,7 @@ void EnGinkoMan_DepositDialogue(EnGinkoMan* this, PlayState* play) { case 0x45C: // given 1000 reward case 0x45D: // given 5000 reward this->isStampChecked = false; - func_801477B4(play); + Message_CloseTextbox(play); EnGinkoMan_SetupBankAward(this); EnGinkoMan_BankAward(this, play); break; @@ -270,7 +270,7 @@ void EnGinkoMan_DepositDialogue(EnGinkoMan* this, PlayState* play) { break; case 0x470: // "Is that so? Come back and deposit some after saving up a bunch!" if (Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->isStampChecked = false; EnGinkoMan_SetupIdle(this); // change to waiting for approach } diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c index 0f169adccf..aea9d4ac38 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -249,7 +249,7 @@ void func_80997E4C(EnGs* this, PlayState* play) { this->unk_210 = this->unk_195 + 0x20F7; break; } - func_80151938(play, this->unk_210); + Message_ContinueTextbox(play, this->unk_210); break; default: diff --git a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c index 93a72f36f1..56ad07592e 100644 --- a/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c +++ b/src/overlays/actors/ovl_En_Guard_Nuts/z_en_guard_nuts.c @@ -232,7 +232,7 @@ void func_80ABB590(EnGuardNuts* this, PlayState* play) { if (Message_ShouldAdvance(play)) { if (D_80ABBE38[this->guardTextIndex] != 1) { if (D_80ABBE38[this->guardTextIndex] == 2) { - func_801477B4(play); + Message_CloseTextbox(play); D_80ABBE20 = 2; SET_WEEKEVENTREG(WEEKEVENTREG_12_40); EnGuardNuts_Burrow(this, play); @@ -247,11 +247,11 @@ void func_80ABB590(EnGuardNuts* this, PlayState* play) { } else if (this->guardTextIndex != 3) { this->targetHeadPos.x = 0; this->targetHeadPos.y = this->targetHeadPos.x; - func_801477B4(play); + Message_CloseTextbox(play); this->state = GUARD_NUTS_UNK_STATE; this->actionFunc = EnGuardNuts_Unburrow; } else { - func_801477B4(play); + Message_CloseTextbox(play); EnGuardNuts_SetupWait(this); } } diff --git a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c index 2d240c379b..0d9f668d6b 100644 --- a/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c +++ b/src/overlays/actors/ovl_En_Guruguru/z_en_guruguru.c @@ -208,7 +208,7 @@ void func_80BC7068(EnGuruguru* this, PlayState* play) { } } if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->headZRotTarget = 0; if ((this->textIdIndex == 13) || (this->textIdIndex == 14)) { func_80151BB4(play, 0x13); @@ -271,7 +271,7 @@ void func_80BC7068(EnGuruguru* this, PlayState* play) { this->skelAnime.playSpeed = 1.0f; } this->unk266 = 1; - func_80151938(play, textIDs[this->textIdIndex]); + Message_ContinueTextbox(play, textIDs[this->textIdIndex]); return; } func_801A3B48(0); diff --git a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c index d165c46e01..af801ebd40 100644 --- a/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c +++ b/src/overlays/actors/ovl_En_Hgo/z_en_hgo.c @@ -268,7 +268,7 @@ void EnHgo_HandlePlayerChoice(EnHgo* this, PlayState* play) { break; case 0x15A7: - func_801477B4(play); + Message_CloseTextbox(play); EnHgo_SetupTalk(this); break; } diff --git a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c index d75bfd512d..fa14a3cdb7 100644 --- a/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c +++ b/src/overlays/actors/ovl_En_Hidden_Nuts/z_en_hidden_nuts.c @@ -226,7 +226,7 @@ void func_80BDB59C(EnHiddenNuts* this, PlayState* play) { } if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80BDB268(this); } } diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c index d2c1e09a14..6e1f3b90c8 100644 --- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c +++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c @@ -570,7 +570,7 @@ void func_80C20C24(EnHintSkb* this, PlayState* play) { break; case 0x1151: - func_801477B4(play); + Message_CloseTextbox(play); if (this->unk_3E8 & 0x10) { SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 40, NA_SE_EN_STALKID_DEAD); func_80C20484(this); diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index 0028f4960a..6f3a192c25 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -150,7 +150,7 @@ void func_80952FE0(EnHs* this, PlayState* play) { } else { this->actionFunc = func_80953180; this->stateFlags &= ~4; - func_80151938(play, 0x33F6); + Message_ContinueTextbox(play, 0x33F6); func_80952DFC(play); } this->stateTimer++; @@ -178,20 +178,20 @@ void func_80953180(EnHs* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0x33F4: // text: laughing that they are all roosters (!) case 0x33F6: // text: Grog regrets not being able to see his chicks reach adult hood - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_8095345C; break; case 0x33F7: // text: notice his chicks are grown up, happy, wants to give you bunny hood this->actor.flags &= ~ACTOR_FLAG_10000; - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80953098; func_80953098(this, play); break; case 0x33F9: // text: laughing that they are all roosters (.) this->actor.flags &= ~ACTOR_FLAG_10000; - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_8095345C; break; @@ -204,7 +204,7 @@ void func_80953180(EnHs* this, PlayState* play) { break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_8095345C; break; } diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 63b365c7af..bf75529470 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -1188,7 +1188,7 @@ s32 func_808F5674(PlayState* play, EnIn* this, s32 arg2) { case TEXT_STATE_CHOICE: case TEXT_STATE_5: if (Message_ShouldAdvance(play) && func_808F4414(play, this, arg2)) { - func_801477B4(play); + Message_CloseTextbox(play); ret = true; } break; @@ -1210,7 +1210,7 @@ s32 func_808F5728(PlayState* play, EnIn* this, s32 arg2, s32* arg3) { return 0; } if (*arg3 == 3) { - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); *arg3 = 1; return 0; } diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c index 0dec72e0e8..183dc152b3 100644 --- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c +++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c @@ -3415,7 +3415,7 @@ void func_80B4ADCC(EnInvadepoh* this, PlayState* play) { if (this->textId == 0x3333) { func_80B4AEC0(this); } else if (this->textId == 0x3334) { - func_801477B4(play); + Message_CloseTextbox(play); func_80B4B024(this); } } @@ -3430,7 +3430,7 @@ void func_80B4AEDC(EnInvadepoh* this, PlayState* play) { if (this->actionTimer > 0) { this->actionTimer--; if (this->actionTimer == 0) { - func_801477B4(play); + Message_CloseTextbox(play); } } if (Actor_HasParent(&this->actor, play)) { diff --git a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c index 18197c558f..0cbe49fb9e 100644 --- a/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c +++ b/src/overlays/actors/ovl_En_Jgame_Tsn/z_en_jgame_tsn.c @@ -471,7 +471,7 @@ void func_80C147B4(EnJgameTsn* this, PlayState* play) { if (ActorCutscene_GetCurrentIndex() == this->actor.cutscene) { ActorCutscene_Stop(this->actor.cutscene); } - func_801477B4(play); + Message_CloseTextbox(play); func_80C1476C(this, play); func_80C1410C(this, play); break; @@ -479,7 +479,7 @@ void func_80C147B4(EnJgameTsn* this, PlayState* play) { case 0x109F: case 0x10A0: case 0x10A1: - func_801477B4(play); + Message_CloseTextbox(play); gSaveContext.minigameStatus = MINIGAME_STATUS_END; gSaveContext.timerStates[TIMER_ID_MINIGAME_2] = TIMER_STATE_STOP; CLEAR_WEEKEVENTREG(WEEKEVENTREG_90_20); @@ -487,7 +487,7 @@ void func_80C147B4(EnJgameTsn* this, PlayState* play) { break; case 0x10A3: - func_801477B4(play); + Message_CloseTextbox(play); func_80C14540(this); func_80C14554(this, play); break; diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 11b0e9d0e4..371757e44f 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -475,19 +475,19 @@ void func_80969400(s32 arg0) { void func_80969494(EnJs* this, PlayState* play) { func_80968A5C(this); - func_801477B4(play); + Message_CloseTextbox(play); this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED; this->actionFunc = func_80969B5C; } void func_809694E8(EnJs* this, PlayState* play) { - func_801477B4(play); + Message_CloseTextbox(play); this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED; this->actionFunc = func_8096A104; } void func_80969530(EnJs* this, PlayState* play) { - func_801477B4(play); + Message_CloseTextbox(play); this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED; this->actionFunc = func_8096A6F4; if ((this->actor.home.rot.y == this->actor.shape.rot.y) && (this->unk_2B8 & 0x10)) { @@ -542,7 +542,7 @@ void func_80969748(EnJs* this, PlayState* play) { this->actionFunc = func_80969898; } if (itemAction > PLAYER_IA_NONE) { - func_801477B4(play); + Message_CloseTextbox(play); if ((itemAction >= PLAYER_IA_MASK_TRUTH) && (itemAction <= PLAYER_IA_MASK_GIANT)) { EnJs_TakeMask(itemAction, ENJS_GET_TYPE(&this->actor)); Inventory_UnequipItem(itemAction - 4); @@ -559,7 +559,7 @@ void func_80969748(EnJs* this, PlayState* play) { } if (itemAction <= PLAYER_IA_MINUS1) { - func_80151938(play, 0x2216); + Message_ContinueTextbox(play, 0x2216); } } } @@ -577,11 +577,11 @@ void func_80969898(EnJs* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 0: func_8019F208(); - func_80151938(play, 0x2217); + Message_ContinueTextbox(play, 0x2217); break; case 1: func_8019F230(); - func_80151938(play, 0x2216); + Message_ContinueTextbox(play, 0x2216); break; } } @@ -592,24 +592,24 @@ void func_80969898(EnJs* this, PlayState* play) { case 0x220C: this->unk_2B8 |= 1; if (!func_8096933C(ENJS_GET_TYPE(&this->actor))) { - func_80151938(play, 0x220F); + Message_ContinueTextbox(play, 0x220F); break; } - func_80151938(play, 0x220D); + Message_ContinueTextbox(play, 0x220D); break; case 0x220D: case 0x2213: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x220E: - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); this->actionFunc = func_80969748; break; case 0x2210: case 0x2211: case 0x2212: player->exchangeItemId = PLAYER_IA_NONE; - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); this->actionFunc = func_80969748; break; case 0x2214: @@ -691,7 +691,7 @@ void func_80969C54(EnJs* this, PlayState* play) { } if (itemAction > PLAYER_IA_NONE) { - func_801477B4(play); + Message_CloseTextbox(play); if ((itemAction >= PLAYER_IA_MASK_TRUTH) && (itemAction <= PLAYER_IA_MASK_GIANT)) { EnJs_TakeMask(itemAction, ENJS_GET_TYPE(&this->actor)); Inventory_UnequipItem(itemAction - 4); @@ -708,7 +708,7 @@ void func_80969C54(EnJs* this, PlayState* play) { } if (itemAction <= PLAYER_IA_MINUS1) { - func_80151938(play, 0x221E); + Message_ContinueTextbox(play, 0x221E); } } } @@ -734,7 +734,7 @@ void func_80969DA4(EnJs* this, PlayState* play) { break; case 1: func_8019F230(); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; } } @@ -744,16 +744,16 @@ void func_80969DA4(EnJs* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0x221B: if (!func_8096933C(ENJS_GET_TYPE(&this->actor))) { - func_80151938(play, 0x2219); + Message_ContinueTextbox(play, 0x2219); break; } - func_80151938(play, 0x221C); + Message_ContinueTextbox(play, 0x221C); break; case 0x2224: case 0x2226: case 0x2228: case 0x222A: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x2225: case 0x2227: @@ -766,33 +766,33 @@ void func_80969DA4(EnJs* this, PlayState* play) { break; case 0x2222: player->exchangeItemId = PLAYER_IA_NONE; - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x2223: switch (ENJS_GET_TYPE(&this->actor)) { case 5: - func_80151938(play, 0x2224); + Message_ContinueTextbox(play, 0x2224); break; case 6: - func_80151938(play, 0x2226); + Message_ContinueTextbox(play, 0x2226); break; case 7: - func_80151938(play, 0x2228); + Message_ContinueTextbox(play, 0x2228); break; case 8: - func_80151938(play, 0x222A); + Message_ContinueTextbox(play, 0x222A); break; } break; case 0x221C: - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); this->actionFunc = func_80969C54; break; case 0x221D: case 0x2220: case 0x2221: player->exchangeItemId = PLAYER_IA_NONE; - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); this->actionFunc = func_80969C54; break; default: @@ -898,12 +898,12 @@ void func_8096A38C(EnJs* this, PlayState* play) { case 0x21FC: switch (play->msgCtx.choiceIndex) { case 0: - func_80151938(play, 0x21FE); + Message_ContinueTextbox(play, 0x21FE); Animation_MorphToPlayOnce(&this->skelAnime, &gMoonChildGettingUpAnim, -5.0f); this->unk_2B8 |= 0x10; break; case 1: - func_80151938(play, 0x21FD); + Message_ContinueTextbox(play, 0x21FD); break; } break; @@ -911,11 +911,11 @@ void func_8096A38C(EnJs* this, PlayState* play) { case 0x21FE: switch (play->msgCtx.choiceIndex) { case 0: - func_80151938(play, 0x2200); + Message_ContinueTextbox(play, 0x2200); func_809696EC(this, 0); break; case 1: - func_80151938(play, 0x21FF); + Message_ContinueTextbox(play, 0x21FF); break; } break; @@ -923,12 +923,12 @@ void func_8096A38C(EnJs* this, PlayState* play) { case 0x2203: switch (play->msgCtx.choiceIndex) { case 0: - func_80151938(play, 0x2205); + Message_ContinueTextbox(play, 0x2205); Animation_MorphToPlayOnce(&this->skelAnime, &gMoonChildGettingUpAnim, -5.0f); this->unk_2B8 |= 0x10; break; case 1: - func_80151938(play, 0x2204); + Message_ContinueTextbox(play, 0x2204); break; } } @@ -941,21 +941,21 @@ void func_8096A38C(EnJs* this, PlayState* play) { case 0x2205: case 0x2206: case 0x2209: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x2200: case 0x2208: func_809696EC(this, 1); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x2207: if (INV_CONTENT(ITEM_MASK_FIERCE_DEITY) == ITEM_MASK_FIERCE_DEITY) { - func_80151938(play, 0x2208); + Message_ContinueTextbox(play, 0x2208); func_809696EC(this, 0); } else { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_8096A2C0; func_8096A2C0(this, play); } diff --git a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c index a4557f36e9..6c8ea9fe8c 100644 --- a/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c +++ b/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c @@ -523,7 +523,7 @@ void func_80B85FA8(EnKaizoku* this, PlayState* play) { } if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); EnKaizoku_ChangeAnim(this, EN_KAIZOKU_ANIM_11); this->unk_598 = 0; this->unk_59C++; @@ -572,7 +572,7 @@ void func_80B85FA8(EnKaizoku* this, PlayState* play) { case 4: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->unk_598 = 0; this->unk_59C++; func_801A0238(0x7F, 0); @@ -722,7 +722,7 @@ void func_80B868B8(EnKaizoku* this, PlayState* play) { case 2: if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_800B7298(play, &this->picto.actor, 6); ActorCutscene_Stop(this->unk_2D6); this->subCamId = 0; @@ -794,7 +794,7 @@ void func_80B86B74(EnKaizoku* this, PlayState* play) { } if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); EnKaizoku_ChangeAnim(this, EN_KAIZOKU_ANIM_18); func_800B7298(play, &this->picto.actor, 0x85); this->unk_5A0 = 0; diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index 36297de675..74d4af13d3 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -414,7 +414,7 @@ void EnKakasi_RegularDialogue(EnKakasi* this, PlayState* play) { } if ((this->talkState == Message_GetState(&play->msgCtx)) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); if (this->talkState == TEXT_STATE_5) { // bad song input if (this->unkState196 == 2 && this->picto.actor.textId == 0x1647) { @@ -440,7 +440,7 @@ void EnKakasi_RegularDialogue(EnKakasi* this, PlayState* play) { this->picto.actor.textId = 0x1645; } - func_80151938(play, this->picto.actor.textId); + Message_ContinueTextbox(play, this->picto.actor.textId); return; } else if (this->picto.actor.textId == 0x165D || this->picto.actor.textId == 0x165F || @@ -538,7 +538,7 @@ void EnKakasi_RegularDialogue(EnKakasi* this, PlayState* play) { } } } - func_80151938(play, this->picto.actor.textId); + Message_ContinueTextbox(play, this->picto.actor.textId); } } @@ -674,7 +674,7 @@ void EnKakasi_PostSongLearnDialogue(EnKakasi* this, PlayState* play) { Math_SmoothStepToS(&player->actor.shape.rot.y, this->picto.actor.yawTowardsPlayer + 0x8000, 5, 1000, 0); if (this->unk190 == 0) { - func_801477B4(play); + Message_CloseTextbox(play); func_800B7298(play, &this->picto.actor, PLAYER_CSMODE_86); this->picto.actor.textId = 0x1648; Message_StartTextbox(play, (this->picto.actor.textId), &this->picto.actor); @@ -735,7 +735,7 @@ void EnKakasi_PostSongLearnDialogue(EnKakasi* this, PlayState* play) { if ((this->unkState1A8 != 0) && (Message_GetState(&play->msgCtx) == this->talkState) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); if (this->talkState == TEXT_STATE_5) { this->unk190++; @@ -778,7 +778,7 @@ void EnKakasi_PostSongLearnDialogue(EnKakasi* this, PlayState* play) { this->picto.actor.textId = 0x1661; } } - func_80151938(play, this->picto.actor.textId); + Message_ContinueTextbox(play, this->picto.actor.textId); } } @@ -1102,7 +1102,7 @@ void EnKakasi_RisenDialogue(EnKakasi* this, PlayState* play) { Math_SmoothStepToS(&this->picto.actor.shape.rot.y, this->picto.actor.yawTowardsPlayer, 5, 1000, 0); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); EnKakasi_SetupIdleRisen(this); } } diff --git a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c index 87396cddf8..ca26d5c952 100644 --- a/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c +++ b/src/overlays/actors/ovl_En_Kendo_Js/z_en_kendo_js.c @@ -280,13 +280,13 @@ void func_80B269A4(EnKendoJs* this, PlayState* play) { break; case 0x2719: - func_801477B4(play); + Message_CloseTextbox(play); player->stateFlags1 |= PLAYER_STATE1_20; func_80B2701C(this); break; case 0x271A: - func_801477B4(play); + Message_CloseTextbox(play); func_80B2714C(this); break; @@ -296,14 +296,14 @@ void func_80B269A4(EnKendoJs* this, PlayState* play) { break; case 0x273B: - func_801477B4(play); + Message_CloseTextbox(play); Interface_InitMinigame(play); player->stateFlags1 |= PLAYER_STATE1_20; func_80B273D0(this); break; case 0x272D: - func_801477B4(play); + Message_CloseTextbox(play); gSaveContext.minigameStatus = MINIGAME_STATUS_END; func_80B276C4(this); func_80B276D8(this, play); @@ -523,7 +523,7 @@ void func_80B27188(EnKendoJs* this, PlayState* play) { Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, 3); } this->unk_286 = 2; - func_801477B4(play); + Message_CloseTextbox(play); player->stateFlags1 &= ~PLAYER_STATE1_20; } } else if (this->unk_286 == 2) { diff --git a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c index 8af839dea2..356af73f7d 100644 --- a/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c +++ b/src/overlays/actors/ovl_En_Kgy/z_en_kgy.c @@ -203,7 +203,7 @@ s32 func_80B40E54(EnKgy* this) { } void func_80B40E74(EnKgy* this, PlayState* play, u16 textId) { - func_80151938(play, textId); + Message_ContinueTextbox(play, textId); this->actor.textId = textId; func_80B40E18(this, this->actor.textId); } @@ -250,7 +250,7 @@ void func_80B40EE8(EnKgy* this, PlayState* play) { } if (((temp_f0 < 0.15f) && (temp_f0 > -0.15f)) || (this->unk_2E6 == 0)) { - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); this->unk_29C &= ~0x2; func_80B40E18(this, this->actor.textId); @@ -456,7 +456,7 @@ void func_80B4163C(EnKgy* this, PlayState* play) { void func_80B417B8(EnKgy* this, PlayState* play) { func_80B4163C(this, play); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80B413C8(this); this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED; this->actionFunc = func_80B419B0; @@ -481,7 +481,7 @@ void func_80B418C4(EnKgy* this, PlayState* play) { if ((this->unk_2E4 <= 0) && !(this->unk_29C & 2) && (func_80B40E54(this) == 0) && (Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play) && ((play->msgCtx.currentTextId == 0xC4E) || (play->msgCtx.currentTextId == 0xC4F))) { - func_801477B4(play); + Message_CloseTextbox(play); this->actor.textId = 0xC4F; func_80B413C8(this); ActorCutscene_SetIntentToPlay(this->unk_2D4[5]); @@ -529,7 +529,7 @@ void func_80B41ACC(EnKgy* this, PlayState* play) { } if (itemAction > PLAYER_IA_NONE) { - func_801477B4(play); + Message_CloseTextbox(play); if (itemAction == PLAYER_IA_BOTTLE_GOLD_DUST) { if (this->unk_29C & 0x10) { this->actor.textId = 0xC55; @@ -678,7 +678,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) { case 0xC39: case 0xC52: case 0xC54: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B425A0; func_80B413C8(this); func_80B40E18(this, 5); @@ -698,7 +698,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) { break; case 0xC3D: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B41C54; this->actor.textId = 0xC3E; func_80B413C8(this); @@ -734,7 +734,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) { case 0xC57: this->unk_29C &= ~0x8; - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B41C54; this->actor.textId = 0xC58; func_80B413C8(this); @@ -780,7 +780,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) { case 0xC4A: case 0xC4B: func_80B40BC0(this, 4); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B41C54; this->actor.textId = 0xC4B; func_80B413C8(this); @@ -795,7 +795,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) { this->unk_2EA = 56; this->actor.textId = 0xC51; } - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B41D64; func_80B413C8(this); Actor_OfferGetItem(&this->actor, play, this->unk_2EA, 2000.0f, 1000.0f); @@ -810,7 +810,7 @@ void func_80B41E18(EnKgy* this, PlayState* play) { break; case 0xC56: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B41C54; this->actor.textId = 0xC56; func_80B413C8(this); @@ -855,7 +855,7 @@ void func_80B42660(EnKgy* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); this->actor.focus.pos = this->unk_2A8; if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); func_80B413C8(this); this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED; this->actionFunc = func_80B42714; @@ -918,7 +918,7 @@ void func_80B427C8(EnKgy* this, PlayState* play) { break; case 0xC34: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B41C54; func_80B413C8(this); func_80B40E18(this, 6); @@ -1032,7 +1032,7 @@ void func_80B42A8C(EnKgy* this, PlayState* play) { case 0xC2C: case 0xC2F: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B42D28; func_80B413C8(this); func_80B40E18(this, 1); diff --git a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c index 9fca43dcca..1de7fc7281 100644 --- a/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c +++ b/src/overlays/actors/ovl_En_Kujiya/z_en_kujiya.c @@ -147,7 +147,7 @@ void EnKujiya_ChooseNextDialogue(EnKujiya* this, PlayState* play) { case 0x2B60: EnKujiya_SetBoughtTicket(); - func_801477B4(play); + Message_CloseTextbox(play); EnKujiya_SetupTurnToClosed(this); break; @@ -169,7 +169,7 @@ void EnKujiya_ChooseNextDialogue(EnKujiya* this, PlayState* play) { break; case 0x2B66: - func_801477B4(play); + Message_CloseTextbox(play); EnKujiya_SetupGivePrize(this); EnKujiya_GivePrize(this, play); break; diff --git a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c index 77f844015f..72e0f07572 100644 --- a/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c +++ b/src/overlays/actors/ovl_En_Lift_Nuts/z_en_lift_nuts.c @@ -511,7 +511,7 @@ void func_80AEA910(EnLiftNuts* this, PlayState* play) { break; case 0x27E5: - func_801477B4(play); + Message_CloseTextbox(play); player->stateFlags1 |= PLAYER_STATE1_20; func_80AEAEAC(this); break; @@ -544,7 +544,7 @@ void func_80AEA910(EnLiftNuts* this, PlayState* play) { break; case 0x27FA: - func_801477B4(play); + Message_CloseTextbox(play); player->stateFlags1 &= ~PLAYER_STATE1_20; func_80AEB114(this); break; @@ -556,7 +556,7 @@ void func_80AEA910(EnLiftNuts* this, PlayState* play) { break; case 0x27EF: - func_801477B4(play); + Message_CloseTextbox(play); func_80AEB584(this); func_80AEB598(this, play); break; @@ -573,13 +573,13 @@ void func_80AEA910(EnLiftNuts* this, PlayState* play) { break; case 0x27F4: - func_801477B4(play); + Message_CloseTextbox(play); func_80AEB584(this); func_80AEB598(this, play); break; case 0x27F5: - func_801477B4(play); + Message_CloseTextbox(play); func_80AE9B4C(1, 0); player->stateFlags1 &= ~PLAYER_STATE1_20; func_80AE9FC8(this); diff --git a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c index 7bb4b57b4c..7cd1c3369b 100644 --- a/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c +++ b/src/overlays/actors/ovl_En_Look_Nuts/z_en_look_nuts.c @@ -295,7 +295,7 @@ void EnLookNuts_SendPlayerToSpawn(EnLookNuts* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); Math_SmoothStepToS(&this->actor.world.rot.y, this->actor.yawTowardsPlayer, 1, 0xBB8, 0); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); play->nextEntrance = Entrance_CreateFromSpawn(this->spawnIndex); gSaveContext.nextCutsceneIndex = 0; Scene_SetExitFade(play); diff --git a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c index f189d2e9db..093fa3c302 100644 --- a/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c +++ b/src/overlays/actors/ovl_En_Ma4/z_en_ma4.c @@ -451,7 +451,7 @@ void EnMa4_HandlePlayerChoice(EnMa4* this, PlayState* play) { // "Try again?" if (play->msgCtx.choiceIndex == 0) { // Yes func_8019F208(); - func_801477B4(play); + Message_CloseTextbox(play); EnMa4_SetupBeginHorsebackGame(this); } else { // No if (this->type == MA4_TYPE_ALIENS_DEFEATED) { @@ -494,7 +494,7 @@ void EnMa4_ChooseNextDialogue(EnMa4* this, PlayState* play) { if (Message_ShouldAdvance(play)) { switch (this->textId) { case 0x2390: - func_801477B4(play); + Message_CloseTextbox(play); EnMa4_SetupBeginHorsebackGame(this); break; @@ -529,7 +529,7 @@ void EnMa4_ChooseNextDialogue(EnMa4* this, PlayState* play) { break; case 0x333E: - func_801477B4(play); + Message_CloseTextbox(play); EnMa4_SetupBeginDescribeThemCs(this); break; @@ -566,7 +566,7 @@ void EnMa4_ChooseNextDialogue(EnMa4* this, PlayState* play) { break; case 0x334A: - func_801477B4(play); + Message_CloseTextbox(play); EnMa4_SetupBeginHorsebackGame(this); break; @@ -597,7 +597,7 @@ void EnMa4_ChooseNextDialogue(EnMa4* this, PlayState* play) { Message_StartTextbox(play, 0x334C, &this->actor); this->textId = 0x334C; } else { - func_801477B4(play); + Message_CloseTextbox(play); player->stateFlags1 |= PLAYER_STATE1_20; EnMa4_SetupBeginEponasSongCs(this); EnMa4_BeginEponasSongCs(this, play); diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index e0e8eac391..9117e55a36 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -944,7 +944,7 @@ void EnMaYto_AfterMilkRunChooseNextDialogue(EnMaYto* this, PlayState* play) { break; case 0x33C2: - func_801477B4(play); + Message_CloseTextbox(play); EnMaYto_SetupPostMilkRunGiveReward(this); EnMaYto_PostMilkRunGiveReward(this, play); break; @@ -1069,7 +1069,7 @@ void EnMaYto_PostMilkRunWaitDialogueEnd(EnMaYto* this, PlayState* play) { if (Message_GetState(&play->msgCtx) == TEXT_STATE_DONE || Message_GetState(&play->msgCtx) == TEXT_STATE_5) { if (Message_ShouldAdvance(play) && Message_GetState(&play->msgCtx) == TEXT_STATE_5) { func_800B7298(play, &this->actor, PLAYER_CSMODE_7); - func_801477B4(play); + Message_CloseTextbox(play); } } diff --git a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c index 749e3d5091..e5855004f8 100644 --- a/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c +++ b/src/overlays/actors/ovl_En_Minifrog/z_en_minifrog.c @@ -115,7 +115,7 @@ void EnMinifrog_Init(Actor* thisx, PlayState* play) { this->timer = 30; this->actionFunc = EnMinifrog_SpawnGrowAndShrink; - this->actor.textId = 0xD81; // "Ah! Don Gero! It has been so long." + this->actor.textId = 0xD81; this->actor.colChkInfo.mass = 30; } else { // Frogs in mountain village if (this->frogIndex == MINIFROG_YELLOW) { @@ -254,27 +254,27 @@ void EnMinifrog_ReturnFrogCutscene(EnMinifrog* this, PlayState* play) { EnMinifrog_SetJumpState(this); switch (play->msgCtx.currentTextId) { - case 0xD81: // "Ah! Don Gero! It has been so long." - case 0xD83: // "Could it be... Has spring finally come to the mountains?" - case 0xD84: // "That look...It is true! Winter was so long that I began to lose all hope." - case 0xD86: // "Could it be... You came all this way looking for me?" - case 0xD87: // "Ah! You need not say a thing. Upon seeing that face, I understand!" ... - func_80151938(play, play->msgCtx.currentTextId + 1); + case 0xD81: + case 0xD83: + case 0xD84: + case 0xD86: + case 0xD87: + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; - case 0xD82: // "What has brought you all this way?" + case 0xD82: if (CHECK_WEEKEVENTREG(WEEKEVENTREG_33_80)) { - func_80151938(play, 0xD83); // "Could it be... Has spring finally come to the mountains?" + Message_ContinueTextbox(play, 0xD83); } else { - func_80151938(play, 0xD86); // "Could it be... You came all this way looking for me?" + Message_ContinueTextbox(play, 0xD86); } SET_WEEKEVENTREG(isFrogReturnedFlags[this->frogIndex]); break; - case 0xD85: // "I understand. I shall head for the mountains immediately." + case 0xD85: default: - func_801477B4(play); + Message_CloseTextbox(play); EnMinifrog_SpawnDust(this, play); SoundSource_PlaySfxAtFixedWorldPos(play, &this->actor.world.pos, 30, NA_SE_EN_NPC_FADEAWAY); if (this->actor.cutscene != -1) { @@ -354,10 +354,9 @@ void EnMinifrog_SetupNextFrogInit(EnMinifrog* this, PlayState* play) { void EnMinifrog_CheckChoirSuccess(EnMinifrog* this, PlayState* play) { this->actionFunc = EnMinifrog_YellowFrogDialog; if (this->frog != NULL) { - func_80151938(play, 0xD78); // "Unfortunately, it seems not all of our members have gathered." + Message_ContinueTextbox(play, 0xD78); } else { - func_80151938(play, - 0xD7C); // "The conducting was spectacular. And all of our members rose to the occasion!" + Message_ContinueTextbox(play, 0xD7C); } EnMinifrog_SetJumpState(this); @@ -462,7 +461,7 @@ void EnMinifrog_EndChoir(EnMinifrog* this, PlayState* play) { EnMinifrog_TurnToPlayer(this); EnMinifrog_Jump(this); if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { - Message_StartTextbox(play, 0xD7E, &this->actor); // "Let us do it again sometime." + Message_StartTextbox(play, 0xD7E, &this->actor); this->actionFunc = EnMinifrog_YellowFrogDialog; } else { func_800B8500(&this->actor, play, 1000.0f, 1000.0f, PLAYER_IA_MINUS1); @@ -496,7 +495,7 @@ void EnMinifrog_YellowFrogDialog(EnMinifrog* this, PlayState* play) { break; case 1: // No func_8019F230(); - func_80151938(play, 0xD7E); // "Let us do it again sometime." + Message_ContinueTextbox(play, 0xD7E); break; } } @@ -506,40 +505,38 @@ void EnMinifrog_YellowFrogDialog(EnMinifrog* this, PlayState* play) { if (Message_ShouldAdvance(play)) { EnMinifrog_SetJumpState(this); switch (play->msgCtx.currentTextId) { - case 0xD76: // "I have been waiting for you, Don Gero. Forgive me if I'm mistaken, but it looks like - // you've lost a little weight..." - func_80151938(play, play->msgCtx.currentTextId + 1); + case 0xD76: + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); this->actor.flags &= ~ACTOR_FLAG_10000; SET_WEEKEVENTREG(WEEKEVENTREG_34_01); break; - case 0xD78: // "Unfortunately, it seems not all of our members have gathered." - case 0xD79: // "Perhaps it is because winter was too long? They must not have realized that spring - // has come to the mountains..." - case 0xD7A: // "And when the great Don Gero has come for us, too...What a pity." - case 0xD7F: // "Well, if it isn't the great Don Gero." - func_80151938(play, play->msgCtx.currentTextId + 1); + case 0xD78: + case 0xD79: + case 0xD7A: + case 0xD7F: + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; - case 0xD77: // "Let us begin our chorus" + case 0xD77: this->actionFunc = EnMinifrog_BeginChoirCutscene; play->msgCtx.msgLength = 0; break; - case 0xD7C: // "The conducting was spectacular. And all of our members rose to the occasion!" + case 0xD7C: if (CHECK_WEEKEVENTREG(WEEKEVENTREG_35_80)) { // Obtained Heart Piece - func_80151938(play, 0xD7E); + Message_ContinueTextbox(play, 0xD7E); } else { - func_80151938(play, 0xD7D); // Get Heart Piece + Message_ContinueTextbox(play, 0xD7D); // Get Heart Piece SET_WEEKEVENTREG(WEEKEVENTREG_35_80); } break; - case 0xD7D: // "This is how deeply we were moved by your spectacular conducting..." - func_801477B4(play); + case 0xD7D: + Message_CloseTextbox(play); this->actionFunc = EnMinifrog_GetFrogHP; EnMinifrog_GetFrogHP(this, play); break; - case 0xD7B: // "Where in the world could the other members be, and what could they be doing?" - case 0xD7E: // "Let us do it again sometime." + case 0xD7B: + case 0xD7E: default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnMinifrog_SetupYellowFrogDialog; this->actor.flags &= ~ACTOR_FLAG_10000; break; @@ -558,11 +555,9 @@ void EnMinifrog_SetupYellowFrogDialog(EnMinifrog* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { this->actionFunc = EnMinifrog_YellowFrogDialog; if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_34_01)) { - Message_StartTextbox(play, 0xD76, - &this->actor); // "I have been waiting for you, Don Gero. Forgive me if I'm mistaken, - // but it looks like you've lost a little weight..." + Message_StartTextbox(play, 0xD76, &this->actor); } else { - Message_StartTextbox(play, 0xD7F, &this->actor); // "Well, if it isn't the great Don Gero." + Message_StartTextbox(play, 0xD7F, &this->actor); } } else if ((this->actor.xzDistToPlayer < 150.0f) && (Player_IsFacingActor(&this->actor, 0x3000, play) || diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index 894d73a6fe..ced5f991b6 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -170,7 +170,7 @@ void func_809596A0(EnMk* this, PlayState* play) { switch (Message_GetState(&play->msgCtx)) { case TEXT_STATE_5: if (Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80959774; } break; @@ -279,15 +279,15 @@ void func_80959A24(EnMk* this, PlayState* play) { case 0xFA4: case 0xFAA: case 0xFAE: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0xFA2: if (CHECK_WEEKEVENTREG(WEEKEVENTREG_55_80)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80959E18; } else { - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); } break; @@ -303,53 +303,53 @@ void func_80959A24(EnMk* this, PlayState* play) { case 0xFBD: case 0xFBE: case 0xFBF: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80959E18; break; case 0xFA0: SET_WEEKEVENTREG(WEEKEVENTREG_19_04); - func_80151938(play, 0xFA1); + Message_ContinueTextbox(play, 0xFA1); break; case 0xFA8: SET_WEEKEVENTREG(WEEKEVENTREG_19_08); if (CHECK_WEEKEVENTREG(WEEKEVENTREG_55_80)) { - func_80151938(play, 0xFBD); + Message_ContinueTextbox(play, 0xFBD); } else { - func_80151938(play, 0xFA9); + Message_ContinueTextbox(play, 0xFA9); } break; case 0xFAC: SET_WEEKEVENTREG(WEEKEVENTREG_19_10); if (CHECK_WEEKEVENTREG(WEEKEVENTREG_55_80)) { - func_80151938(play, 0xFBE); + Message_ContinueTextbox(play, 0xFBE); } else { - func_80151938(play, 0xFAD); + Message_ContinueTextbox(play, 0xFAD); } break; case 0xFB1: SET_WEEKEVENTREG(WEEKEVENTREG_19_20); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80959E18; break; case 0xFB3: case 0xFB4: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80959E18; this->actor.flags &= ~ACTOR_FLAG_10000; break; case 0xFB5: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80959E18; break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80959E18; break; } diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 14c8d11702..48a379304b 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -49,7 +49,7 @@ void EnMm2_Reading(EnMm2* this, PlayState* play) { switch (Message_GetState(&play->msgCtx)) { case TEXT_STATE_5: if (Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnMm2_WaitForRead; } break; diff --git a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c index e141085163..89a5327a87 100644 --- a/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c +++ b/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c @@ -106,7 +106,7 @@ void EnMm3_Init(Actor* thisx, PlayState* play) { void EnMm3_Destroy(Actor* thisx, PlayState* play) { EnMm3* this = THIS; - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); Collider_DestroyCylinder(play, &this->collider); } @@ -271,7 +271,7 @@ void func_80A6F5E4(EnMm3* this, PlayState* play) { break; case 0x2793: - func_801477B4(play); + Message_CloseTextbox(play); func_80A6FE1C(this); func_80A6FE30(this, play); break; @@ -279,7 +279,7 @@ void func_80A6F5E4(EnMm3* this, PlayState* play) { case 0x2795: case 0x2796: case 0x2797: - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) { Message_StartTextbox(play, 0x279B, &this->actor); this->unk_2B4 = 0x279B; func_80151BB4(play, 0xB); @@ -347,12 +347,12 @@ void func_80A6F9DC(EnMm3* this, PlayState* play) { } else { Interface_StartPostmanTimer(0, POSTMAN_MINIGAME_BUNNY_HOOD_OFF); } - func_801477B4(play); + Message_CloseTextbox(play); play_sound(NA_SE_SY_START_SHOT); func_80A6FBA0(this); } else { - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); func_80A6F270(this); } } @@ -374,8 +374,8 @@ void func_80A6FBA0(EnMm3* this) { AudioSfx_MuteBanks((1 << BANK_PLAYER) | (1 << BANK_ITEM) | (1 << BANK_ENV) | (1 << BANK_ENEMY) | (1 << BANK_OCARINA) | (1 << BANK_VOICE)); func_801A0238(0, 5); - SET_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + SET_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); this->actionFunc = func_80A6FBFC; } diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 4c4cd68ebe..d7a4fff3de 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -106,7 +106,7 @@ void EnMs_Talk(EnMs* this, PlayState* play) { case TEXT_STATE_5: if (Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); Actor_OfferGetItem(&this->actor, play, GI_MAGIC_BEANS, this->actor.xzDistToPlayer, this->actor.playerHeightRel); this->actionFunc = EnMs_Sell; @@ -117,13 +117,13 @@ void EnMs_Talk(EnMs* this, PlayState* play) { if (Message_ShouldAdvance(play)) { switch (play->msgCtx.choiceIndex) { case 0: // yes - func_801477B4(play); + Message_CloseTextbox(play); if (gSaveContext.save.playerData.rupees < 10) { play_sound(NA_SE_SY_ERROR); - func_80151938(play, 0x935); // "[...] You don't have enough Rupees." + Message_ContinueTextbox(play, 0x935); // "[...] You don't have enough Rupees." } else if (AMMO(ITEM_MAGIC_BEANS) >= 20) { play_sound(NA_SE_SY_ERROR); - func_80151938(play, 0x937); // "[...] You can't carry anymore." + Message_ContinueTextbox(play, 0x937); // "[...] You can't carry anymore." } else { func_8019F208(); Actor_OfferGetItem(&this->actor, play, GI_MAGIC_BEANS, 90.0f, 10.0f); @@ -135,7 +135,7 @@ void EnMs_Talk(EnMs* this, PlayState* play) { case 1: // no default: func_8019F230(); - func_80151938(play, 0x934); // "[...] Well, if your mood changes [...]" + Message_ContinueTextbox(play, 0x934); // "[...] Well, if your mood changes [...]" break; } } @@ -158,7 +158,7 @@ void EnMs_Sell(EnMs* this, PlayState* play) { void EnMs_TalkAfterPurchase(EnMs* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { - func_80151938(play, 0x936); // "You can plant 'em whenever you want [...]" + Message_ContinueTextbox(play, 0x936); // "You can plant 'em whenever you want [...]" this->actionFunc = EnMs_Talk; } else { func_800B8500(&this->actor, play, this->actor.xzDistToPlayer, this->actor.playerHeightRel, PLAYER_IA_MINUS1); diff --git a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c index c7791dea7d..cff2892f45 100644 --- a/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c +++ b/src/overlays/actors/ovl_En_Mt_tag/z_en_mt_tag.c @@ -246,7 +246,7 @@ s32 EnMttag_ExitRace(PlayState* play, s32 transitionType, s32 nextTransitionType play->transitionTrigger = TRANS_TRIGGER_START; play->transitionType = transitionType; gSaveContext.nextTransitionType = nextTransitionType; - func_801477B4(play); + Message_CloseTextbox(play); return 1; } @@ -432,7 +432,7 @@ void EnMttag_PotentiallyRestartRace(EnMttag* this, PlayState* play) { play->transitionTrigger = TRANS_TRIGGER_START; play->transitionType = TRANS_TYPE_FADE_BLACK; gSaveContext.nextTransitionType = TRANS_TYPE_FADE_BLACK; - func_801477B4(play); + Message_CloseTextbox(play); func_800B7298(play, &this->actor, PLAYER_CSMODE_7); Magic_Add(play, MAGIC_FILL_TO_CAPACITY); @@ -467,7 +467,7 @@ void EnMttag_HandleCantWinChoice(EnMttag* this, PlayState* play) { // Keep racing func_8019F208(); - func_801477B4(play); + Message_CloseTextbox(play); func_800B7298(play, &this->actor, PLAYER_CSMODE_6); CLEAR_EVENTINF(EVENTINF_13); this->timer = 100; diff --git a/src/overlays/actors/ovl_En_Muto/z_en_muto.c b/src/overlays/actors/ovl_En_Muto/z_en_muto.c index f9d17ca963..49d37330b5 100644 --- a/src/overlays/actors/ovl_En_Muto/z_en_muto.c +++ b/src/overlays/actors/ovl_En_Muto/z_en_muto.c @@ -199,7 +199,7 @@ void EnMuto_InDialogue(EnMuto* this, PlayState* play) { if (!this->isInMayorsRoom) { this->yawTowardsTarget = this->actor.yawTowardsPlayer; if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); if (this->actor.textId == 0x62C) { SET_WEEKEVENTREG(WEEKEVENTREG_88_08); diff --git a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c index df18de3e73..0518e9457a 100644 --- a/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c +++ b/src/overlays/actors/ovl_En_Onpuman/z_en_onpuman.c @@ -106,11 +106,11 @@ void func_80B1202C(EnOnpuman* this, PlayState* play2) { switch (play->msgCtx.currentTextId) { case 0x8D4: this->unk_2A4 |= 1; - func_80151938(play, 0x8DA); + Message_ContinueTextbox(play, 0x8DA); break; case 0x8DA: - func_80151938(play, 0x8D6); + Message_ContinueTextbox(play, 0x8D6); if (this->unk_2A0 != NULL) { this->unk_2A0->home.rot.x = 0x50; } @@ -140,7 +140,7 @@ void func_80B1202C(EnOnpuman* this, PlayState* play2) { void func_80B1217C(EnOnpuman* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && (Message_ShouldAdvance(play))) { this->actionFunc = func_80B121D8; - func_801477B4(play); + Message_CloseTextbox(play); } } diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 8c1ec78964..ac1c3cb8cb 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -332,7 +332,7 @@ s32 EnOssan_TestEndInteraction(EnOssan* this, PlayState* play, Input* input) { s32 EnOssan_TestCancelOption(EnOssan* this, PlayState* play, Input* input) { if (CHECK_BTN_ALL(input->press.button, BTN_B)) { this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); return true; } return false; @@ -349,7 +349,7 @@ void EnOssan_SetupStartShopping(PlayState* play, EnOssan* this, u8 skipHello) { void EnOssan_StartShopping(PlayState* play, EnOssan* this) { EnOssan_SetupAction(this, EnOssan_FaceShopkeeper); - func_80151938(play, 0x640); + Message_ContinueTextbox(play, 0x640); func_8011552C(play, DO_ACTION_DECIDE); this->stickRightPrompt.isEnabled = true; this->stickLeftPrompt.isEnabled = true; @@ -602,7 +602,7 @@ s32 EnOssan_FacingShopkeeperDialogResult(EnOssan* this, PlayState* play) { SubS_ChangeAnimationByInfoS(&this->skelAnime, animationInfo, 9); } EnOssan_SetupAction(this, EnOssan_TalkToShopkeeper); - func_80151938(play, sTalkOptionTextIds[this->actor.params]); + Message_ContinueTextbox(play, sTalkOptionTextIds[this->actor.params]); func_8011552C(play, DO_ACTION_DECIDE); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -693,7 +693,7 @@ void EnOssan_LookToLeftShelf(EnOssan* this, PlayState* play) { this->cutsceneState = ENOSSAN_CUTSCENESTATE_PLAYING; EnOssan_UpdateCursorPos(play, this); EnOssan_SetupAction(this, EnOssan_BrowseLeftShelf); - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } else { ActorCutscene_SetIntentToPlay(this->cutscene); } @@ -721,7 +721,7 @@ void EnOssan_LookToRightShelf(EnOssan* this, PlayState* play) { this->cutsceneState = ENOSSAN_CUTSCENESTATE_PLAYING; EnOssan_UpdateCursorPos(play, this); EnOssan_SetupAction(this, EnOssan_BrowseRightShelf); - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } else { ActorCutscene_SetIntentToPlay(this->cutscene); } @@ -824,7 +824,7 @@ s32 EnOssan_HasPlayerSelectedItem(PlayState* play, EnOssan* this, Input* input) if (EnOssan_TestItemSelected(play)) { if (!item->isOutOfStock) { this->prevActionFunc = this->actionFunc; - func_80151938(play, this->items[this->cursorIndex]->choiceTextId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->choiceTextId); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; play_sound(NA_SE_SY_DECIDE); @@ -888,7 +888,7 @@ void EnOssan_BrowseLeftShelf(EnOssan* this, PlayState* play) { } EnOssan_CursorUpDown(this); if (this->cursorIndex != prevCursorIndex) { - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); play_sound(NA_SE_SY_CURSOR); } } @@ -946,7 +946,7 @@ void EnOssan_BrowseRightShelf(EnOssan* this, PlayState* play) { } EnOssan_CursorUpDown(this); if (this->cursorIndex != prevCursorIndex) { - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); play_sound(NA_SE_SY_CURSOR); } } @@ -991,12 +991,12 @@ void EnOssan_SetupBuyItemWithFanfare(PlayState* play, EnOssan* this) { } void EnOssan_SetupCannotBuy(PlayState* play, EnOssan* this, u16 textId) { - func_80151938(play, textId); + Message_ContinueTextbox(play, textId); EnOssan_SetupAction(this, EnOssan_CannotBuy); } void EnOssan_SetupBuy(PlayState* play, EnOssan* this, u16 textId) { - func_80151938(play, textId); + Message_ContinueTextbox(play, textId); EnOssan_SetupAction(this, EnOssan_CanBuy); } @@ -1061,7 +1061,7 @@ void EnOssan_SelectItem(EnOssan* this, PlayState* play) { case 1: func_8019F230(); this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); break; } } @@ -1071,7 +1071,7 @@ void EnOssan_SelectItem(EnOssan* this, PlayState* play) { void EnOssan_CannotBuy(EnOssan* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } } @@ -1084,7 +1084,7 @@ void EnOssan_CanBuy(EnOssan* this, PlayState* play) { item = this->items[this->cursorIndex]; item->restockFunc(play, item); this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } } @@ -1172,7 +1172,7 @@ void EnOssan_ItemPurchased(EnOssan* this, PlayState* play) { } } if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { - func_80151938(play, 0x642); + Message_ContinueTextbox(play, 0x642); } else { func_800B85E0(&this->actor, play, 400.0f, PLAYER_IA_MINUS1); } diff --git a/src/overlays/actors/ovl_En_Ot/z_en_ot.c b/src/overlays/actors/ovl_En_Ot/z_en_ot.c index 6244c9d8ee..ed5078864d 100644 --- a/src/overlays/actors/ovl_En_Ot/z_en_ot.c +++ b/src/overlays/actors/ovl_En_Ot/z_en_ot.c @@ -804,12 +804,12 @@ void func_80B5D160(EnOt* this, PlayState* play) { break; case 0x10A5: - func_801477B4(play); + Message_CloseTextbox(play); func_80B5CE6C(this, play); break; case 0x106D: - func_801477B4(play); + Message_CloseTextbox(play); func_80B5C154(this, play); break; } diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 927c709949..fd45820c11 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -327,12 +327,12 @@ void func_8095AD54(EnOwl* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(play)) { switch (play->msgCtx.choiceIndex) { case OWL_REPEAT: - func_80151938(play, 0x7D1); + Message_ContinueTextbox(play, 0x7D1); this->actionFunc = func_8095AE00; break; case OWL_OK: - func_80151938(play, 0x7D3); + Message_ContinueTextbox(play, 0x7D3); this->actionFunc = func_8095ABF0; break; } @@ -341,14 +341,14 @@ void func_8095AD54(EnOwl* this, PlayState* play) { void func_8095AE00(EnOwl* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_80151938(play, 0x7D2); + Message_ContinueTextbox(play, 0x7D2); this->actionFunc = func_8095AD54; } } void func_8095AE60(EnOwl* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_80151938(play, 0x7D1); + Message_ContinueTextbox(play, 0x7D1); this->actionFunc = func_8095AE00; } } @@ -367,10 +367,10 @@ void func_8095AF2C(EnOwl* this, PlayState* play) { if (Message_ShouldAdvance(play)) { if (play->msgCtx.currentTextId == 0xBFE) { func_8095ACEC(this); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_8095ABF0; } else { - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); } } break; @@ -614,16 +614,16 @@ void func_8095BA84(EnOwl* this, PlayState* play) { case 0: func_8019F208(); if (CHECK_WEEKEVENTREG(WEEKEVENTREG_09_40)) { - func_80151938(play, 0xBF4); + Message_ContinueTextbox(play, 0xBF4); } else { SET_WEEKEVENTREG(WEEKEVENTREG_09_40); - func_80151938(play, 0xBED); + Message_ContinueTextbox(play, 0xBED); } break; case 1: func_8019F230(); - func_80151938(play, 0xBEF); + Message_ContinueTextbox(play, 0xBEF); break; } break; @@ -632,12 +632,12 @@ void func_8095BA84(EnOwl* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 0: func_8019F208(); - func_80151938(play, 0xBF4); + Message_ContinueTextbox(play, 0xBF4); return; case 1: func_8019F230(); - func_80151938(play, 0xBF3); + Message_ContinueTextbox(play, 0xBF3); return; } break; @@ -650,21 +650,21 @@ void func_8095BA84(EnOwl* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0xBEA: SET_WEEKEVENTREG(WEEKEVENTREG_09_20); - func_80151938(play, 0xBEB); + Message_ContinueTextbox(play, 0xBEB); break; case 0xBEB: case 0xBF0: - func_80151938(play, 0xBEC); + Message_ContinueTextbox(play, 0xBEC); break; case 0xBED: case 0xBF4: - func_80151938(play, 0xBEE); + Message_ContinueTextbox(play, 0xBEE); break; case 0xBEE: - func_801477B4(play); + Message_CloseTextbox(play); Audio_QueueSeqCmd(0x110000FF); EnOwl_ChangeMode(this, func_8095B9FC, func_8095C484, &this->skelAnime1, &object_owl_Anim_00CB94, 0.0f); @@ -680,7 +680,7 @@ void func_8095BA84(EnOwl* this, PlayState* play) { case 0xBEF: case 0xBF3: - func_801477B4(play); + Message_CloseTextbox(play); Audio_QueueSeqCmd(0x110000FF); func_8095ACEC(this); this->actor.flags &= ~ACTOR_FLAG_10000; @@ -689,11 +689,11 @@ void func_8095BA84(EnOwl* this, PlayState* play) { break; case 0xBF1: - func_80151938(play, 0xBF2); + Message_ContinueTextbox(play, 0xBF2); break; case 0xBF5: - func_801477B4(play); + Message_CloseTextbox(play); Audio_QueueSeqCmd(0x110000FF); this->actor.flags &= ~ACTOR_FLAG_10000; EnOwl_ChangeMode(this, func_8095B3DC, func_8095C484, &this->skelAnime1, &object_owl_Anim_00CB94, diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c index 33c95ce08a..36605afcb3 100644 --- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c +++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c @@ -680,7 +680,7 @@ void func_80BD9B4C(EnPamera* this, PlayState* play) { break; case 0x158E: case 0x15A8: - func_801477B4(play); + Message_CloseTextbox(play); func_80BD9C70(this, play); break; } diff --git a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c index 2b77b7c350..dd0225f0c2 100644 --- a/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c +++ b/src/overlays/actors/ovl_En_Rail_Skb/z_en_rail_skb.c @@ -732,7 +732,7 @@ void func_80B71F3C(EnRailSkb* this, PlayState* play) { Message_StartTextbox(play, 0x13F4, &this->actor); this->unk_400 = 0x13F4; } else { - func_801477B4(play); + Message_CloseTextbox(play); func_80B71D8C(this, play, func_80B71650); } break; @@ -744,7 +744,7 @@ void func_80B71F3C(EnRailSkb* this, PlayState* play) { break; case 0x13F4: - func_801477B4(play); + Message_CloseTextbox(play); func_80B71D8C(this, play, func_80B718B0); break; } diff --git a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c index 051cc8b334..64313c4be6 100644 --- a/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c +++ b/src/overlays/actors/ovl_En_Recepgirl/z_en_recepgirl.c @@ -168,7 +168,7 @@ void EnRecepgirl_Talk(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); } } diff --git a/src/overlays/actors/ovl_En_Rz/z_en_rz.c b/src/overlays/actors/ovl_En_Rz/z_en_rz.c index a564b23a53..23b6419abc 100644 --- a/src/overlays/actors/ovl_En_Rz/z_en_rz.c +++ b/src/overlays/actors/ovl_En_Rz/z_en_rz.c @@ -423,12 +423,12 @@ void func_80BFC078(EnRz* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0x2927: case 0x2928: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); SET_WEEKEVENTREG(WEEKEVENTREG_77_04); break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BFC3F8; if (this->animIndex != EN_RZ_ANIM_LINK_DANCE) { func_80BFB9E4(play, this, EN_RZ_ANIM_DANCE); @@ -480,7 +480,7 @@ void func_80BFC270(EnRz* this, PlayState* play) { void func_80BFC2F4(EnRz* this, PlayState* play) { EnRz_UpdateSkelAnime(this, play); if (!func_80BFBE70(this, play)) { - func_801477B4(play); + Message_CloseTextbox(play); Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 2000.0f, 1000.0f); this->actionFunc = func_80BFC270; } @@ -554,7 +554,7 @@ void func_80BFC608(EnRz* this, PlayState* play) { EnRz_UpdateSkelAnime(this, play); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BFC674; } } @@ -578,7 +578,7 @@ void func_80BFC728(EnRz* this, PlayState* play) { EnRz_UpdateSkelAnime(this, play); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BFC7E0; this->actor.textId++; if (EN_RZ_GET_SISTER(&this->actor) == EN_RZ_JUDO) { diff --git a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c index aa780cddfb..ff12d798f4 100644 --- a/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c +++ b/src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c @@ -119,15 +119,15 @@ void func_80A44F40(EnSekihi* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 0: func_8019F208(); - func_80151938(play, 0x101A); + Message_ContinueTextbox(play, 0x101A); break; case 1: func_8019F208(); - func_80151938(play, 0x101B); + Message_ContinueTextbox(play, 0x101B); break; case 2: func_8019F230(); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80A450B0; break; } @@ -139,11 +139,11 @@ void func_80A44F40(EnSekihi* this, PlayState* play) { if (Message_ShouldAdvance(play)) { switch (play->msgCtx.currentTextId) { case 0x1018: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x101A: case 0x101B: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80A450B0; break; } diff --git a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c index 214237f05a..03aa4ab197 100644 --- a/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c +++ b/src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c @@ -433,20 +433,20 @@ void func_80ADB924(EnSellnuts* this, PlayState* play) { this->unk_340 = player->actor.textId; this->actionFunc = func_80ADB0D8; } - func_801477B4(play); + Message_CloseTextbox(play); } else if (itemAction <= PLAYER_IA_MINUS1) { this->unk_340 = D_80ADD920[this->unk_33A]; - func_80151938(play, this->unk_340); + Message_ContinueTextbox(play, this->unk_340); this->actionFunc = func_80ADB0D8; } } else if ((talkState == TEXT_STATE_5) && Message_ShouldAdvance(play)) { if (this->unk_340 == D_80ADD910[this->unk_33A]) { this->unk_340 = D_80ADD938[this->unk_33A]; - func_80151938(play, this->unk_340); + Message_ContinueTextbox(play, this->unk_340); this->actionFunc = func_80ADB0D8; } else { this->unk_340 = 0xFF; - func_80151938(play, this->unk_340); + Message_ContinueTextbox(play, this->unk_340); this->actionFunc = func_80ADB0D8; } } diff --git a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c index c9420a40f9..e1ebc505c8 100644 --- a/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c +++ b/src/overlays/actors/ovl_En_Sob1/z_en_sob1.c @@ -487,7 +487,7 @@ s32 EnSob1_TestEndInteraction(EnSob1* this, PlayState* play, Input* input) { s32 EnSob1_TestCancelOption(EnSob1* this, PlayState* play, Input* input) { if (CHECK_BTN_ALL(input->press.button, BTN_B)) { this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); return true; } return false; @@ -504,7 +504,7 @@ void EnSob1_SetupStartShopping(PlayState* play, EnSob1* this, u8 skipHello) { void EnSob1_StartShopping(PlayState* play, EnSob1* this) { EnSob1_SetupAction(this, EnSob1_FaceShopkeeper); - func_80151938(play, sFacingShopkeeperTextIds[this->shopType]); + Message_ContinueTextbox(play, sFacingShopkeeperTextIds[this->shopType]); func_8011552C(play, DO_ACTION_DECIDE); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = true; @@ -513,7 +513,7 @@ void EnSob1_StartShopping(PlayState* play, EnSob1* this) { void EnSob1_TalkToShopkeeper(PlayState* play, EnSob1* this) { EnSob1_SetupAction(this, EnSob1_TalkingToShopkeeper); this->talkOptionTextId = EnSob1_GetTalkOption(this, play); - func_80151938(play, this->talkOptionTextId); + Message_ContinueTextbox(play, this->talkOptionTextId); func_8011552C(play, DO_ACTION_DECIDE); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -842,7 +842,7 @@ void EnSob1_ItemPurchased(EnSob1* this, PlayState* play) { } } if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { - func_80151938(play, 0x647); + Message_ContinueTextbox(play, 0x647); } else { func_800B85E0(&this->actor, play, 400.0f, PLAYER_IA_MINUS1); } @@ -866,7 +866,7 @@ void EnSob1_LookToShelf(EnSob1* this, PlayState* play) { this->cutsceneState = ENSOB1_CUTSCENESTATE_PLAYING; EnSob1_UpdateCursorPos(play, this); EnSob1_SetupAction(this, EnSob1_BrowseShelf); - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } else { ActorCutscene_SetIntentToPlay(this->cutscene); } @@ -904,7 +904,7 @@ s32 EnSob1_HasPlayerSelectedItem(PlayState* play, EnSob1* this, Input* input) { if (EnSob1_TestItemSelected(play)) { if (!item->isOutOfStock) { this->prevActionFunc = this->actionFunc; - func_80151938(play, this->items[this->cursorIndex]->choiceTextId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->choiceTextId); play_sound(NA_SE_SY_DECIDE); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -938,7 +938,7 @@ void EnSob1_BrowseShelf(EnSob1* this, PlayState* play) { EnSob1_CursorLeftRight(play, this); cursorIndex = this->cursorIndex; if (cursorIndex != prevCursorIndex) { - func_80151938(play, this->items[cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[cursorIndex]->actor.textId); play_sound(NA_SE_SY_CURSOR); } } @@ -959,12 +959,12 @@ void EnSob1_SetupBuyItemWithFanfare(PlayState* play, EnSob1* this) { } void EnSob1_SetupCannotBuy(PlayState* play, EnSob1* this, u16 textId) { - func_80151938(play, textId); + Message_ContinueTextbox(play, textId); EnSob1_SetupAction(this, EnSob1_CannotBuy); } void EnSob1_SetupCanBuy(PlayState* play, EnSob1* this, u16 textId) { - func_80151938(play, textId); + Message_ContinueTextbox(play, textId); EnSob1_SetupAction(this, EnSob1_CanBuy); } @@ -1050,7 +1050,7 @@ void EnSob1_SelectItem(EnSob1* this, PlayState* play) { case 1: func_8019F230(); this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); break; } } @@ -1061,7 +1061,7 @@ void EnSob1_CannotBuy(EnSob1* this, PlayState* play) { if (Message_GetState(&play->msgCtx) == TEXT_STATE_5) { if (Message_ShouldAdvance(play)) { this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } } } @@ -1075,7 +1075,7 @@ void EnSob1_CanBuy(EnSob1* this, PlayState* play) { item = this->items[this->cursorIndex]; item->restockFunc(play, item); this->actionFunc = this->prevActionFunc; - func_80151938(play, this->items[this->cursorIndex]->actor.textId); + Message_ContinueTextbox(play, this->items[this->cursorIndex]->actor.textId); } } diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 49c4fa1da1..18031242cb 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -694,11 +694,11 @@ void EnSsh_Talk(EnSsh* this, PlayState* play) { case 0x911: // Find all in here and defeat them case 0x912: // Don't forget to collect their token case 0x914: // In here, cursed spiders, defeat them to make me normal - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; default: // intended case 0x915 from above (914+1) - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnSsh_Idle; break; } diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index b622d3f526..9048a1d0f5 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -236,7 +236,7 @@ void EnSth_HandlePanicConversation(EnSth* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { this->actionFunc = EnSth_PanicIdle; - func_801477B4(play); + Message_CloseTextbox(play); } } @@ -351,17 +351,17 @@ void EnSth_HandleOceansideSpiderHouseConversation(EnSth* this, PlayState* play) if (Message_ShouldAdvance(play)) { switch (play->msgCtx.currentTextId) { case 0x1134: // (does not exist) - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; - case 0x1132: // Heard noise, came in to see - case 0x113A: // Had no idea there was a basement here - case 0x113F: // Heard noise... I never thought I'd find a place like this - func_80151938(play, 0x1133); // did you find this place? + case 0x1132: // Heard noise, came in to see + case 0x113A: // Had no idea there was a basement here + case 0x113F: // Heard noise... I never thought I'd find a place like this + Message_ContinueTextbox(play, 0x1133); // did you find this place? break; - case 0x1133: // did you find this place? - func_80151938(play, 0x1136); // I want to buy this place from you + case 0x1133: // did you find this place? + Message_ContinueTextbox(play, 0x1136); // I want to buy this place from you EnSth_ChangeAnim(this, STH_ANIM_PLEAD); break; @@ -397,23 +397,23 @@ void EnSth_HandleOceansideSpiderHouseConversation(EnSth* this, PlayState* play) STH_GI_ID(&this->actor) = GI_RUPEE_RED; break; } - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnSth_GiveOceansideSpiderHouseReward; EnSth_GiveOceansideSpiderHouseReward(this, play); break; - case 0x113C: // (Second day) I am giving you my life savings - func_80151938(play, 0x113B); // If only I had gotten here yesterday... + case 0x113C: // (Second day) I am giving you my life savings + Message_ContinueTextbox(play, 0x113B); // If only I had gotten here yesterday... break; - case 0x1141: // (Final day) This is all I have - func_80151938(play, 0x1140); // If only I had gotten here two days ago... + case 0x1141: // (Final day) This is all I have + Message_ContinueTextbox(play, 0x1140); // If only I had gotten here two days ago... EnSth_ChangeAnim(this, STH_ANIM_WAIT); break; default: this->actionFunc = EnSth_OceansideSpiderHouseIdle; - func_801477B4(play); + Message_CloseTextbox(play); this->sthFlags |= STH_FLAG_OCEANSIDE_SPIDER_HOUSE_GREET; break; } @@ -443,7 +443,7 @@ void EnSth_HandleMoonLookingConversation(EnSth* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { this->actionFunc = EnSth_MoonLookingIdle; - func_801477B4(play); + Message_CloseTextbox(play); } this->headRot.x = -0x1388; } @@ -539,13 +539,13 @@ void EnSth_HandleSwampSpiderHouseConversation(EnSth* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0x90C: // (does not exist) EnSth_ChangeAnim(this, STH_ANIM_TALK); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x916: // I have been saved! I thought I was doomed case 0x919: // I have been saved! I thought I was doomed (duplicate) EnSth_ChangeAnim(this, STH_ANIM_WAIT); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x8FC: // (does not exist) @@ -553,13 +553,13 @@ void EnSth_HandleSwampSpiderHouseConversation(EnSth* this, PlayState* play) { case 0x900: // (does not exist) case 0x90A: // (does not exist) case 0x90D: // (does not exist) - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x901: // (does not exist) case 0x90B: // (does not exist) case 0x917: // Someone gave me this mask and said it would make me rich, Take it - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnSth_SwampSpiderHouseGiveMask; EnSth_SwampSpiderHouseGiveMask(this, play); break; @@ -578,7 +578,7 @@ void EnSth_HandleSwampSpiderHouseConversation(EnSth* this, PlayState* play) { default: this->actor.flags &= ~ACTOR_FLAG_10000; - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnSth_SwampSpiderHouseIdle; break; } diff --git a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c index e040019b87..93e68a83fc 100644 --- a/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c +++ b/src/overlays/actors/ovl_En_Stone_heishi/z_en_stone_heishi.c @@ -229,7 +229,7 @@ void func_80BC9680(EnStoneheishi* this, PlayState* play) { this->textIdSet = true; player->actor.textId = sEnStoneHeishiTextIds[this->textIdIndex]; - func_80151938(play, sEnStoneHeishiTextIds[this->textIdIndex]); + Message_ContinueTextbox(play, sEnStoneHeishiTextIds[this->textIdIndex]); func_80151BB4(play, 0x12); } } @@ -237,10 +237,10 @@ void func_80BC9680(EnStoneheishi* this, PlayState* play) { SkelAnime_Update(&this->skelAnime); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); if (this->textIdIndex == 2) { - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); EnStoneheishi_SetupCheckGivenItem(this); } else if (this->textIdIndex == 3) { func_80BC94B0(this); @@ -254,7 +254,7 @@ void func_80BC9680(EnStoneheishi* this, PlayState* play) { func_80BC94B0(this); return; } - func_80151938(play, sEnStoneHeishiTextIds[this->textIdIndex]); + Message_ContinueTextbox(play, sEnStoneHeishiTextIds[this->textIdIndex]); } } } @@ -274,7 +274,7 @@ void EnStoneheishi_CheckGivenItem(EnStoneheishi* this, PlayState* play) { if (itemAction > PLAYER_IA_NONE) { this->timer = 40; - func_801477B4(play); + Message_CloseTextbox(play); if ((itemAction == PLAYER_IA_BOTTLE_POTION_RED) || (itemAction == PLAYER_IA_BOTTLE_POTION_BLUE)) { this->playerGivesBluePotion = false; @@ -292,7 +292,7 @@ void EnStoneheishi_CheckGivenItem(EnStoneheishi* this, PlayState* play) { this->actionFunc = func_80BC9680; } } else if (itemAction <= PLAYER_IA_MINUS1) { - func_801477B4(play); + Message_CloseTextbox(play); func_80151BB4(play, 0x12); func_80BC94B0(this); } @@ -314,7 +314,7 @@ void EnStoneheishi_DrinkBottleProcess(EnStoneheishi* this, PlayState* play) { case EN_STONE_DRINK_BOTTLE_INITIAL: if (this->timer == 0) { this->textIdIndex = 4; - func_80151938(play, sEnStoneHeishiTextIds[this->textIdIndex]); + Message_ContinueTextbox(play, sEnStoneHeishiTextIds[this->textIdIndex]); player->actor.textId = sEnStoneHeishiTextIds[this->textIdIndex]; this->drinkBottleState++; } @@ -366,7 +366,7 @@ void EnStoneheishi_DrinkBottleProcess(EnStoneheishi* this, PlayState* play) { case EN_STONE_DRINK_BOTTLE_STANDING: if (this->endFrame <= currentFrame) { this->textIdIndex = 5; - func_80151938(play, sEnStoneHeishiTextIds[this->textIdIndex]); + Message_ContinueTextbox(play, sEnStoneHeishiTextIds[this->textIdIndex]); player->actor.textId = sEnStoneHeishiTextIds[this->textIdIndex]; EnStoneheishi_ChangeAnim(this, EN_STONE_HEISHI_ANIM_STAND_HAND_ON_HIP); this->action = EN_STONE_ACTION_1; @@ -377,7 +377,7 @@ void EnStoneheishi_DrinkBottleProcess(EnStoneheishi* this, PlayState* play) { } void EnStoneheishi_GiveItemReward(EnStoneheishi* this, PlayState* play) { - func_801477B4(play); + Message_CloseTextbox(play); if (INV_CONTENT(ITEM_MASK_STONE) == ITEM_MASK_STONE) { Actor_OfferGetItem(&this->actor, play, GI_RUPEE_BLUE, 300.0f, 300.0f); diff --git a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c index 0106430a17..edbf581f91 100644 --- a/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c +++ b/src/overlays/actors/ovl_En_Stop_heishi/z_en_stop_heishi.c @@ -521,13 +521,13 @@ void func_80AE85C4(EnStopheishi* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { if (this->unk_27E != 0) { this->actor.textId = this->unk_27E; - func_80151938(play, this->actor.textId); + Message_ContinueTextbox(play, this->actor.textId); EnStopHeishi_ChangeAnim(this, SOLDIER_ANIM_STAND_HAND_ON_HIP); SET_WEEKEVENTREG(WEEKEVENTREG_12_20); this->unk_265 = 1; this->unk_27E = 0; } else { - func_801477B4(play); + Message_CloseTextbox(play); func_80AE7E9C(this); } } diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index cae4d0a9e6..3ac6d4cdb9 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -222,7 +222,7 @@ void EnSyatekiMan_Init(Actor* thisx, PlayState* play) { } void EnSyatekiMan_Destroy(Actor* thisx, PlayState* play) { - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); } /** @@ -341,8 +341,8 @@ void EnSyatekiMan_Swamp_HandleChoice(EnSyatekiMan* this, PlayState* play) { } else { func_8019F208(); Rupees_ChangeBy(-20); - SET_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + SET_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; this->shootingGameState = SG_GAME_STATE_MOVING_PLAYER; @@ -408,11 +408,11 @@ void EnSyatekiMan_Swamp_HandleNormalMessage(EnSyatekiMan* this, PlayState* play) break; case 0xA32: // You have to try harder! - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) { - func_801477B4(play); + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) { + Message_CloseTextbox(play); player->stateFlags1 &= ~PLAYER_STATE1_20; - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); this->actionFunc = EnSyatekiMan_Swamp_Idle; gSaveContext.minigameStatus = MINIGAME_STATUS_END; this->shootingGameState = SG_GAME_STATE_NONE; @@ -469,8 +469,8 @@ void EnSyatekiMan_Swamp_Talk(EnSyatekiMan* this, PlayState* play) { play->msgCtx.msgMode = 0x43; play->msgCtx.stateTimer = 4; player->stateFlags1 &= ~PLAYER_STATE1_20; - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); this->actionFunc = EnSyatekiMan_Swamp_Idle; this->shootingGameState = SG_GAME_STATE_NONE; } @@ -660,8 +660,8 @@ void EnSyatekiMan_Town_HandleChoice(EnSyatekiMan* this, PlayState* play) { this->prevTextId = 0x3FF; } - SET_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + SET_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); } } else { func_8019F230(); @@ -747,8 +747,8 @@ void EnSyatekiMan_Town_HandleNormalMessage(EnSyatekiMan* this, PlayState* play) player->actor.freezeTimer = 0; this->shootingGameState = SG_GAME_STATE_MOVING_PLAYER; player->stateFlags1 |= PLAYER_STATE1_20; - SET_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + SET_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); this->actionFunc = EnSyatekiMan_Town_MovePlayerAndSayHighScore; } break; @@ -767,10 +767,10 @@ void EnSyatekiMan_Town_HandleNormalMessage(EnSyatekiMan* this, PlayState* play) break; case 0x401: // You got [score]? Oh, that's too bad... - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) { - func_801477B4(play); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) { + Message_CloseTextbox(play); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); this->shootingGameState = SG_GAME_STATE_NONE; this->actionFunc = EnSyatekiMan_Town_Idle; } else { @@ -781,10 +781,10 @@ void EnSyatekiMan_Town_HandleNormalMessage(EnSyatekiMan* this, PlayState* play) break; case 0x403: // You got [score]? Too bad... - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) { - func_801477B4(play); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) { + Message_CloseTextbox(play); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); this->shootingGameState = SG_GAME_STATE_NONE; this->actionFunc = EnSyatekiMan_Town_Idle; } else { @@ -839,8 +839,8 @@ void EnSyatekiMan_Town_Talk(EnSyatekiMan* this, PlayState* play) { case TEXT_STATE_DONE: if (Message_ShouldAdvance(play)) { - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); player->stateFlags1 &= ~PLAYER_STATE1_20; this->actionFunc = EnSyatekiMan_Town_Idle; this->shootingGameState = SG_GAME_STATE_NONE; @@ -958,8 +958,8 @@ void EnSyatekiMan_Town_GiveReward(EnSyatekiMan* this, PlayState* play) { player->stateFlags1 &= ~PLAYER_STATE1_20; this->score = 0; this->shootingGameState = SG_GAME_STATE_NONE; - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); this->actionFunc = EnSyatekiMan_SetupIdle; } } else if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { @@ -1118,9 +1118,9 @@ void EnSyatekiMan_Swamp_EndGame(EnSyatekiMan* this, PlayState* play) { this->prevTextId = 0xA34; this->shootingGameState = SG_GAME_STATE_ENDED; } else if (this->score >= 2000) { - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) { - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_01); - CLEAR_WEEKEVENTREG(WEEKEVENTREG_63_02); + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) { + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT); + CLEAR_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); this->shootingGameState = SG_GAME_STATE_NONE; gSaveContext.minigameStatus = MINIGAME_STATUS_END; this->actionFunc = EnSyatekiMan_Swamp_Idle; diff --git a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c index 64eb405692..386e80a1f6 100644 --- a/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c +++ b/src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c @@ -752,7 +752,7 @@ void EnTalkGibud_CheckPresentedItem(EnTalkGibud* this, PlayState* play) { default: break; } - func_801477B4(play); + Message_CloseTextbox(play); } else if (this->itemAction <= PLAYER_IA_MINUS1) { Message_StartTextbox(play, 0x1389, &this->actor); this->textId = 0x1389; diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c index 145725a47b..8554505f0d 100644 --- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c +++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c @@ -316,9 +316,9 @@ s32 func_80A3E898(EnTest3* this, PlayState* play) { func_80151BB4(play, 2); } if (textId == 0xFFFF) { - func_801477B4(play); + Message_CloseTextbox(play); } else if (textId) { // != 0 - func_80151938(play, textId); + Message_ContinueTextbox(play, textId); } if (textId == 0x296B) { LinkAnimation_PlayOnceSetSpeed(play, &this->player.skelAnime, &gPlayerAnim_al_yareyare, 2.0f / 3.0f); diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c index 0683008647..c0ae22fd5a 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c @@ -1,7 +1,11 @@ /* * File: z_en_time_tag.c * Overlay: ovl_En_Time_Tag - * Description: + * Description: Various text-, time- and event-based triggers. There are 4 variations of this actor. + * - Song of Soaring engraving + * - Clocktown Rooftop Oath to Order event + * - Mikau's and Lulu's diary + * - Kick out of scene event after a certain time */ #include "z_en_time_tag.h" @@ -15,20 +19,23 @@ void EnTimeTag_Init(Actor* thisx, PlayState* play); void EnTimeTag_Destroy(Actor* thisx, PlayState* play); void EnTimeTag_Update(Actor* thisx, PlayState* play); -void func_80AC9FD4(EnTimeTag* this, PlayState* play); -void func_80AC9FE4(EnTimeTag* this, PlayState* play); -void func_80ACA0A8(EnTimeTag* this, PlayState* play); -void func_80ACA12C(EnTimeTag* this, PlayState* play); -void func_80ACA184(EnTimeTag* this, PlayState* play); -void func_80ACA268(EnTimeTag* this, PlayState* play); -void func_80ACA348(EnTimeTag* this, PlayState* play); -void func_80ACA3C0(EnTimeTag* this, PlayState* play); -void func_80ACA418(EnTimeTag* this, PlayState* play); -void func_80ACA5F8(EnTimeTag* this, PlayState* play); -void func_80ACA714(EnTimeTag* this, PlayState* play); -void func_80ACA724(EnTimeTag* this, PlayState* play); -void func_80ACA7C4(EnTimeTag* this, PlayState* play); -void func_80ACA840(EnTimeTag* this, PlayState* play); +void EnTimeTag_RooftopOath_DoNothing(EnTimeTag* this, PlayState* play); +void EnTimeTag_RooftopOath_Cutscene(EnTimeTag* this, PlayState* play); +void EnTimeTag_RooftopOath_Wait(EnTimeTag* this, PlayState* play); + +void EnTimeTag_SoaringEngraving_GetSong(EnTimeTag* this, PlayState* play); +void EnTimeTag_SoaringEngraving_StartCutscene(EnTimeTag* this, PlayState* play); +void EnTimeTag_SoaringEngraving_Wait(EnTimeTag* this, PlayState* play); + +void EnTimeTag_Diary_AfterOcarina(EnTimeTag* this, PlayState* play); +void EnTimeTag_Diary_TeachEvanSongSnippets(EnTimeTag* this, PlayState* play); +void EnTimeTag_Diary_Cutscene(EnTimeTag* this, PlayState* play); +void EnTimeTag_Diary_Wait(EnTimeTag* this, PlayState* play); + +void EnTimeTag_KickOut_DoNothing(EnTimeTag* this, PlayState* play); +void EnTimeTag_KickOut_Transition(EnTimeTag* this, PlayState* play); +void EnTimeTag_KickOut_WaitForTrigger(EnTimeTag* this, PlayState* play); +void EnTimeTag_KickOut_WaitForTime(EnTimeTag* this, PlayState* play); ActorInit En_Time_Tag_InitVars = { ACTOR_EN_TIME_TAG, @@ -45,37 +52,41 @@ ActorInit En_Time_Tag_InitVars = { void EnTimeTag_Init(Actor* thisx, PlayState* play) { EnTimeTag* this = THIS; - this->actionFunc = func_80ACA840; + this->actionFunc = EnTimeTag_KickOut_WaitForTime; - switch (ENTIMETAG_GET_E000(&this->actor)) { - case 4: + switch (TIMETAG_GET_TYPE(&this->actor)) { + case TIMETAG_KICKOUT_FINAL_HOURS: if (CHECK_WEEKEVENTREG(WEEKEVENTREG_08_40) || (CURRENT_DAY != 3)) { Actor_Kill(&this->actor); return; } - this->actor.home.rot.x = 0; - this->actor.home.rot.y = 0; + // Overwrite kickout time to midnight + TIMETAG_KICKOUT_HOUR(&this->actor) = 0; + TIMETAG_KICKOUT_MINUTE(&this->actor) = 0; break; - case 2: - this->actionFunc = func_80ACA0A8; + case TIMETAG_ROOFTOP_OATH: + this->actionFunc = EnTimeTag_RooftopOath_Wait; this->actor.flags |= ACTOR_FLAG_2000000; break; - case 1: - this->actionFunc = func_80ACA268; + case TIMETAG_SOARING_ENGRAVING: + this->actionFunc = EnTimeTag_SoaringEngraving_Wait; this->actor.flags |= ACTOR_FLAG_2000000; if (CHECK_QUEST_ITEM(QUEST_SONG_SOARING)) { this->actor.textId = 0xC02; - return; + } else { + this->actor.textId = 0; } - this->actor.textId = 0; break; - case 3: - this->actionFunc = func_80ACA5F8; + case TIMETAG_DIARY: + this->actionFunc = EnTimeTag_Diary_Wait; this->actor.textId = 0; - this->actor.home.rot.x = 0; + TIMETAG_DIARY_TIMER(&this->actor) = 0; + break; + + default: break; } } @@ -83,14 +94,16 @@ void EnTimeTag_Init(Actor* thisx, PlayState* play) { void EnTimeTag_Destroy(Actor* thisx, PlayState* play) { } -void func_80AC9FD4(EnTimeTag* this, PlayState* play) { +void EnTimeTag_RooftopOath_DoNothing(EnTimeTag* this, PlayState* play) { } -void func_80AC9FE4(EnTimeTag* this, PlayState* play) { +void EnTimeTag_RooftopOath_Cutscene(EnTimeTag* this, PlayState* play) { if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) { ActorCutscene_StartAndSetUnkLinkFields(this->actor.cutscene, &this->actor); - this->actionFunc = func_80AC9FD4; + + this->actionFunc = EnTimeTag_RooftopOath_DoNothing; gSaveContext.timerStates[TIMER_ID_MOON_CRASH] = TIMER_STATE_OFF; + if (CHECK_QUEST_ITEM(QUEST_REMAINS_ODOLWA) && CHECK_QUEST_ITEM(QUEST_REMAINS_GOHT) && CHECK_QUEST_ITEM(QUEST_REMAINS_GYORG) && CHECK_QUEST_ITEM(QUEST_REMAINS_TWINMOLD)) { SET_WEEKEVENTREG(WEEKEVENTREG_25_02); @@ -100,12 +113,12 @@ void func_80AC9FE4(EnTimeTag* this, PlayState* play) { } } -void func_80ACA0A8(EnTimeTag* this, PlayState* play) { +void EnTimeTag_RooftopOath_Wait(EnTimeTag* this, PlayState* play) { EnTimeTag* this2 = this; if ((play->msgCtx.ocarinaMode == 3) && (play->msgCtx.lastPlayedSong == OCARINA_SONG_OATH)) { if (this->actor.cutscene != -1) { - this->actionFunc = func_80AC9FE4; + this->actionFunc = EnTimeTag_RooftopOath_Cutscene; ActorCutscene_SetIntentToPlay(this2->actor.cutscene); gSaveContext.timerStates[TIMER_ID_MOON_CRASH] = TIMER_STATE_OFF; } @@ -113,192 +126,217 @@ void func_80ACA0A8(EnTimeTag* this, PlayState* play) { } } -void func_80ACA12C(EnTimeTag* this, PlayState* play) { +void EnTimeTag_SoaringEngraving_GetSong(EnTimeTag* this, PlayState* play) { if (ActorCutscene_GetCurrentIndex() != this->actor.cutscene) { - this->actionFunc = func_80ACA268; + this->actionFunc = EnTimeTag_SoaringEngraving_Wait; this->actor.textId = 0xC02; Item_Give(play, ITEM_SONG_SOARING); } } -void func_80ACA184(EnTimeTag* this, PlayState* play) { +void EnTimeTag_SoaringEngraving_StartCutscene(EnTimeTag* this, PlayState* play) { if (ActorCutscene_GetCurrentIndex() == 0x7C) { ActorCutscene_Stop(0x7C); ActorCutscene_SetIntentToPlay(this->actor.cutscene); } else if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) { ActorCutscene_Start(this->actor.cutscene, &this->actor); - this->actionFunc = func_80ACA12C; + this->actionFunc = EnTimeTag_SoaringEngraving_GetSong; } else { ActorCutscene_SetIntentToPlay(this->actor.cutscene); } } -void func_80ACA208(EnTimeTag* this, PlayState* play) { +void EnTimeTag_SoaringEngraving_SubsequentInteraction(EnTimeTag* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); - this->actionFunc = func_80ACA268; + Message_CloseTextbox(play); + this->actionFunc = EnTimeTag_SoaringEngraving_Wait; } } -void func_80ACA268(EnTimeTag* this, PlayState* play) { +void EnTimeTag_SoaringEngraving_Wait(EnTimeTag* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { if (this->actor.textId == 0) { - this->actionFunc = func_80ACA184; + this->actionFunc = EnTimeTag_SoaringEngraving_StartCutscene; } else { - this->actionFunc = func_80ACA208; + this->actionFunc = EnTimeTag_SoaringEngraving_SubsequentInteraction; } } else if ((this->actor.xzDistToPlayer < 100.0f) && Player_IsFacingActor(&this->actor, 0x3000, play) && - (Flags_GetSwitch(play, ENTIMETAG_GET_SWITCHFLAG(&this->actor)) || + (Flags_GetSwitch(play, TIMETAG_SOARING_GET_SWITCHFLAG(&this->actor)) || CHECK_QUEST_ITEM(QUEST_SONG_SOARING))) { this->actor.flags |= ACTOR_FLAG_1; func_800B8614(&this->actor, play, 110.0f); } } -void func_80ACA348(EnTimeTag* this, PlayState* play) { - if (this->actor.home.rot.x > 0) { - this->actor.home.rot.x--; +void EnTimeTag_Diary_AfterOcarina(EnTimeTag* this, PlayState* play) { + if (TIMETAG_DIARY_TIMER(&this->actor) > 0) { + TIMETAG_DIARY_TIMER(&this->actor)--; return; } - if (this->actor.home.rot.z != 0) { - func_80151938(play, 0x1230); + if (TIMETAG_DIARY_SONG(&this->actor) != TIMETAG_DIARY_SONG_EVAN_PART1) { + // TIMETAG_DIARY_SONG_EVAN_PART2 + Message_ContinueTextbox(play, 0x1230); } else { - func_80151938(play, 0x122D); + // TIMETAG_DIARY_SONG_EVAN_PART1 + Message_ContinueTextbox(play, 0x122D); } - this->actionFunc = func_80ACA418; + this->actionFunc = EnTimeTag_Diary_Cutscene; } -void func_80ACA3C0(EnTimeTag* this, PlayState* play) { - if ((play->msgCtx.unk11F00->state == 0) && (play->msgCtx.msgMode == 0x1B)) { - this->actor.home.rot.x = 5; - this->actionFunc = func_80ACA348; +void EnTimeTag_Diary_TeachEvanSongSnippets(EnTimeTag* this, PlayState* play) { + if ((play->msgCtx.ocarinaStaff->state == 0) && (play->msgCtx.msgMode == 0x1B)) { + TIMETAG_DIARY_TIMER(&this->actor) = 5; + this->actionFunc = EnTimeTag_Diary_AfterOcarina; play->msgCtx.msgLength = 0; play->msgCtx.msgMode = 0; } } -void func_80ACA418(EnTimeTag* this, PlayState* play) { +void EnTimeTag_Diary_Cutscene(EnTimeTag* this, PlayState* play) { switch (Message_GetState(&play->msgCtx)) { case TEXT_STATE_5: if (Message_ShouldAdvance(play)) { switch (play->msgCtx.currentTextId) { - case 0x101C: - case 0x101D: - case 0x101E: - case 0x122D: - func_80151938(play, play->msgCtx.currentTextId + 1); + case 0x101C: // Lulu diary part 1 + case 0x101D: // Lulu diary part 2 + case 0x101E: // Lulu diary part 3 + case 0x122D: // Mikau diary part 2 + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; - case 0x101F: - case 0x122A: - case 0x1230: - func_801477B4(play); - this->actionFunc = func_80ACA5F8; + case 0x101F: // Lulu diary part 4 + case 0x122A: // Can not read Zora script + case 0x1230: // Mikau diary part 4 + Message_CloseTextbox(play); + this->actionFunc = EnTimeTag_Diary_Wait; if (ActorCutscene_GetCurrentIndex() == this->actor.cutscene) { ActorCutscene_Stop(this->actor.cutscene); } break; - case 0x122B: + case 0x122B: // Mikau diary part 1 func_80152434(play, 0x3F); - this->actionFunc = func_80ACA3C0; - this->actor.home.rot.z = 0; + this->actionFunc = EnTimeTag_Diary_TeachEvanSongSnippets; + TIMETAG_DIARY_SONG(&this->actor) = TIMETAG_DIARY_SONG_EVAN_PART1; break; - case 0x122E: + case 0x122E: // Mikau diary part 3 func_80152434(play, 0x40); - this->actionFunc = func_80ACA3C0; - this->actor.home.rot.z = 1; + this->actionFunc = EnTimeTag_Diary_TeachEvanSongSnippets; + TIMETAG_DIARY_SONG(&this->actor) = TIMETAG_DIARY_SONG_EVAN_PART2; + break; + + default: break; } } break; case TEXT_STATE_CLOSING: - this->actionFunc = func_80ACA5F8; + this->actionFunc = EnTimeTag_Diary_Wait; break; } - if (this->actor.home.rot.x != 0) { + if (TIMETAG_DIARY_TIMER(&this->actor) != 0) { if (this->actor.cutscene == -1) { - this->actor.home.rot.x = 0; + TIMETAG_DIARY_TIMER(&this->actor) = 0; } else if (ActorCutscene_GetCurrentIndex() == 0x7C) { ActorCutscene_Stop(0x7C); ActorCutscene_SetIntentToPlay(this->actor.cutscene); } else if (ActorCutscene_GetCanPlayNext(this->actor.cutscene)) { ActorCutscene_Start(this->actor.cutscene, &this->actor); - this->actor.home.rot.x = 0; + TIMETAG_DIARY_TIMER(&this->actor) = 0; } else { ActorCutscene_SetIntentToPlay(this->actor.cutscene); } } } -void func_80ACA5F8(EnTimeTag* this, PlayState* play) { +void EnTimeTag_Diary_Wait(EnTimeTag* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { if (gSaveContext.save.playerForm == PLAYER_FORM_ZORA) { - if (ENTIMETAG_GET_SWITCHFLAG(&this->actor) == 1) { + if (TIMETAG_DIARY_GET_TYPE(&this->actor) == TIMETAG_DIARY_LULU) { Message_StartTextbox(play, 0x101C, &this->actor); } else { + // TIMETAG_DIARY_MIKAU Message_StartTextbox(play, 0x122B, &this->actor); } - this->actor.home.rot.x = 1; + TIMETAG_DIARY_TIMER(&this->actor) = 1; } else { + // unable to read Zora script Message_StartTextbox(play, 0x122A, &this->actor); + + //! FAKE: https://decomp.me/scratch/AHRNe if (0) {} + ((EnElf*)GET_PLAYER(play)->tatlActor)->unk_264 |= 4; Actor_ChangeFocus(&this->actor, play, GET_PLAYER(play)->tatlActor); - this->actor.home.rot.x = 0; + TIMETAG_DIARY_TIMER(&this->actor) = 0; } - this->actionFunc = func_80ACA418; + this->actionFunc = EnTimeTag_Diary_Cutscene; } else if ((this->actor.xzDistToPlayer < 100.0f) && Player_IsFacingActor(&this->actor, 0x3000, play)) { func_800B8614(&this->actor, play, 110.0f); } } -void func_80ACA714(EnTimeTag* this, PlayState* play) { +void EnTimeTag_KickOut_DoNothing(EnTimeTag* this, PlayState* play) { } -void func_80ACA724(EnTimeTag* this, PlayState* play) { +void EnTimeTag_KickOut_Transition(EnTimeTag* this, PlayState* play) { if (Message_GetState(&play->msgCtx) == TEXT_STATE_5) { - play->nextEntrance = play->setupExitList[ENTIMETAG_GET_1F(&this->actor)]; + play->nextEntrance = play->setupExitList[TIMETAG_KICKOUT_GET_EXIT_INDEX(&this->actor)]; play->transitionTrigger = TRANS_TRIGGER_START; - if (!ENTIMETAG_GET_E000(&this->actor)) { + if (TIMETAG_GET_TYPE(&this->actor) == TIMETAG_KICKOUT_DOOR) { Actor_PlaySfx(&this->actor, NA_SE_OC_DOOR_OPEN); } - this->actionFunc = func_80ACA714; + this->actionFunc = EnTimeTag_KickOut_DoNothing; } } -void func_80ACA7C4(EnTimeTag* this, PlayState* play) { - if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_63_01) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) { +/** + * Setup a request to kickout, but wait for an external system to unset + * both `WEEKEVENTREG_KICKOUT_WAIT` and `WEEKEVENTREG_KICKOUT_TIME_PASSED` + */ +void EnTimeTag_KickOut_WaitForTrigger(EnTimeTag* this, PlayState* play) { + if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT) && !CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) { func_800B7298(play, &this->actor, PLAYER_CSMODE_7); - Message_StartTextbox(play, ENTIMETAG_GET_1FE0(&this->actor) + 0x1883, NULL); - this->actionFunc = func_80ACA724; + Message_StartTextbox(play, 0x1883 + TIMETAG_KICKOUT_GET_TEXT(&this->actor), NULL); + this->actionFunc = EnTimeTag_KickOut_Transition; } } -void func_80ACA840(EnTimeTag* this, PlayState* play) { - s16 temp_ft4; - s16 temp_hi; +/** + * Wait for a certain time to pass, then trigger the kickout event. + * If an external system sets `WEEKEVENTREG_KICKOUT_WAIT`, then instead of triggering the kickout event now, + * store the kickout by going to `EnTimeTag_KickOut_WaitForTrigger`. + * If the time has passed but the kickout is being stored, then `WEEKEVENTREG_KICKOUT_TIME_PASSED` is set here + * to indicate to external systems that the time has passed and is waiting for a trigger. + */ +void EnTimeTag_KickOut_WaitForTime(EnTimeTag* this, PlayState* play) { + s16 hour; + s16 minute; - if ((play->sceneId != SCENE_YADOYA) || (INV_CONTENT(ITEM_ROOM_KEY) != ITEM_ROOM_KEY)) { - temp_ft4 = gSaveContext.save.time * (24.0f / 0x10000); // TIME_TO_HOURS_F - temp_hi = (s32)TIME_TO_MINUTES_F(gSaveContext.save.time) % 60; - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_01)) { - if (CHECK_WEEKEVENTREG(WEEKEVENTREG_63_02)) { - this->actionFunc = func_80ACA7C4; - } else if ((temp_ft4 == this->actor.home.rot.x) && (temp_hi == this->actor.home.rot.y)) { - SET_WEEKEVENTREG(WEEKEVENTREG_63_02); - } - } else if ((temp_ft4 == this->actor.home.rot.x) && (temp_hi == this->actor.home.rot.y) && - !Play_InCsMode(play)) { - func_800B7298(play, &this->actor, PLAYER_CSMODE_7); - Message_StartTextbox(play, ENTIMETAG_GET_1FE0(&this->actor) + 0x1883, NULL); - this->actionFunc = func_80ACA724; + if ((play->sceneId == SCENE_YADOYA) && (INV_CONTENT(ITEM_ROOM_KEY) == ITEM_ROOM_KEY)) { + // Having the room key allows you to stay in Stock Pot Inn + return; + } + + hour = TIME_TO_HOURS_F(gSaveContext.save.time); + minute = (s32)TIME_TO_MINUTES_F(gSaveContext.save.time) % 60; + + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_WAIT)) { + if (CHECK_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED)) { + this->actionFunc = EnTimeTag_KickOut_WaitForTrigger; + } else if ((hour == TIMETAG_KICKOUT_HOUR(&this->actor)) && (minute == TIMETAG_KICKOUT_MINUTE(&this->actor))) { + SET_WEEKEVENTREG(WEEKEVENTREG_KICKOUT_TIME_PASSED); } + } else if ((hour == TIMETAG_KICKOUT_HOUR(&this->actor)) && (minute == TIMETAG_KICKOUT_MINUTE(&this->actor)) && + !Play_InCsMode(play)) { + func_800B7298(play, &this->actor, PLAYER_CSMODE_7); + Message_StartTextbox(play, 0x1883 + TIMETAG_KICKOUT_GET_TEXT(&this->actor), NULL); + this->actionFunc = EnTimeTag_KickOut_Transition; } } diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h index ed6b611e4d..128e019732 100644 --- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h +++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h @@ -7,10 +7,57 @@ struct EnTimeTag; typedef void (*EnTimeTagActionFunc)(struct EnTimeTag*, PlayState*); -#define ENTIMETAG_GET_1F(thisx) ((thisx)->params & 0x1F) -#define ENTIMETAG_GET_SWITCHFLAG(thisx) ((thisx)->params & 0x7F) -#define ENTIMETAG_GET_1FE0(thisx) (((thisx)->params & 0x1FE0) >> 0x5) -#define ENTIMETAG_GET_E000(thisx) (((thisx)->params & 0xE000) >> 0xD) +#define TIMETAG_GET_TYPE(thisx) (((thisx)->params & 0xE000) >> 0xD) + +#define TIMETAG_KICKOUT_GET_TEXT(thisx) (((thisx)->params & 0x1FE0) >> 0x5) +#define TIMETAG_KICKOUT_GET_EXIT_INDEX(thisx) ((thisx)->params & 0x1F) +#define TIMETAG_KICKOUT_HOUR(thisx) ((thisx)->home.rot.x) +#define TIMETAG_KICKOUT_MINUTE(thisx) ((thisx)->home.rot.y) + +#define TIMETAG_SOARING_GET_SWITCHFLAG(thisx) ((thisx)->params & 0x7F) + +#define TIMETAG_DIARY_GET_TYPE(thisx) ((thisx)->params & 0x7F) +#define TIMETAG_DIARY_TIMER(thisx) ((thisx)->home.rot.x) +#define TIMETAG_DIARY_SONG(thisx) ((thisx)->home.rot.z) + +typedef enum { + /* 0 */ TIMETAG_KICKOUT_DOOR, + /* 1 */ TIMETAG_SOARING_ENGRAVING, + /* 2 */ TIMETAG_ROOFTOP_OATH, + /* 3 */ TIMETAG_DIARY, + /* 4 */ TIMETAG_KICKOUT_FINAL_HOURS, + /* 5 */ TIMETAG_KICKOUT_NO_DOOR +} TimeTagType; + +typedef enum { + /* 0 */ TIMETAG_DIARY_MIKAU, + /* 1 */ TIMETAG_DIARY_LULU +} TimeTagDiaryType; + +typedef enum { + /* 0 */ TIMETAG_DIARY_SONG_EVAN_PART1, + /* 1 */ TIMETAG_DIARY_SONG_EVAN_PART2 +} TimeTagDiarySong; + +typedef enum { + /* 0 */ TIMETAG_KICKOUT_TEXT_0, // I am closing the shop + /* 1 */ TIMETAG_KICKOUT_TEXT_SWAMP_SHOOTING_GALLERY, // time to close shop + /* 2 */ TIMETAG_KICKOUT_TEXT_STOCK_POT_INN, // Stock Pot Inn locking the door + /* 3 */ TIMETAG_KICKOUT_TEXT_HONEY_AND_DARLING, // need some alone time + /* 4 */ TIMETAG_KICKOUT_TEXT_LOTTERY, // business is finished + /* 5 */ TIMETAG_KICKOUT_TEXT_BARN_DAY, // the lady needs a break + /* 6 */ TIMETAG_KICKOUT_TEXT_GENERIC, // (Many scenes) place is about to close + /* 7 */ TIMETAG_KICKOUT_TEXT_BARN_NIGHT, // they came + /* 8 */ TIMETAG_KICKOUT_TEXT_TRADING_POST, // we have to close shop + /* 9 */ TIMETAG_KICKOUT_TEXT_MILK_BAR, // I have to get ready for business + /* 10 */ TIMETAG_KICKOUT_TEXT_CURIOSITY_SHOP_BACK_1, // shop is opening, you need to go + /* 11 */ TIMETAG_KICKOUT_TEXT_CURIOSITY_SHOP_BACK_2, // shop is opening, we're in the way + /* 12 */ TIMETAG_KICKOUT_TEXT_TOWN_SHOOTING_GALLERY_1, // it's time to close + /* 13 */ TIMETAG_KICKOUT_TEXT_TOWN_SHOOTING_GALLERY_2, // quick, it's closing time + /* 14 */ TIMETAG_KICKOUT_TEXT_SWORDSMANS_SCHOOL, // need to cut the moon, must leave + /* 15 */ TIMETAG_KICKOUT_TEXT_TREASURE_CHEST_SHOP, // already time to close shop + /* 16 */ TIMETAG_KICKOUT_TEXT_DOGGY_RACETRACK, // no more for today +} TimeTagKickOutText; typedef struct EnTimeTag { /* 0x000 */ Actor actor; diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 59d69dd5a3..dd122ed8c4 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -590,13 +590,13 @@ void func_80AED610(EnTk* this, PlayState* play) { break; case 0x13FE: - func_80151938(play, 0x13FF); + Message_ContinueTextbox(play, 0x13FF); break; case 0x1413: Rupees_ChangeBy(30); SET_WEEKEVENTREG(WEEKEVENTREG_60_02); - func_80151938(play, 0x13FF); + Message_ContinueTextbox(play, 0x13FF); break; case 0x13FF: @@ -715,7 +715,7 @@ void func_80AEDC4C(EnTk* this, PlayState* play) { if ((this->actor.params >= 0) && SubS_StartActorCutscene(&this->actor, this->cutscenes[1], this->actor.params, SUBS_CUTSCENE_SET_UNK_LINK_FIELDS)) { this->unk_2E8 = ActorCutscene_GetLength(this->cutscenes[1]); - func_80151938(play, 0x1411); + Message_ContinueTextbox(play, 0x1411); func_80AEDCBC(this, play); } } @@ -734,7 +734,7 @@ void func_80AEDD4C(EnTk* this, PlayState* play) { this->unk_2E8--; if (this->unk_2E8 <= 0) { ActorCutscene_Stop(this->cutscenes[1]); - func_801477B4(play); + Message_CloseTextbox(play); Actor_Kill(&this->actor); } } @@ -837,29 +837,29 @@ void func_80AEDF5C(EnTk* this, PlayState* play) { break; case 0x1405: - func_80151938(play, 0x1406); + Message_ContinueTextbox(play, 0x1406); break; case 0x1406: - func_80151938(play, 0x1407); + Message_ContinueTextbox(play, 0x1407); break; case 0x1407: if (play->msgCtx.choiceIndex == 0) { func_8019F208(); - func_80151938(play, 0x1409); + Message_ContinueTextbox(play, 0x1409); } else { func_8019F230(); - func_80151938(play, 0x1408); + Message_ContinueTextbox(play, 0x1408); } break; case 0x1408: - func_80151938(play, 0x1407); + Message_ContinueTextbox(play, 0x1407); break; case 0x1409: - func_80151938(play, 0x140A); + Message_ContinueTextbox(play, 0x140A); break; case 0x140A: @@ -877,7 +877,7 @@ void func_80AEDF5C(EnTk* this, PlayState* play) { func_80AEE2A8(this, play); } else { func_8019F230(); - func_80151938(play, 0x140E); + Message_ContinueTextbox(play, 0x140E); } break; @@ -996,7 +996,7 @@ void func_80AEE6B8(EnTk* this, PlayState* play) { if (this->unk_2CA & 0x20) { if (this->unk_2E4 >= 3) { ActorCutscene_Stop(this->cutscenes[0]); - func_801477B4(play); + Message_CloseTextbox(play); func_80AEDBEC(this, play); } else if (SubS_StartActorCutscene(&this->actor, 0x7C, this->cutscenes[0], SUBS_CUTSCENE_SET_UNK_LINK_FIELDS)) { this->unk_310 = 3; diff --git a/src/overlays/actors/ovl_En_Toto/z_en_toto.c b/src/overlays/actors/ovl_En_Toto/z_en_toto.c index 80697a1b93..0fa09cf1c5 100644 --- a/src/overlays/actors/ovl_En_Toto/z_en_toto.c +++ b/src/overlays/actors/ovl_En_Toto/z_en_toto.c @@ -364,9 +364,9 @@ s32 func_80BA3EE8(EnToto* this, PlayState* play) { s32 func_80BA3F2C(EnToto* this, PlayState* play) { if (this->text->textId != 0) { - func_80151938(play, this->text->textId); + Message_ContinueTextbox(play, this->text->textId); } else { - func_801477B4(play); + Message_CloseTextbox(play); func_80BA3EE8(this, play); } if (this->text->unk0 == 4) { diff --git a/src/overlays/actors/ovl_En_Trt/z_en_trt.c b/src/overlays/actors/ovl_En_Trt/z_en_trt.c index 8777f155bb..ed0e619376 100644 --- a/src/overlays/actors/ovl_En_Trt/z_en_trt.c +++ b/src/overlays/actors/ovl_En_Trt/z_en_trt.c @@ -246,7 +246,7 @@ s32 EnTrt_TestEndInteraction(EnTrt* this, PlayState* play, Input* input) { s32 EnTrt_TestCancelOption(EnTrt* this, PlayState* play, Input* input) { if (CHECK_BTN_ALL(input->press.button, BTN_B)) { this->actionFunc = this->prevActionFunc; - func_80151938(play, EnTrt_GetItemTextId(this)); + Message_ContinueTextbox(play, EnTrt_GetItemTextId(this)); return true; } return false; @@ -262,7 +262,7 @@ void EnTrt_SetupStartShopping(PlayState* play, EnTrt* this, u8 skipHello) { } void EnTrt_StartShopping(PlayState* play, EnTrt* this) { - func_80151938(play, 0x83E); + Message_ContinueTextbox(play, 0x83E); func_8011552C(play, DO_ACTION_DECIDE); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = true; @@ -387,7 +387,7 @@ void EnTrt_Goodbye(EnTrt* this, PlayState* play) { switch (this->textId) { case 0x886: this->textId = 0x887; - func_80151938(play, this->textId); + Message_ContinueTextbox(play, this->textId); break; case 0x887: case 0x88B: @@ -567,7 +567,7 @@ void EnTrt_LookToShelf(EnTrt* this, PlayState* play) { this->cutsceneState = ENTRT_CUTSCENESTATE_PLAYING; EnTrt_UpdateCursorPos(play, this); this->actionFunc = EnTrt_BrowseShelf; - func_80151938(play, EnTrt_GetItemTextId(this)); + Message_ContinueTextbox(play, EnTrt_GetItemTextId(this)); } else { ActorCutscene_SetIntentToPlay(this->cutscene); } @@ -605,7 +605,7 @@ s32 EnTrt_HasPlayerSelectedItem(PlayState* play, EnTrt* this, Input* input) { if (EnTrt_TestItemSelected(play)) { if (item->actor.params != SI_POTION_BLUE || (this->flags & ENTRT_GIVEN_MUSHROOM)) { this->prevActionFunc = this->actionFunc; - func_80151938(play, EnTrt_GetItemChoiceTextId(this)); + Message_ContinueTextbox(play, EnTrt_GetItemChoiceTextId(this)); play_sound(NA_SE_SY_DECIDE); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; @@ -638,7 +638,7 @@ void EnTrt_BrowseShelf(EnTrt* this, PlayState* play) { if (!EnTrt_HasPlayerSelectedItem(play, this, CONTROLLER1(&play->state))) { EnTrt_CursorLeftRight(play, this); if (this->cursorIndex != prevCursorIdx) { - func_80151938(play, EnTrt_GetItemTextId(this)); + Message_ContinueTextbox(play, EnTrt_GetItemTextId(this)); play_sound(NA_SE_SY_CURSOR); } } @@ -659,12 +659,12 @@ void EnTrt_SetupBuyItemWithFanfare(PlayState* play, EnTrt* this) { } void EnTrt_SetupCannotBuy(PlayState* play, EnTrt* this, u16 textId) { - func_80151938(play, textId); + Message_ContinueTextbox(play, textId); this->actionFunc = EnTrt_CannotBuy; } void EnTrt_SetupCanBuy(PlayState* play, EnTrt* this, u16 textId) { - func_80151938(play, textId); + Message_ContinueTextbox(play, textId); this->actionFunc = EnTrt_CanBuy; } @@ -736,7 +736,7 @@ void EnTrt_SelectItem(EnTrt* this, PlayState* play) { case 1: func_8019F230(); this->actionFunc = this->prevActionFunc; - func_80151938(play, EnTrt_GetItemTextId(this)); + Message_ContinueTextbox(play, EnTrt_GetItemTextId(this)); break; } } @@ -1029,7 +1029,7 @@ void EnTrt_ItemGiven(EnTrt* this, PlayState* play) { this->textId = 0x849; break; } - func_80151938(play, this->textId); + Message_ContinueTextbox(play, this->textId); } else { func_800B85E0(&this->actor, play, 400.0f, PLAYER_IA_MINUS1); } @@ -1068,7 +1068,7 @@ void EnTrt_ShopkeeperGone(EnTrt* this, PlayState* play) { void EnTrt_CannotBuy(EnTrt* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { this->actionFunc = this->prevActionFunc; - func_80151938(play, EnTrt_GetItemTextId(this)); + Message_ContinueTextbox(play, EnTrt_GetItemTextId(this)); } } @@ -1081,7 +1081,7 @@ void EnTrt_CanBuy(EnTrt* this, PlayState* play) { item = this->items[this->cursorIndex]; item->restockFunc(play, item); this->actionFunc = this->prevActionFunc; - func_80151938(play, EnTrt_GetItemTextId(this)); + Message_ContinueTextbox(play, EnTrt_GetItemTextId(this)); } } @@ -1385,7 +1385,7 @@ void EnTrt_TalkToShopkeeper(EnTrt* this, PlayState* play) { if (talkState == TEXT_STATE_5) { if (Message_ShouldAdvance(play)) { if ((this->talkOptionTextId == 0x845) || (this->talkOptionTextId == 0x882)) { - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); } else { EnTrt_StartShopping(play, this); } @@ -1411,7 +1411,7 @@ void EnTrt_TalkToShopkeeper(EnTrt* this, PlayState* play) { this->textId = player->actor.textId; this->actionFunc = EnTrt_Goodbye; } - func_801477B4(play); + Message_CloseTextbox(play); } else if (itemAction <= PLAYER_IA_MINUS1) { if (this->flags & ENTRT_GIVEN_MUSHROOM) { this->textId = 0x88B; @@ -1426,7 +1426,7 @@ void EnTrt_TalkToShopkeeper(EnTrt* this, PlayState* play) { void EnTrt_SetupTalkToShopkeeper(PlayState* play, EnTrt* this) { this->actionFunc = EnTrt_TalkToShopkeeper; - func_80151938(play, this->talkOptionTextId); + Message_ContinueTextbox(play, this->talkOptionTextId); func_8011552C(play, DO_ACTION_DECIDE); this->stickLeftPrompt.isEnabled = false; this->stickRightPrompt.isEnabled = false; diff --git a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c index 3c5e1ce30b..44f2e7d3e9 100644 --- a/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c +++ b/src/overlays/actors/ovl_En_Trt2/z_en_trt2.c @@ -433,7 +433,7 @@ void func_80AD40AC(EnTrt2* this, PlayState* play) { void func_80AD4110(EnTrt2* this, PlayState* play) { if (Actor_ProcessTalkRequest(&this->actor, &play->state)) { this->unk_3A8 = 0x84C; - func_80151938(play, this->unk_3A8); + Message_ContinueTextbox(play, this->unk_3A8); this->unk_3B2 = 10; } else { func_800B85E0(&this->actor, play, 400.0f, PLAYER_IA_MINUS1); diff --git a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c index e492e24dcb..87ae0791ad 100644 --- a/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c +++ b/src/overlays/actors/ovl_En_Tsn/z_en_tsn.c @@ -198,43 +198,43 @@ void func_80AE0010(EnTsn* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0x107F: case 0x1081: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1080: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); Animation_MorphToLoop(&this->skelAnime, &object_tsn_Anim_001198, -10.0f); break; case 0x1082: Animation_MorphToLoop(&this->skelAnime, &object_tsn_Anim_0092FC, -10.0f); SET_WEEKEVENTREG(WEEKEVENTREG_25_80); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80AE0304; this->actor.textId = 0; break; case 0x1083: SET_WEEKEVENTREG(WEEKEVENTREG_25_80); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80AE0304; this->actor.textId = 0; break; case 0x1084: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); Animation_MorphToLoop(&this->skelAnime, &object_tsn_Anim_000964, -10.0f); break; case 0x1085: case 0x1086: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1089: case 0x1093: SET_WEEKEVENTREG(WEEKEVENTREG_26_01); - func_801477B4(play); + Message_CloseTextbox(play); Animation_MorphToLoop(&this->skelAnime, &object_tsn_Anim_0092FC, -10.0f); this->actionFunc = func_80AE0304; this->actor.textId = 0; @@ -242,24 +242,24 @@ void func_80AE0010(EnTsn* this, PlayState* play) { case 0x1087: Animation_MorphToLoop(&this->skelAnime, &object_tsn_Anim_001198, -10.0f); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1088: SET_WEEKEVENTREG(WEEKEVENTREG_26_01); if (INV_CONTENT(ITEM_MASK_ZORA) == ITEM_MASK_ZORA) { - func_801477B4(play); + Message_CloseTextbox(play); Animation_MorphToLoop(&this->skelAnime, &object_tsn_Anim_0092FC, -10.0f); this->actionFunc = func_80AE0304; this->actor.textId = 0; } else { - func_80151938(play, 0x1093); + Message_ContinueTextbox(play, 0x1093); Animation_MorphToLoop(&this->skelAnime, &object_tsn_Anim_0092FC, -10.0f); } break; case 0x107E: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80AE0304; this->actor.textId = 0; break; @@ -322,7 +322,7 @@ void func_80AE04FC(EnTsn* this, PlayState* play) { } if (itemAction > PLAYER_IA_NONE) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80AE0704; if (itemAction == PLAYER_IA_PICTO_BOX) { if (CHECK_QUEST_ITEM(QUEST_PICTOGRAPH)) { @@ -357,7 +357,7 @@ void func_80AE04FC(EnTsn* this, PlayState* play) { } if (itemAction <= PLAYER_IA_MINUS1) { - func_80151938(play, 0x1078); + Message_ContinueTextbox(play, 0x1078); Animation_MorphToLoop(&this->unk_1D8->skelAnime, &object_tsn_Anim_001198, -10.0f); this->actionFunc = func_80AE0704; } @@ -365,7 +365,7 @@ void func_80AE04FC(EnTsn* this, PlayState* play) { } void func_80AE0698(EnTsn* this, PlayState* play) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80AE0C88; this->unk_220 &= ~2; this->actor.focus.pos = this->actor.world.pos; @@ -391,9 +391,9 @@ void func_80AE0704(EnTsn* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0x106E: if (CHECK_WEEKEVENTREG(WEEKEVENTREG_25_40)) { - func_80151938(play, 0x1074); + Message_ContinueTextbox(play, 0x1074); } else { - func_80151938(play, 0x106F); + Message_ContinueTextbox(play, 0x106F); } this->unk_220 |= 2; SET_WEEKEVENTREG(WEEKEVENTREG_25_40); @@ -405,30 +405,30 @@ void func_80AE0704(EnTsn* this, PlayState* play) { case 0x1070: case 0x1071: case 0x1072: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1076: case 0x1079: Animation_MorphToLoop(&this->unk_1D8->skelAnime, &object_tsn_Anim_000964, -10.0f); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x107A: - func_80151938(play, 0x10A6); + Message_ContinueTextbox(play, 0x10A6); break; case 0x1075: case 0x1078: player->exchangeItemId = 0; - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); Animation_MorphToLoop(&this->unk_1D8->skelAnime, &object_tsn_Anim_0092FC, -10.0f); break; case 0x107C: if (Inventory_HasEmptyBottle()) { SET_WEEKEVENTREG(WEEKEVENTREG_26_08); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80AE0460; func_80AE0460(this, play); this->unk_220 &= ~2; @@ -437,19 +437,19 @@ void func_80AE0704(EnTsn* this, PlayState* play) { this->actor.flags &= ~ACTOR_FLAG_TALK_REQUESTED; REMOVE_QUEST_ITEM(QUEST_PICTOGRAPH); } else { - func_80151938(play, 0x10A8); + Message_ContinueTextbox(play, 0x10A8); } break; case 0x1073: case 0x1074: - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); this->actionFunc = func_80AE04FC; break; case 0x107B: player->exchangeItemId = 0; - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); Animation_MorphToLoop(&this->unk_1D8->skelAnime, &object_tsn_Anim_0092FC, -10.0f); break; @@ -465,7 +465,7 @@ void func_80AE0704(EnTsn* this, PlayState* play) { case 0x108A: case 0x1091: SET_WEEKEVENTREG(WEEKEVENTREG_26_04); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); this->unk_220 |= 2; this->actor.textId = 0x1091; break; @@ -475,14 +475,14 @@ void func_80AE0704(EnTsn* this, PlayState* play) { case 0x108D: case 0x108E: case 0x108F: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1092: if (CHECK_WEEKEVENTREG(WEEKEVENTREG_26_08)) { func_80AE0698(this, play); } else { - func_80151938(play, 0x10A7); + Message_ContinueTextbox(play, 0x10A7); Animation_MorphToLoop(&this->unk_1D8->skelAnime, &object_tsn_Anim_000964, -10.0f); } break; @@ -543,7 +543,7 @@ void func_80AE0C88(EnTsn* this, PlayState* play) { void func_80AE0D10(EnTsn* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80AE0D78; ActorCutscene_Stop(this->actor.cutscene); } diff --git a/src/overlays/actors/ovl_En_Yb/z_en_yb.c b/src/overlays/actors/ovl_En_Yb/z_en_yb.c index c841cd7d81..7a751c7ce7 100644 --- a/src/overlays/actors/ovl_En_Yb/z_en_yb.c +++ b/src/overlays/actors/ovl_En_Yb/z_en_yb.c @@ -289,27 +289,27 @@ void EnYb_Talk(EnYb* this, PlayState* play) { if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { switch (play->msgCtx.currentTextId) { case 0x147D: // I am counting on you - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnYb_Disappear; SET_WEEKEVENTREG(WEEKEVENTREG_82_04); break; case 0x147C: // Spread my dance across the world if (Player_GetMask(play) == PLAYER_MASK_KAMARO) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnYb_Idle; } else if (INV_CONTENT(ITEM_MASK_KAMARO) == ITEM_MASK_KAMARO) { - func_80151938(play, 0x147D); // I am counting on you + Message_ContinueTextbox(play, 0x147D); // I am counting on you func_80BFA2FC(play); } else { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnYb_ReceiveMask; EnYb_ReceiveMask(this, play); } break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnYb_Idle; break; } diff --git a/src/overlays/actors/ovl_En_Zob/z_en_zob.c b/src/overlays/actors/ovl_En_Zob/z_en_zob.c index fdc6e47899..895c5c0326 100644 --- a/src/overlays/actors/ovl_En_Zob/z_en_zob.c +++ b/src/overlays/actors/ovl_En_Zob/z_en_zob.c @@ -267,7 +267,7 @@ void func_80B9FC70(EnZob* this, s16 arg1) { } void func_80B9FCA0(EnZob* this, PlayState* play) { - func_801477B4(play); + Message_CloseTextbox(play); play->msgCtx.ocarinaMode = 4; func_80B9FC0C(this); this->unk_2F4 &= ~1; @@ -372,14 +372,14 @@ void func_80BA00BC(EnZob* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 1: func_8019F208(); - func_80151938(play, 0x1209); + Message_ContinueTextbox(play, 0x1209); this->unk_304 = 1; func_80B9F7E4(this, 2, ANIMMODE_ONCE); break; case 0: func_8019F230(); - func_80151938(play, 0x1213); + Message_ContinueTextbox(play, 0x1213); break; } } @@ -391,7 +391,7 @@ void func_80BA00BC(EnZob* this, PlayState* play) { case 0x1208: case 0x120E: case 0x1216: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x120C: @@ -405,7 +405,7 @@ void func_80BA00BC(EnZob* this, PlayState* play) { case 0x1211: case 0x1213: case 0x1217: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); this->unk_304 = 3; func_80B9F7E4(this, 4, ANIMMODE_ONCE); break; @@ -457,13 +457,13 @@ void func_80BA0374(EnZob* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 0: func_8019F208(); - func_80151938(play, 0x1207); + Message_ContinueTextbox(play, 0x1207); func_80B9F7E4(this, 2, ANIMMODE_ONCE); break; case 1: func_8019F230(); - func_80151938(play, 0x1206); + Message_ContinueTextbox(play, 0x1206); break; } } @@ -474,11 +474,11 @@ void func_80BA0374(EnZob* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0x11F8: SET_WEEKEVENTREG(WEEKEVENTREG_30_02); - func_80151938(play, 0x11F9); + Message_ContinueTextbox(play, 0x11F9); break; case 0x11F9: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BA0728; this->unk_304 = 0; func_80B9F7E4(this, 6, ANIMMODE_ONCE); @@ -490,19 +490,19 @@ void func_80BA0374(EnZob* this, PlayState* play) { case 0x11FF: case 0x1201: case 0x1203: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x11FD: this->unk_304 = 3; func_80B9F7E4(this, 4, ANIMMODE_ONCE); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x11FE: this->unk_304 = 1; func_80B9F7E4(this, 3, ANIMMODE_LOOP); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x11FA: @@ -513,7 +513,7 @@ void func_80BA0374(EnZob* this, PlayState* play) { case 0x120F: case 0x1210: case 0x1215: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BA0728; this->unk_304 = 0; func_80B9F7E4(this, 6, ANIMMODE_ONCE); @@ -522,7 +522,7 @@ void func_80BA0374(EnZob* this, PlayState* play) { break; case 0x1207: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BA0318; player->unk_A90 = &this->actor; player->stateFlags3 |= PLAYER_STATE3_20; @@ -630,7 +630,7 @@ void func_80BA0A04(EnZob* this, PlayState* play) { switch (Message_GetState(&play->msgCtx)) { case TEXT_STATE_5: if (Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BA0AD8; this->unk_304 = 0; func_80B9F7E4(this, 6, ANIMMODE_ONCE); diff --git a/src/overlays/actors/ovl_En_Zod/z_en_zod.c b/src/overlays/actors/ovl_En_Zod/z_en_zod.c index 8d8065ff69..ecfd9387c3 100644 --- a/src/overlays/actors/ovl_En_Zod/z_en_zod.c +++ b/src/overlays/actors/ovl_En_Zod/z_en_zod.c @@ -316,12 +316,12 @@ void func_80BAF7CC(EnZod* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 0: func_8019F208(); - func_80151938(play, 0x1220); + Message_ContinueTextbox(play, 0x1220); break; case 1: func_8019F230(); - func_80151938(play, 0x1223); + Message_ContinueTextbox(play, 0x1223); break; } } @@ -336,32 +336,32 @@ void func_80BAF7CC(EnZod* this, PlayState* play) { case 0x1220: case 0x1221: case 0x1227: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1219: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); this->nextAnimIndex = ENZOD_ANIM_ARMS_FOLDED; break; case 0x121D: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); this->nextAnimIndex = ENZOD_ANIM_READY_TO_PLAY; break; case 0x1223: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); this->nextAnimIndex = ENZOD_ANIM_PLAYING_VIVACE; break; case 0x121E: case 0x1226: - func_80151938(play, 0x121F); + Message_ContinueTextbox(play, 0x121F); this->nextAnimIndex = ENZOD_ANIM_READY_TO_PLAY; break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = EnZod_PlayDrumsSequence; EnZod_ChangeAnim(this, ENZOD_ANIM_PLAYING_LENTO, ANIMMODE_ONCE); break; @@ -419,7 +419,7 @@ void func_80BAFADC(EnZod* this, PlayState* play) { talkState = Message_GetState(&play->msgCtx); if (talkState != TEXT_STATE_CLOSING) { if ((talkState == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BAFB84; EnZod_ChangeAnim(this, ENZOD_ANIM_PLAYING_LENTO, ANIMMODE_ONCE); } @@ -465,7 +465,7 @@ void EnZod_Rehearse(EnZod* this, PlayState* play) { void EnZod_SetupRehearse(EnZod* this, PlayState* play) { EnZod_UpdateAnimation(this); if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); EnZod_ChangeAnim(this, ENZOD_ANIM_PLAYING_LENTO, ANIMMODE_ONCE); this->actionFunc = EnZod_Rehearse; ActorCutscene_Stop(this->actor.cutscene); diff --git a/src/overlays/actors/ovl_En_Zog/z_en_zog.c b/src/overlays/actors/ovl_En_Zog/z_en_zog.c index 239ec43916..1935d627ec 100644 --- a/src/overlays/actors/ovl_En_Zog/z_en_zog.c +++ b/src/overlays/actors/ovl_En_Zog/z_en_zog.c @@ -613,7 +613,7 @@ void func_80B943EC(EnZog* this, PlayState* play) { void func_80B94470(EnZog* this, PlayState* play) { if (Message_GetState(&play->msgCtx) == TEXT_STATE_5) { if (Message_ShouldAdvance(play) && (play->msgCtx.currentTextId == 0x103C)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B9451C; this->unk_300 = this->unk_302 = 0; this->unk_31C = 2; @@ -675,7 +675,7 @@ void func_80B946FC(EnZog* this, PlayState* play) { case 1: func_8019F230(); - func_80151938(play, 0x1014); + Message_ContinueTextbox(play, 0x1014); break; } } @@ -685,20 +685,20 @@ void func_80B946FC(EnZog* this, PlayState* play) { if (Message_ShouldAdvance(play)) { switch (play->msgCtx.currentTextId) { case 0x1008: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1009: this->unk_300 = 4; - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1014: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1015: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B948A8; this->unk_300 = this->unk_302 = 0; this->unk_31C = 2; @@ -834,11 +834,11 @@ void func_80B94D0C(EnZog* this, PlayState* play) { case 0x1004: case 0x1005: case 0x1006: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1007: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B94E34; this->unk_300 = 5; this->unk_320 = 0; diff --git a/src/overlays/actors/ovl_En_Zos/z_en_zos.c b/src/overlays/actors/ovl_En_Zos/z_en_zos.c index 67a43c12d2..00f76dafea 100644 --- a/src/overlays/actors/ovl_En_Zos/z_en_zos.c +++ b/src/overlays/actors/ovl_En_Zos/z_en_zos.c @@ -324,7 +324,7 @@ void func_80BBB574(EnZos* this, PlayState* play) { if (func_80BBAFFC(this, play)) { if (this->unk_2B6 & 0x20) { this->unk_2B6 &= ~0x20; - func_80151938(play, 0x124C); + Message_ContinueTextbox(play, 0x124C); } } @@ -335,7 +335,7 @@ void func_80BBB574(EnZos* this, PlayState* play) { play->msgCtx.msgLength = 0; this->unk_2B6 |= 0x20; } else { - func_80151938(play, 0x124C); + Message_ContinueTextbox(play, 0x124C); } break; @@ -348,11 +348,11 @@ void func_80BBB574(EnZos* this, PlayState* play) { case 0x124D: this->unk_2B6 &= ~0x10; EnZos_ChangeAnim(this, EN_ZOS_ANIM_TALK_HANDS_ON_HIPS, ANIMMODE_LOOP); - func_80151938(play, 0x124E); + Message_ContinueTextbox(play, 0x124E); break; case 0x124E: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BBB354; func_80BBB354(this, play); break; @@ -370,7 +370,7 @@ void func_80BBB718(EnZos* this, PlayState* play) { itemAction = func_80123810(play); if (itemAction > PLAYER_IA_NONE) { - func_801477B4(play); + Message_CloseTextbox(play); if (itemAction == PLAYER_IA_BOTTLE_ZORA_EGG) { player->actor.textId = 0x1232; @@ -388,9 +388,9 @@ void func_80BBB718(EnZos* this, PlayState* play) { this->actionFunc = func_80BBB8AC; } else if (itemAction <= PLAYER_IA_MINUS1) { if (CHECK_WEEKEVENTREG(WEEKEVENTREG_39_08)) { - func_80151938(play, 0x1241); + Message_ContinueTextbox(play, 0x1241); } else { - func_80151938(play, 0x1237); + Message_ContinueTextbox(play, 0x1237); SET_WEEKEVENTREG(WEEKEVENTREG_39_08); EnZos_ChangeAnim(this, EN_ZOS_ANIM_TALK_LOOK_DOWN, ANIMMODE_LOOP); this->unk_2B6 |= 4; @@ -425,13 +425,13 @@ void func_80BBB8AC(EnZos* this, PlayState* play) { case 0x123C: case 0x123E: case 0x123F: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1244: this->unk_2B6 &= ~0x10; EnZos_ChangeAnim(this, EN_ZOS_ANIM_TALK_HANDS_ON_HIPS, ANIMMODE_LOOP); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1232: @@ -441,29 +441,29 @@ void func_80BBB8AC(EnZos* this, PlayState* play) { case 0x1239: case 0x1246: EnZos_ChangeAnim(this, EN_ZOS_ANIM_TALK_HANDS_ON_HIPS, ANIMMODE_LOOP); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1233: EnZos_ChangeAnim(this, EN_ZOS_ANIM_TALK_ARMS_OUT, ANIMMODE_LOOP); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1245: case 0x1248: EnZos_ChangeAnim(this, EN_ZOS_ANIM_TALK_FOOT_TAP, ANIMMODE_LOOP); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1231: - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); this->actionFunc = func_80BBB718; break; case 0x1243: case 0x1249: EnZos_ChangeAnim(this, EN_ZOS_ANIM_HANDS_ON_HIPS, ANIMMODE_LOOP); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BBBDE0; this->unk_2B6 |= 1; break; @@ -473,21 +473,21 @@ void func_80BBB8AC(EnZos* this, PlayState* play) { case 0x1242: EnZos_ChangeAnim(this, EN_ZOS_ANIM_HANDS_ON_HIPS, ANIMMODE_LOOP); Actor_ProcessTalkRequest(&this->actor, &play->state); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BBBDE0; this->unk_2B6 |= 1; break; case 0x1236: EnZos_ChangeAnim(this, EN_ZOS_ANIM_HANDS_ON_HIPS, ANIMMODE_LOOP); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BBBDE0; this->unk_2B6 |= 1; break; default: if (0) {} - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BBBDE0; this->unk_2B6 |= 1; break; @@ -612,7 +612,7 @@ void func_80BBC070(EnZos* this, PlayState* play) { case TEXT_STATE_5: if (Message_ShouldAdvance(play)) { EnZos_ChangeAnim(this, EN_ZOS_ANIM_HANDS_ON_HIPS, ANIMMODE_LOOP); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BBC14C; this->unk_2B6 |= 1; } diff --git a/src/overlays/actors/ovl_En_Zot/z_en_zot.c b/src/overlays/actors/ovl_En_Zot/z_en_zot.c index 427dad7c86..ce5625b833 100644 --- a/src/overlays/actors/ovl_En_Zot/z_en_zot.c +++ b/src/overlays/actors/ovl_En_Zot/z_en_zot.c @@ -383,14 +383,14 @@ void func_80B97194(EnZot* this, PlayState* play) { switch (play->msgCtx.currentTextId) { case 0x125C: case 0x125F: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x125D: case 0x125E: case 0x1260: case 0x1261: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B97240; break; } @@ -454,36 +454,36 @@ void func_80B973BC(EnZot* this, PlayState* play) { case 0x1270: case 0x1273: case 0x1274: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1272: - func_80151938(play, 0x126F); + Message_ContinueTextbox(play, 0x126F); break; case 0x126F: Rupees_ChangeBy(90); - func_80151938(play, 0x1270); + Message_ContinueTextbox(play, 0x1270); break; case 0x1275: if (gSaveContext.save.playerData.rupees < 10) { - func_80151938(play, 0x1277); + Message_ContinueTextbox(play, 0x1277); } else { - func_80151938(play, 0x1278); + Message_ContinueTextbox(play, 0x1278); Rupees_ChangeBy(-10); } break; case 0x1276: - func_80151938(play, 0x1275); + Message_ContinueTextbox(play, 0x1275); break; case 0x1271: case 0x1277: case 0x1278: case 0x1279: - func_801477B4(play); + Message_CloseTextbox(play); func_80B965D0(this, play); this->actor.flags &= ~ACTOR_FLAG_10000; this->actor.textId = 0; @@ -530,10 +530,10 @@ void func_80B9765C(EnZot* this, PlayState* play) { case 0x1267: case 0x126A: case 0x126B: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B97708; break; } @@ -667,7 +667,7 @@ void func_80B97A44(EnZot* this, PlayState* play) { case 0x1282: case 0x1285: case 0x1288: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x127D: @@ -676,7 +676,7 @@ void func_80B97A44(EnZot* this, PlayState* play) { case 0x1284: case 0x1289: case 0x128A: - func_801477B4(play); + Message_CloseTextbox(play); if (!(this->unk_2F2 & 2)) { this->unk_2F2 |= 2; this->actionFunc = func_80B979DC; @@ -687,7 +687,7 @@ void func_80B97A44(EnZot* this, PlayState* play) { break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B97B5C; break; } @@ -720,7 +720,7 @@ void func_80B97C40(EnZot* this, PlayState* play) { Math_SmoothStepToS(&this->actor.shape.rot.y, this->actor.yawTowardsPlayer, 2, 0x800, 0x100); this->actor.world.rot.y = this->actor.shape.rot.y; if ((Message_GetState(&play->msgCtx) == TEXT_STATE_5) && Message_ShouldAdvance(play)) { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B97CC8; } } @@ -772,17 +772,17 @@ void func_80B97E4C(EnZot* this, PlayState* play) { case 0x128C: this->unk_2F2 &= ~4; func_80B96BEC(this, 6, ANIMMODE_ONCE); - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x128D: case 0x128E: case 0x128F: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1290: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B97D6C; this->unk_2F2 |= 4; func_80B96BEC(this, 3, ANIMMODE_LOOP); @@ -790,7 +790,7 @@ void func_80B97E4C(EnZot* this, PlayState* play) { break; case 0x128B: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B97FD0; break; } @@ -956,7 +956,7 @@ void func_80B985EC(EnZot* this, PlayState* play) { itemAction = func_80123810(play); if (itemAction > PLAYER_IA_NONE) { - func_801477B4(play); + Message_CloseTextbox(play); if ((itemAction == PLAYER_IA_PICTO_BOX) && CHECK_QUEST_ITEM(QUEST_PICTOGRAPH) && Snap_CheckFlag(PICTO_VALID_LULU_HEAD)) { if (Snap_CheckFlag(PICTO_VALID_LULU_RIGHT_ARM) && Snap_CheckFlag(PICTO_VALID_LULU_LEFT_ARM)) { @@ -970,7 +970,7 @@ void func_80B985EC(EnZot* this, PlayState* play) { } this->actionFunc = func_80B98728; } else if (itemAction <= PLAYER_IA_MINUS1) { - func_80151938(play, 0x12AB); + Message_ContinueTextbox(play, 0x12AB); this->actionFunc = func_80B98728; } } @@ -985,12 +985,12 @@ void func_80B98728(EnZot* this, PlayState* play) { switch (play->msgCtx.choiceIndex) { case 0: func_8019F208(); - func_80151938(play, 0x1294); + Message_ContinueTextbox(play, 0x1294); break; case 1: func_8019F230(); - func_80151938(play, 0x1298); + Message_ContinueTextbox(play, 0x1298); break; } } @@ -1015,44 +1015,44 @@ void func_80B98728(EnZot* this, PlayState* play) { case 0x12A7: case 0x12A8: case 0x12AE: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x12A9: case 0x12AA: - func_80151938(play, 0xFF); + Message_ContinueTextbox(play, 0xFF); this->actionFunc = func_80B985EC; break; case 0x1294: if (CURRENT_DAY == 3) { - func_80151938(play, 0x1296); + Message_ContinueTextbox(play, 0x1296); } else { - func_80151938(play, 0x1295); + Message_ContinueTextbox(play, 0x1295); } break; case 0x12AB: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B98998; break; case 0x12AC: - func_801477B4(play); + Message_CloseTextbox(play); this->unk_2D4 = 2; this->actionFunc = func_80B9854C; func_80B9854C(this, play); break; case 0x12AF: - func_801477B4(play); + Message_CloseTextbox(play); this->unk_2D4 = 4; this->actionFunc = func_80B9854C; func_80B9854C(this, play); break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B98998; this->actor.flags &= ~ACTOR_FLAG_10000; break; @@ -1099,25 +1099,25 @@ void func_80B98AD0(EnZot* this, PlayState* play) { case 0x12B4: case 0x12B7: case 0x12B9: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x12B8: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B98CA8; CLEAR_WEEKEVENTREG(WEEKEVENTREG_41_20); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); break; case 0x12BA: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B98CA8; SET_WEEKEVENTREG(WEEKEVENTREG_41_20); AudioOcarina_SetInstrument(OCARINA_INSTRUMENT_OFF); break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B98CA8; break; } @@ -1223,17 +1223,17 @@ void func_80B98F94(EnZot* this, PlayState* play) { case 0x12BC: case 0x12C0: case 0x12C3: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x12BE: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B98F30; func_80B98F30(this, play); break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B990A4; break; } @@ -1282,9 +1282,9 @@ void func_80B991E4(EnZot* this, PlayState* play) { if ((temp == 0x12C6) || (temp == 0x12C7) || (temp == 0x12CA) || (temp == 0x12CB)) { temp2 = temp; - func_80151938(play, temp2 + 1); + Message_ContinueTextbox(play, temp2 + 1); } else { - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80B992C0; func_80B96BEC(this, 1, ANIMMODE_LOOP); } diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c index 27d4e04b1b..b68827c40e 100644 --- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c +++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c @@ -264,14 +264,14 @@ void func_80BD187C(EnZov* this, PlayState* play) { if (Message_ShouldAdvance(play)) { switch (play->msgCtx.currentTextId) { case 0x1022: - func_80151938(play, 0x1023); + Message_ContinueTextbox(play, 0x1023); break; case 0x1023: if ((this->unk_322 != 6) && (this->unk_322 != 1)) { func_80BD1570(this, 1, ANIMMODE_ONCE); } - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BD1C84; break; @@ -279,14 +279,14 @@ void func_80BD187C(EnZov* this, PlayState* play) { if (this->unk_322 != 6) { func_80BD1570(this, 0, ANIMMODE_LOOP); } - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BD1C84; break; default: this->unk_320 &= ~1; func_80BD1570(this, 0, ANIMMODE_LOOP); - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BD1C84; break; } @@ -294,7 +294,7 @@ void func_80BD187C(EnZov* this, PlayState* play) { break; case TEXT_STATE_CLOSING: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BD1C84; this->unk_320 &= ~1; func_80BD1570(this, 0, ANIMMODE_LOOP); @@ -419,7 +419,7 @@ void func_80BD1DB8(EnZov* this, PlayState* play) { case 0x1036: case 0x1037: case 0x1038: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; case 0x1039: @@ -433,7 +433,7 @@ void func_80BD1DB8(EnZov* this, PlayState* play) { break; default: - func_801477B4(play); + Message_CloseTextbox(play); this->actionFunc = func_80BD1F1C; break; } diff --git a/src/overlays/actors/ovl_En_Zow/z_en_zow.c b/src/overlays/actors/ovl_En_Zow/z_en_zow.c index 1f61075e1b..e68a110380 100644 --- a/src/overlays/actors/ovl_En_Zow/z_en_zow.c +++ b/src/overlays/actors/ovl_En_Zow/z_en_zow.c @@ -477,11 +477,11 @@ void func_80BDD570(EnZow* this, PlayState* play) { case 0x12FB: case 0x12FD: case 0x12FF: - func_80151938(play, play->msgCtx.currentTextId + 1); + Message_ContinueTextbox(play, play->msgCtx.currentTextId + 1); break; default: - func_801477B4(play); + Message_CloseTextbox(play); break; } } diff --git a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c index cc4c7c8e8d..a61fb6f64e 100644 --- a/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c +++ b/src/overlays/actors/ovl_Obj_Tokeidai/z_obj_tokeidai.c @@ -36,7 +36,7 @@ #define THIS ((ObjTokeidai*)thisx) -#define GET_CURRENT_CLOCK_HOUR(this) ((s32)((this)->clockTime * (24.0f / 0x10000))) +#define GET_CURRENT_CLOCK_HOUR(this) ((s32)TIME_TO_HOURS_F((this)->clockTime)) #define GET_CURRENT_CLOCK_MINUTE(this) ((s32)((this)->clockTime * (360 * 2.0f / 0x10000)) % 30) #define GET_CLOCK_FACE_ROTATION(currentClockHour) ((s16)(currentClockHour * (0x10000 / 24.0f))) #define GET_MINUTE_RING_OR_EXTERIOR_GEAR_ROTATION(currentClockMinute) \ diff --git a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c index 8d7b1ea849..af26540670 100644 --- a/src/overlays/actors/ovl_Obj_Um/z_obj_um.c +++ b/src/overlays/actors/ovl_Obj_Um/z_obj_um.c @@ -937,7 +937,7 @@ s32 func_80B7984C(PlayState* play, ObjUm* this, s32 arg2, s32* arg3) { return 0; } if (*arg3 == 3) { - func_80151938(play, this->dyna.actor.textId); + Message_ContinueTextbox(play, this->dyna.actor.textId); *arg3 = 1; return 0; } diff --git a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c index a26dd24e39..905002784b 100644 --- a/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c +++ b/src/overlays/actors/ovl_Obj_Warpstone/z_obj_warpstone.c @@ -146,7 +146,7 @@ void ObjWarpstone_Update(Actor* thisx, PlayState* play) { play->msgCtx.unk120D4 = 0; gSaveContext.save.owlSaveLocation = OBJ_WARPSTONE_GET_ID(&this->dyna.actor); } else { - func_801477B4(play); + Message_CloseTextbox(play); } } } else if (Actor_ProcessTalkRequest(&this->dyna.actor, &play->state)) { diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index 4aca60126a..235debbb50 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -2824,7 +2824,7 @@ 0x80147564:("func_80147564",), 0x80147624:("Message_ShouldAdvance",), 0x80147734:("Message_ShouldAdvanceSilent",), - 0x801477B4:("func_801477B4",), + 0x801477B4:("Message_CloseTextbox",), 0x80147818:("func_80147818",), 0x80147F18:("func_80147F18",), 0x80148558:("func_80148558",), @@ -2853,7 +2853,7 @@ 0x80150D08:("func_80150D08",), 0x801514B0:("func_801514B0",), 0x801518B0:("Message_StartTextbox",), - 0x80151938:("func_80151938",), + 0x80151938:("Message_ContinueTextbox",), 0x80151A68:("func_80151A68",), 0x80151BB4:("func_80151BB4",), 0x80151C9C:("func_80151C9C",), @@ -12021,21 +12021,21 @@ 0x80AC9D10:("ObjOcarinalift_Draw",), 0x80AC9EA0:("EnTimeTag_Init",), 0x80AC9FC4:("EnTimeTag_Destroy",), - 0x80AC9FD4:("func_80AC9FD4",), - 0x80AC9FE4:("func_80AC9FE4",), - 0x80ACA0A8:("func_80ACA0A8",), - 0x80ACA12C:("func_80ACA12C",), - 0x80ACA184:("func_80ACA184",), - 0x80ACA208:("func_80ACA208",), - 0x80ACA268:("func_80ACA268",), - 0x80ACA348:("func_80ACA348",), - 0x80ACA3C0:("func_80ACA3C0",), - 0x80ACA418:("func_80ACA418",), - 0x80ACA5F8:("func_80ACA5F8",), - 0x80ACA714:("func_80ACA714",), - 0x80ACA724:("func_80ACA724",), - 0x80ACA7C4:("func_80ACA7C4",), - 0x80ACA840:("func_80ACA840",), + 0x80AC9FD4:("EnTimeTag_RooftopOath_DoNothing",), + 0x80AC9FE4:("EnTimeTag_RooftopOath_Cutscene",), + 0x80ACA0A8:("EnTimeTag_RooftopOath_Wait",), + 0x80ACA12C:("EnTimeTag_SoaringEngraving_GetSong",), + 0x80ACA184:("EnTimeTag_SoaringEngraving_StartCutscene",), + 0x80ACA208:("EnTimeTag_SoaringEngraving_SubsequentInteraction",), + 0x80ACA268:("EnTimeTag_SoaringEngraving_Wait",), + 0x80ACA348:("EnTimeTag_Diary_AfterOcarina",), + 0x80ACA3C0:("EnTimeTag_Diary_TeachEvanSongSnippets",), + 0x80ACA418:("EnTimeTag_Diary_Cutscene",), + 0x80ACA5F8:("EnTimeTag_Diary_Wait",), + 0x80ACA714:("EnTimeTag_KickOut_DoNothing",), + 0x80ACA724:("EnTimeTag_KickOut_Transition",), + 0x80ACA7C4:("EnTimeTag_KickOut_WaitForTrigger",), + 0x80ACA840:("EnTimeTag_KickOut_WaitForTime",), 0x80ACA9AC:("EnTimeTag_Update",), 0x80ACAB10:("func_80ACAB10",), 0x80ACABA8:("func_80ACABA8",), diff --git a/tools/namefixer.py b/tools/namefixer.py index 447942a6d4..828cf46bbc 100755 --- a/tools/namefixer.py +++ b/tools/namefixer.py @@ -304,6 +304,8 @@ wordReplace = { "func_800B867C": "Actor_TextboxIsClosing", "func_800BDC5C": "Actor_ChangeAnimationByInfo", "Actor_ChangeAnimation": "Actor_ChangeAnimationByInfo", + "func_801477B4": "Message_CloseTextbox", + "func_80151938": "Message_ContinueTextbox", "func_80152498": "Message_GetState", "func_800B8898": "Actor_GetScreenPos", "Audio_PlayActorSound2": "Actor_PlaySfx", diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index 121ba52556..0f8f70b8ab 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -2338,7 +2338,7 @@ asm/non_matchings/code/z_message/func_80147520.s,func_80147520,0x80147520,0x11 asm/non_matchings/code/z_message/func_80147564.s,func_80147564,0x80147564,0x30 asm/non_matchings/code/z_message/Message_ShouldAdvance.s,Message_ShouldAdvance,0x80147624,0x44 asm/non_matchings/code/z_message/Message_ShouldAdvanceSilent.s,Message_ShouldAdvanceSilent,0x80147734,0x20 -asm/non_matchings/code/z_message/func_801477B4.s,func_801477B4,0x801477B4,0x19 +asm/non_matchings/code/z_message/Message_CloseTextbox.s,Message_CloseTextbox,0x801477B4,0x19 asm/non_matchings/code/z_message/func_80147818.s,func_80147818,0x80147818,0x1C0 asm/non_matchings/code/z_message/func_80147F18.s,func_80147F18,0x80147F18,0x190 asm/non_matchings/code/z_message/func_80148558.s,func_80148558,0x80148558,0x190 @@ -2367,7 +2367,7 @@ asm/non_matchings/code/z_message/func_80150A84.s,func_80150A84,0x80150A84,0xA1 asm/non_matchings/code/z_message/func_80150D08.s,func_80150D08,0x80150D08,0x1EA asm/non_matchings/code/z_message/func_801514B0.s,func_801514B0,0x801514B0,0x100 asm/non_matchings/code/z_message/Message_StartTextbox.s,Message_StartTextbox,0x801518B0,0x22 -asm/non_matchings/code/z_message/func_80151938.s,func_80151938,0x80151938,0x4C +asm/non_matchings/code/z_message/Message_ContinueTextbox.s,Message_ContinueTextbox,0x80151938,0x4C asm/non_matchings/code/z_message/func_80151A68.s,func_80151A68,0x80151A68,0x53 asm/non_matchings/code/z_message/func_80151BB4.s,func_80151BB4,0x80151BB4,0x3A asm/non_matchings/code/z_message/func_80151C9C.s,func_80151C9C,0x80151C9C,0x42 diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py index 131dda4b82..02a3e4a42a 100755 --- a/tools/weekeventregconvert.py +++ b/tools/weekeventregconvert.py @@ -508,8 +508,8 @@ weekEventReg = { (62 << 8) | 0x20: "WEEKEVENTREG_62_20", (62 << 8) | 0x40: "WEEKEVENTREG_62_40", (62 << 8) | 0x80: "WEEKEVENTREG_62_80", - (63 << 8) | 0x01: "WEEKEVENTREG_63_01", - (63 << 8) | 0x02: "WEEKEVENTREG_63_02", + (63 << 8) | 0x01: "WEEKEVENTREG_KICKOUT_WAIT", + (63 << 8) | 0x02: "WEEKEVENTREG_KICKOUT_TIME_PASSED", (63 << 8) | 0x04: "WEEKEVENTREG_63_04", (63 << 8) | 0x08: "WEEKEVENTREG_63_08", (63 << 8) | 0x10: "WEEKEVENTREG_63_10",