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

Fix misc 19 (#1488)

Browse source 
* "bgs sword" -> "biggoron sword"

* Animation_ChangeImpl: last arg is `ANIMTAPER_` enum

* TransitionTileStatus -> state

* Tiny gbi.h formatting fixups

* some cleanup on floormaster

* misc float ops cleanup

* sunsSongState = SUNSSONG_INACTIVE

* continueFlag == CS_CMD_STOP

* fix few camera names inconsistency

* textual 0 padding? not on my lawn

* libultra: construct address from end of dmem rather than oob from imem

* more free1 -> 2 fixup
This commit is contained in:
Dragorn421 2023-01-10 19:03:31 +01:00 • committed by GitHub
parent b4c97ce17e
commit 542012efa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 146 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/overlays/actors/ovl_En_Skj/z_en_skj.c
View file

@ -992,7 +992,7 @@ void EnSkj_WaitForSong(EnSkj* this, PlayState* play) {
player->stateFlags2 |= PLAYER_STATE2_23;
} else {
if (play->msgCtx.ocarinaMode >= OCARINA_MODE_05) {
gSaveContext.sunsSongState = 0;
gSaveContext.sunsSongState = SUNSSONG_INACTIVE;
if (GET_ITEMGETINF(ITEMGETINF_16)) {
play->msgCtx.ocarinaMode = OCARINA_MODE_04;
player->unk_6A8 = &this->actor;