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

Merge branch 'master' into skelanime

Browse source
This commit is contained in:
KrimtonZ 2020-03-24 11:56:37 -05:00
commit 8bbac143cd
505 changed files with 1437 additions and 2808 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/actors/ovl_En_Ms/z_en_ms.c
View file

@ -67,13 +67,13 @@ extern D_060005EC;
extern D_06003DC0;
static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) {
this->actor.textId = func_8006C360(globalCtx, 0x1B);
this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1B);
if (this->actor.textId == 0) {
if (BEANS_BOUGHT >= 10) {
this->actor.textId = 0x406B;
return;
} else {
this->actor.textId = offerTextIds[BEANS_BOUGHT];
}
this->actor.textId = offerTextIds[BEANS_BOUGHT];
}
}