diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-06-15 16:04:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-15 19:04:58 -0400 |
| commit | cbe2d5a24ae4a3414c588ff9c18bcfc4e9da1bb9 (patch) | |
| tree | 0f750800b15d922fa25de5d5d754d914647f380c /src | |
| parent | 1961d5d7717eb91e9b12b47968fdb3589e0d6184 (diff) | |
Fixed (#184)
Diffstat (limited to 'src')
| -rw-r--r-- | src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c index eac90b280..22e702baf 100644 --- a/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c +++ b/src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c @@ -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!" diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index b1fd5367c..3469868ae 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -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)) { diff --git a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c index df7619abf..9b2333681 100644 --- a/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c +++ b/src/overlays/actors/ovl_Obj_Ghaka/z_obj_ghaka.c @@ -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); } } |