1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50: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

@ -279,7 +279,7 @@ s32 func_809F6DD0(EnDodojr* this) {
void func_809F6E54(EnDodojr* this, GlobalContext* globalCtx) {
f32 angles[] = { 0.0f, 210.0f, 60.0f, 270.0f, 120.0f, 330.0f, 180.0f, 30.0f, 240.0f, 90.0f, 300.0f, 150.0f };
s32 pad;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Vec3f pos;
s16 angleIndex;
@ -391,7 +391,7 @@ void func_809F72A4(EnDodojr* this, GlobalContext* globalCtx) {
void func_809F73AC(EnDodojr* this, GlobalContext* globalCtx) {
f32 lastFrame = Animation_GetLastFrame(&object_dodojr_Anim_000860);
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 dist;
if (!(this->actor.xzDistToPlayer >= 320.0f)) {