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

6
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View file

@ -143,8 +143,8 @@ void func_80A4E470(EnGs* this, GlobalContext* globalCtx) {
if (this->actor.xzDistToPlayer <= 100.0f) {
bREG(15) = 1;
if (this->unk_19D == 0) {
player->stateFlags2 |= 0x800000;
if (player->stateFlags2 & 0x1000000) {
player->stateFlags2 |= PLAYER_STATE2_23;
if (player->stateFlags2 & PLAYER_STATE2_24) {
func_8010BD58(globalCtx, OCARINA_ACTION_FREE_PLAY);
this->unk_19D |= 1;
}
@ -167,7 +167,7 @@ void func_80A4E470(EnGs* this, GlobalContext* globalCtx) {
this->unk_19D = 0;
Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F);
} else if (globalCtx->msgCtx.ocarinaMode == OCARINA_MODE_01) {
player->stateFlags2 |= 0x800000;
player->stateFlags2 |= PLAYER_STATE2_23;
}
}
}