mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 15:31:15 +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

2
src/overlays/actors/ovl_En_Fish/z_en_fish.c
View file

@ -742,7 +742,7 @@ void EnFish_RespawningUpdate(EnFish* this, PlayState* play) {
void EnFish_Update(Actor* thisx, PlayState* play) {
EnFish* this = (EnFish*)thisx;
if ((D_80A17010 == NULL) && (this->actor.params == FISH_DROPPED) && (play->csCtx.state != 0) &&
if ((D_80A17010 == NULL) && (this->actor.params == FISH_DROPPED) && (play->csCtx.state != CS_STATE_IDLE) &&
(play->csCtx.actorCues[1] != NULL)) {
EnFish_SetCutsceneData(this);
}