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

6
src/overlays/actors/ovl_En_Rr/z_en_rr.c
View file

@ -285,7 +285,7 @@ u8 EnRr_GetMessage(u8 shield, u8 tunic) {
}
void EnRr_SetupReleasePlayer(EnRr* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
u8 shield;
u8 tunic;
@ -413,7 +413,7 @@ void EnRr_SetupStunned(EnRr* this) {
void EnRr_CollisionCheck(EnRr* this, GlobalContext* globalCtx) {
Vec3f hitPos;
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (this->collider2.base.acFlags & AC_HIT) {
this->collider2.base.acFlags &= ~AC_HIT;
@ -618,7 +618,7 @@ void EnRr_Reach(EnRr* this, GlobalContext* globalCtx) {
}
void EnRr_GrabPlayer(EnRr* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
func_800AA000(this->actor.xyzDistToPlayerSq, 120, 2, 120);
if ((this->frameCount % 8) == 0) {