mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-24 09:01:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed (#184)

Browse Source
This commit is contained in:
Derek Hensley
2021-06-15 16:04:58 -07:00
committed by GitHub
parent 1961d5d771
commit cbe2d5a24a
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+1 -1
View File
@@ -234,7 +234,7 @@ void EnGinkoMan_DepositDialogue(EnGinkoMan* this, GlobalContext* globalCtx) {
this->curTextId = 0x464; // Hey, relax! It doesn't leave any marks
break;
case 0x464: // Hey, relax! It doesn't leave any marks
globalCtx->msgCtx.unk11F23 = 0x44;
globalCtx->msgCtx.unk11F22 = 0x44;
EnGinkoMan_SetupStamp(this); // stamp player
break;
case 0x465: // "There! Now I'll know you when I see you!"
src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c
+1 -1
View File
@@ -493,7 +493,7 @@ void EnWeatherTag_Update(Actor* thisx, GlobalContext* globalCtx) {
u16 oldTime;
this->actionFunc(this, globalCtx);
if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.unk11F23 != 0) &&
if ((globalCtx->actorCtx.unk5 & 2) && (globalCtx->msgCtx.unk11F22 != 0) &&
(globalCtx->msgCtx.unk11F04 == 0x5E6) && (!FrameAdvance_IsEnabled(globalCtx)) && (globalCtx->unk18875 == 0) &&
(ActorCutscene_GetCurrentIndex() == -1) && (globalCtx->csCtx.state == 0)) {
src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c
+4 -4
View File
@@ -101,8 +101,8 @@ void func_80B3C4E0(ObjGhaka* this, GlobalContext* globalCtx) {
if (temp_v0 == 5) {
if (func_80147624(globalCtx)) {
globalCtx->msgCtx.unk11F23 = 0x43;
globalCtx->msgCtx.unk12024 = 4;
globalCtx->msgCtx.unk11F22 = 0x43;
globalCtx->msgCtx.unk12023 = 4;
func_80B3C260(this);
}
// Could be fake, but helps match
@@ -121,8 +121,8 @@ void func_80B3C4E0(ObjGhaka* this, GlobalContext* globalCtx) {
break;
case 2:
func_8019F230();
globalCtx->msgCtx.unk11F23 = 0x43;
globalCtx->msgCtx.unk12024 = 4;
globalCtx->msgCtx.unk11F22 = 0x43;
globalCtx->msgCtx.unk12023 = 4;
func_80B3C260(this);
}
}