mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-19 13:35:18 +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

8
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -736,10 +736,10 @@ s16 EnGo2_UpdateTalkStateGoronDmtFairyHint(PlayState* play, EnGo2* this) {
u16 EnGo2_GetTextId(PlayState* play, Actor* thisx) {
EnGo2* this = (EnGo2*)thisx;
u16 faceReaction = Text_GetFaceReaction(play, 0x20);
u16 textId = MaskReaction_GetTextId(play, MASK_REACTION_SET_GORON);
if (faceReaction != 0) {
return faceReaction;
if (textId != 0) {
return textId;
} else {
switch (this->actor.params & 0x1F) {
case GORON_CITY_ROLLING_BIG:
@ -773,7 +773,7 @@ u16 EnGo2_GetTextId(PlayState* play, Actor* thisx) {
}
}
#ifdef AVOID_UB
return faceReaction; // faceReaction is always in the v0 return value register at this point
return textId; // textId is always in the v0 return value register at this point
#endif
}