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 d177813fd8..11d262f31b 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -138,8 +138,6 @@ void EnFu_WaitChild(EnFu* this, GlobalContext* globalCtx) { if (textID == 0) { textID = (gSaveContext.eventChkInf[6] & 0x80) ? 0x5033 : 0x5032; - // 0x5032: "Go around!..I'm so happy!..I'm trying to come up with a musical theme inspired by this windmill..." - // 0x5033: "Go around, go around, go around... What? It's going way too fast!" } // if actor flags & 0x100 is set and textID is 0x5033, change animation diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index 2e4f3858b8..628d0d9944 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -133,7 +133,7 @@ void EnHeishi3_StandSentinelInGrounds(EnHeishi3* this, GlobalContext* globalCtx) if ((this->actor.xzDistToPlayer < sightRange) && (fabsf(player->actor.world.pos.y - this->actor.world.pos.y) < 100.0f) && (sPlayerCaught == 0)) { sPlayerCaught = 1; - func_8010B680(globalCtx, 0x702D, &this->actor); // "Hey you! Stop! You, kid, over there!" + func_8010B680(globalCtx, 0x702D, &this->actor); func_80078884(NA_SE_SY_FOUND); osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); // "Discovered!" func_8002DF54(globalCtx, &this->actor, 1); @@ -161,7 +161,7 @@ void EnHeishi3_StandSentinelInCastle(EnHeishi3* this, GlobalContext* globalCtx) } } sPlayerCaught = 1; - func_8010B680(globalCtx, 0x702D, &this->actor); // "Hey you! Stop! You, kid, over there!" + func_8010B680(globalCtx, 0x702D, &this->actor); func_80078884(NA_SE_SY_FOUND); osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 発見! ☆☆☆☆☆ \n" VT_RST); // "Discovered!" func_8002DF54(globalCtx, &this->actor, 1); diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index 8f504e246e..111f06ccc0 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -97,7 +97,6 @@ void EnOkarinaTag_Init(Actor* thisx, GlobalContext* globalCtx) { this->actionFunc = func_80ABF28C; break; case 5: - // "This poem is dedicated to the memory of the dearly departed members of the Royal Family." this->actor.textId = 0x5021; this->actionFunc = func_80ABF708; break; @@ -289,7 +288,6 @@ void func_80ABF708(EnOkarinaTag* this, GlobalContext* globalCtx) { this->unk_15A++; if (!(this->actor.xzDistToPlayer > 120.0f)) { if (CHECK_QUEST_ITEM(QUEST_SONG_SUN)) { - // "This poem is dedicated to the memory of the dearly departed members of the Royal Family." this->actor.textId = 0x5021; } yawDiffNew = ABS(yawDiff); diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index d6b037a267..1836e9cbb4 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -3573,7 +3573,7 @@ void func_8083819C(Player* this, GlobalContext* globalCtx) { Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_ITEM_SHIELD, this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, 0, 0, 0, 1); Inventory_DeleteEquipment(globalCtx, EQUIP_SHIELD); - func_8010B680(globalCtx, 0x305F, NULL); // "Your shield is gone!" + func_8010B680(globalCtx, 0x305F, NULL); } } @@ -4120,7 +4120,7 @@ s32 func_80839800(Player* this, GlobalContext* globalCtx) { doorActor = this->doorActor; if (this->doorType <= PLAYER_DOORTYPE_AJAR) { - doorActor->textId = 0xD0; // "It won't open!" + doorActor->textId = 0xD0; func_80853148(globalCtx, doorActor); return 0; }