github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #30 from briaguya-ai/rufus

Browse source 
richard (lost dog)
This commit is contained in:
briaguya 2022-06-01 02:28:05 -04:00 • committed by GitHub
commit 77fa73dc51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

31
soh/src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -659,7 +659,7 @@ s16 func_80A70058(GlobalContext* globalCtx, Actor* thisx) {
gSaveContext.dogParams = 0; gSaveContext.dogParams = 0;
break; break;
case 0x709F: case 0x709F:
func_80A6F7CC(this, globalCtx, (gSaveContext.infTable[25] & 2) ? GI_RUPEE_BLUE : GI_HEART_PIECE); func_80A6F7CC(this, globalCtx, (gSaveContext.infTable[25] & 2) ? GI_RUPEE_BLUE : gSaveContext.n64ddFlag ? GetRandomizedItemIdFromKnownCheck(MARKET_LOST_DOG, GI_HEART_PIECE) : GI_HEART_PIECE);
this->actionFunc = func_80A714C4; this->actionFunc = func_80A714C4;
break; break;
} }
@ -1057,19 +1057,26 @@ void func_80A714C4(EnHy* this, GlobalContext* globalCtx) {
void func_80A71530(EnHy* this, GlobalContext* globalCtx) { void func_80A71530(EnHy* this, GlobalContext* globalCtx) {
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(globalCtx)) { if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_DONE) && Message_ShouldAdvance(globalCtx)) {
switch (this->unkGetItemId) { if (gSaveContext.n64ddFlag) {
case GI_HEART_PIECE: if (!(gSaveContext.infTable[25] & 2)) {
gSaveContext.dogParams = 0;
gSaveContext.dogIsLost = false;
gSaveContext.infTable[25] |= 2; gSaveContext.infTable[25] |= 2;
break; }
case GI_RUPEE_BLUE: gSaveContext.dogParams = 0;
Rupees_ChangeBy(5); gSaveContext.dogIsLost = false;
gSaveContext.dogParams = 0; } else {
gSaveContext.dogIsLost = false; switch (this->unkGetItemId) {
break; case GI_HEART_PIECE:
gSaveContext.dogParams = 0;
gSaveContext.dogIsLost = false;
gSaveContext.infTable[25] |= 2;
break;
case GI_RUPEE_BLUE:
Rupees_ChangeBy(5);
gSaveContext.dogParams = 0;
gSaveContext.dogIsLost = false;
break;
}
} }
this->actionFunc = func_80A7127C; this->actionFunc = func_80A7127C;
} }
} }