mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 15:01:17 +00:00
Code Issues Projects Releases Wiki Activity

Introduce Face Reaction Enum (#1586)

Browse source 
* face reactions

* cleanup

* cleanup fake match

* PR Review

* while I'm here

* mask reaction

* small fix

* Small cleanup

* oops
This commit is contained in:
engineer124 2024-01-09 09:17:22 +11:00 • committed by GitHub
parent c1a499c3ae
commit e146d7bc26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
37 changed files with 302 additions and 125 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Ta/z_en_ta.c
View file

@ -21,8 +21,6 @@
#define TALON_STATE_FLAG_RAISING_HANDS (1 << 8)
#define TALON_STATE_FLAG_RESTORE_BGM_ON_DESTROY (1 << 9)
#define TALON_FACE_REACTION_SET 24
typedef enum {
/* 0 */ TALON_EYE_INDEX_OPEN,
/* 1 */ TALON_EYE_INDEX_HALF,
@ -97,7 +95,7 @@ void EnTa_SetupAction(EnTa* this, EnTaActionFunc actionFunc, EnTaAnimFunc animFu
}
void EnTa_SetTextForTalkInLonLonHouse(EnTa* this, PlayState* play) {
u16 faceReaction = Text_GetFaceReaction(play, TALON_FACE_REACTION_SET);
u16 maskReactionTextId = MaskReaction_GetTextId(play, MASK_REACTION_SET_TALON);
// Check if cucco game was just finished
if (GET_EVENTINF(EVENTINF_CUCCO_GAME_FINISHED)) {
@ -115,7 +113,7 @@ void EnTa_SetTextForTalkInLonLonHouse(EnTa* this, PlayState* play) {
this->actor.textId = 0x2085;
}
CLEAR_EVENTINF(EVENTINF_CUCCO_GAME_WON);
} else if (faceReaction == 0) {
} else if (maskReactionTextId == 0) {
if (GET_INFTABLE(INFTABLE_TALKED_TO_TALON_IN_RANCH_HOUSE)) {
if (GET_ITEMGETINF(ITEMGETINF_TALON_BOTTLE)) {
// Play cucco game or buy milk
@ -129,7 +127,7 @@ void EnTa_SetTextForTalkInLonLonHouse(EnTa* this, PlayState* play) {
this->actor.textId = 0x207E;
}
} else {
this->actor.textId = faceReaction;
this->actor.textId = maskReactionTextId;
}
}
@ -1086,14 +1084,14 @@ void EnTa_TalkAfterCuccoGameWon(EnTa* this, PlayState* play) {
}
void EnTa_IdleSittingInLonLonHouse(EnTa* this, PlayState* play) {
u16 faceReaction = Text_GetFaceReaction(play, TALON_FACE_REACTION_SET);
u16 maskReactionTextId = MaskReaction_GetTextId(play, MASK_REACTION_SET_TALON);
EnTa_SetTextForTalkInLonLonHouse(this, play);
if (EnTa_RequestTalk(this, play, this->actor.textId)) {
Actor_PlaySfx(&this->actor, NA_SE_VO_TA_SURPRISE);
if (faceReaction != 0) {
if (maskReactionTextId != 0) {
EnTa_SetupActionWithWakeUpAnimation(this, EnTa_TalkGeneralInLonLonHouse);
} else {
SET_INFTABLE(INFTABLE_TALKED_TO_TALON_IN_RANCH_HOUSE);