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

Defines for player state flags (#1081)

Browse source 
* script-assisted player state flags

* Run formatter

* manually convert state flags in `D_80116068`

* `PLAYER_STATE_FLAG_` -> `PLAYER_STATE`

* Run formatter
This commit is contained in:
Dragorn421 2022-01-18 01:04:07 +01:00 • committed by GitHub
parent 2a4fb604fb
commit 6479913daa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
96 changed files with 945 additions and 810 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c
View file

@ -170,11 +170,11 @@ s32 ObjTimeblock_WaitForOcarina(ObjTimeblock* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
if (ObjTimeblock_PlayerIsInRange(this, globalCtx)) {
if (player->stateFlags2 & 0x1000000) {
if (player->stateFlags2 & PLAYER_STATE2_24) {
func_8010BD58(globalCtx, OCARINA_ACTION_FREE_PLAY);
this->songObserverFunc = ObjTimeblock_WaitForSong;
} else {
player->stateFlags2 |= 0x800000;
player->stateFlags2 |= PLAYER_STATE2_23;
}
}
return false;