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

@ -121,7 +121,7 @@ void ShotSun_TriggerFairy(ShotSun* this, GlobalContext* globalCtx) {
}
void func_80BADF0C(ShotSun* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 pad;
s32 params = this->actor.params & 0xFF;
@ -155,7 +155,7 @@ void func_80BADF0C(ShotSun* this, GlobalContext* globalCtx) {
void ShotSun_UpdateHyliaSun(ShotSun* this, GlobalContext* globalCtx) {
Vec3s cylinderPos;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
EnItem00* collectible;
s32 pad;
Vec3f spawnPos;