diff --git a/include/z64ocarina.h b/include/z64ocarina.h index bcff0a3f22..cc1662fbd7 100644 --- a/include/z64ocarina.h +++ b/include/z64ocarina.h @@ -81,7 +81,7 @@ typedef enum { /* 13 */ OCARINA_INSTRUMENT_PIANO, /* 14 */ OCARINA_INSTRUMENT_BASS_GUITAR, /* 15 */ OCARINA_INSTRUMENT_BABY_SINGING, - /* 16 */ OCARINA_INSTRUMENT_AMPLIFIED_GUITAR, // Related to (gSaveContext.weekEventReg[0x29] & 0x20) + /* 16 */ OCARINA_INSTRUMENT_AMPLIFIED_GUITAR, // Related to (gSaveContext.weekEventReg[41] & 0x20) } OcarinaInstrumentId; typedef enum { diff --git a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c index 9fbf4427dd..7ec514801c 100644 --- a/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c +++ b/src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c @@ -1464,7 +1464,7 @@ void EnMaYto_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 pad; OPEN_DISPS(globalCtx->state.gfxCtx); - if (this->type == MA_YTO_TYPE_BARN && (gSaveContext.weekEventReg[22] & 1)) { // Alieans defeated + if (this->type == MA_YTO_TYPE_BARN && (gSaveContext.weekEventReg[22] & 1)) { // Aliens defeated gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gCremiaWoodenBox); } diff --git a/src/overlays/actors/ovl_En_Osn/z_en_osn.c b/src/overlays/actors/ovl_En_Osn/z_en_osn.c index 7914d0fed3..fd0e8b6bc2 100644 --- a/src/overlays/actors/ovl_En_Osn/z_en_osn.c +++ b/src/overlays/actors/ovl_En_Osn/z_en_osn.c @@ -370,11 +370,11 @@ s32 func_80AD0E10(EnOsn* this, GlobalContext* globalCtx) { return 0x1FCD; } this->unk_1EA |= 8; - if (gSaveContext.weekEventReg[0x4C] & 0x20) { + if (gSaveContext.weekEventReg[76] & 0x20) { return 0x1FC8; } - gSaveContext.weekEventReg[0x4C] |= 0x20; + gSaveContext.weekEventReg[76] |= 0x20; return 0x1FCE; } @@ -388,10 +388,10 @@ s32 func_80AD0E10(EnOsn* this, GlobalContext* globalCtx) { return 0x1FCD; } this->unk_1EA |= 0x10; - if (gSaveContext.weekEventReg[0x4C] & 0x40) { + if (gSaveContext.weekEventReg[76] & 0x40) { return 0x1FC8; } - gSaveContext.weekEventReg[0x4C] |= 0x40; + gSaveContext.weekEventReg[76] |= 0x40; return 0x1FD0; }