mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Minor Misc Cleanup 3 (#1502)

Browse source 
* more misc cleanup

* remove z64 conflicts

* undo ISVDbg
This commit is contained in:
engineer124 2023-07-06 08:36:19 +10:00 • committed by GitHub
parent 54638f9768
commit 0ce0313342
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 155 additions and 151 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -115,7 +115,7 @@ void func_80AF2608(EnRu2* this) {
s16* unk_2A6 = &this->unk_2A6;
s16* unk_2A4 = &this->unk_2A4;
if (!DECR(*unk_2A6)) {
if (DECR(*unk_2A6) == 0) {
*unk_2A6 = Rand_S16Offset(0x3C, 0x3C);
}
@ -263,7 +263,7 @@ void func_80AF2AB4(EnRu2* this, PlayState* play) {
Player* player;
s16 temp;
if ((gSaveContext.chamberCutsceneNum == 2) && !IS_CUTSCENE_LAYER) {
if ((gSaveContext.chamberCutsceneNum == CHAMBER_CS_WATER) && !IS_CUTSCENE_LAYER) {
player = GET_PLAYER(play);
this->action = 1;
play->csCtx.script = D_80AF411C;