falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update and fix a few comments for the banker. (#598) 

* Update and fix a few comments for the banker.

* Change 'Link' to 'the player' and remove some actual message quotes.
This commit is contained in:
ZoeyZolotova 2022-01-17 05:14:09 +11:00 committed by GitHub
parent b2a42dcf8b
commit 94a2e5a3d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
View File

@ -512,7 +512,7 @@ void EnGinkoMan_SetupBankAward(EnGinkoMan* this) {
void EnGinkoMan_BankAward(EnGinkoMan* this, GlobalContext* globalCtx) { void EnGinkoMan_BankAward(EnGinkoMan* this, GlobalContext* globalCtx) {
if (Actor_HasParent(&this->actor, globalCtx)) { if (Actor_HasParent(&this->actor, globalCtx)) {
// ? when would bank have a parent? // Parent is the player when starting to receive the award
this->actor.parent = NULL; this->actor.parent = NULL;
EnGinkoMan_SetupBankAward2(this); EnGinkoMan_SetupBankAward2(this);
} else if (this->curTextId == 0x45B) { // "Whats this, you already saved up 200?" } else if (this->curTextId == 0x45B) { // "Whats this, you already saved up 200?"
@ -535,7 +535,7 @@ void EnGinkoMan_SetupBankAward2(EnGinkoMan* this) {
this->actionFunc = EnGinkoMan_BankAward2; this->actionFunc = EnGinkoMan_BankAward2;
} }
// separate function to handle bank rewards... if the bank has a parent actor? might be unused // separate function to handle bank rewards... called while the player is receiving the award
void EnGinkoMan_BankAward2(EnGinkoMan* this, GlobalContext* globalCtx) { void EnGinkoMan_BankAward2(EnGinkoMan* this, GlobalContext* globalCtx) {
if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) { if (Actor_ProcessTalkRequest(&this->actor, &globalCtx->state)) {
if (!(gSaveContext.weekEventReg[10] & 8) && (this->curTextId == 0x45B)) { if (!(gSaveContext.weekEventReg[10] & 8) && (this->curTextId == 0x45B)) {
@ -543,11 +543,11 @@ void EnGinkoMan_BankAward2(EnGinkoMan* this, GlobalContext* globalCtx) {
// it!" // it!"
gSaveContext.weekEventReg[10] |= 8; gSaveContext.weekEventReg[10] |= 8;
func_801518B0(globalCtx, 0x47A, &this->actor); func_801518B0(globalCtx, 0x47A, &this->actor);
this->curTextId = 0x47A; // "See! Doesn't it hold more than your old one? this->curTextId = 0x47A; // Message after receiving reward for depositing 200 rupees.
} else { } else {
Actor_ChangeAnimation(&this->skelAnime, animations, GINKO_SITTING); Actor_ChangeAnimation(&this->skelAnime, animations, GINKO_SITTING);
func_801518B0(globalCtx, 0x47B, &this->actor); func_801518B0(globalCtx, 0x47B, &this->actor);
this->curTextId = 0x47B; // "Is that so? Think it over, little guy! So what are you gonna do?" this->curTextId = 0x47B; // Message after receiving reward for depositing 1000 rupees.
} }
EnGinkoMan_SetupDialogue(this); EnGinkoMan_SetupDialogue(this);