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

Macros: PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx) (#921)

Browse source 
* PLAYER -> GET_PLAYER(globalCtx)

* ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)

* PR Suggestions

* formatter

* Add brackets

* remove from actorfixer.py

* Bring back actorfixer.py change
This commit is contained in:
engineer124 2021-08-31 20:22:03 +10:00 • committed by GitHub
parent f8498478c4
commit 1117783731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
281 changed files with 1013 additions and 979 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Fu/z_en_fu.c
View file

@ -168,7 +168,7 @@ void func_80A1DBA0(EnFu* this, GlobalContext* globalCtx) {
}
void func_80A1DBD4(EnFu* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (globalCtx->msgCtx.unk_E3EE >= 4) {
this->actionFunc = EnFu_WaitAdult;
@ -192,7 +192,7 @@ void func_80A1DBD4(EnFu* this, GlobalContext* globalCtx) {
}
void EnFu_WaitForPlayback(EnFu* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
player->stateFlags2 |= 0x800000;
// if dialog state is 7, player has played back the song
@ -203,7 +203,7 @@ void EnFu_WaitForPlayback(EnFu* this, GlobalContext* globalCtx) {
}
void EnFu_TeachSong(EnFu* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
player->stateFlags2 |= 0x800000;
// if dialog state is 2, start song demonstration
@ -217,7 +217,7 @@ void EnFu_TeachSong(EnFu* this, GlobalContext* globalCtx) {
void EnFu_WaitAdult(EnFu* this, GlobalContext* globalCtx) {
static s16 yawDiff;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
yawDiff = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
if ((gSaveContext.eventChkInf[5] & 0x800)) {