1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +00:00

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

* 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

View file

@ -496,7 +496,7 @@ void EnMd_UpdateEyes(EnMd* this) {
}
void func_80AAB158(EnMd* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 absYawDiff;
s16 temp;
s16 temp2;
@ -669,9 +669,9 @@ void func_80AAB8F8(EnMd* this, GlobalContext* globalCtx) {
}
void func_80AAB948(EnMd* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 temp;
Actor* actorToBlock = &PLAYER->actor;
Actor* actorToBlock = &GET_PLAYER(globalCtx)->actor;
s16 yaw;
func_80AAAA24(this);
@ -734,7 +734,7 @@ void func_80AAB948(EnMd* this, GlobalContext* globalCtx) {
}
void func_80AABC10(EnMd* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (globalCtx->msgCtx.unk_E3EE >= 4) {
this->actionFunc = func_80AAB948;