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

10
src/overlays/actors/ovl_En_Du/z_en_du.c
View file

@ -147,7 +147,7 @@ s32 func_809FDDB4(EnDu* this, GlobalContext* globalCtx) {
}
void func_809FDE24(EnDu* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 phi_a3 = 0;
if (this->unk_1F4.unk_00 == 0) {
@ -295,7 +295,7 @@ void func_809FE3B4(EnDu* this, GlobalContext* globalCtx) {
}
void func_809FE3C0(EnDu* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (player->stateFlags2 & 0x1000000) {
func_8010BD88(globalCtx, 0x22);
@ -314,7 +314,7 @@ void func_809FE3C0(EnDu* this, GlobalContext* globalCtx) {
}
void func_809FE4A4(EnDu* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (globalCtx->msgCtx.unk_E3EE == 4) {
globalCtx->msgCtx.unk_E3EE = 0;
@ -338,7 +338,7 @@ void func_809FE4A4(EnDu* this, GlobalContext* globalCtx) {
}
void func_809FE638(EnDu* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (!(player->stateFlags1 & 0x20000000)) {
OnePointCutscene_Init(globalCtx, 3330, -99, &this->actor, MAIN_CAM);
@ -368,7 +368,7 @@ void func_809FE6CC(EnDu* this, GlobalContext* globalCtx) {
void func_809FE740(EnDu* this, GlobalContext* globalCtx) {
if (this->unk_1F4.unk_00 == 0) {
func_8005B1A4(ACTIVE_CAM);
func_8005B1A4(GET_ACTIVE_CAM(globalCtx));
this->unk_1E2 = 0x5A;
EnDu_SetupAction(this, func_809FE798);
}