Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-11-30 17:50:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change all hex weekEventReg accesses into decimal (#660)

Browse Source 
* Change all hex weekEventReg accesses into decimal

* Remove hex from Osn
This commit is contained in:
Tom Overton 2022-02-19 14:39:55 -08:00 committed by GitHub
parent c98184f8e3
commit fc270e338e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/z64ocarina.h
View File

@ -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 {

2
src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c
View File

@ -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);
}

8
src/overlays/actors/ovl_En_Osn/z_en_osn.c
View File

@ -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;
}