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

12
src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
View file

@ -222,7 +222,7 @@ void EnMa1_ChangeAnimation(EnMa1* this, UNK_TYPE idx) {
}
void func_80AA0AF4(EnMa1* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 phi_a3;
if ((this->unk_1E8.unk_00 == 0) && (this->skelAnime.animation == &gMalonChildSingAnim)) {
@ -330,7 +330,7 @@ void func_80AA0EFC(EnMa1* this, GlobalContext* globalCtx) {
}
void func_80AA0F44(EnMa1* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (this->unk_1E8.unk_00 != 0) {
if (this->skelAnime.animation != &gMalonChildIdleAnim) {
@ -358,7 +358,7 @@ void func_80AA0F44(EnMa1* this, GlobalContext* globalCtx) {
}
void func_80AA106C(EnMa1* this, GlobalContext* globalCtx) {
PLAYER->stateFlags2 |= 0x800000;
GET_PLAYER(globalCtx)->stateFlags2 |= 0x800000;
if (this->unk_1E8.unk_00 == 2) {
func_800ED858(2);
func_8010BD58(globalCtx, 9);
@ -368,7 +368,7 @@ void func_80AA106C(EnMa1* this, GlobalContext* globalCtx) {
}
void func_80AA10EC(EnMa1* this, GlobalContext* globalCtx) {
PLAYER->stateFlags2 |= 0x800000;
GET_PLAYER(globalCtx)->stateFlags2 |= 0x800000;
if (func_8010BDBC(&globalCtx->msgCtx) == 7) {
func_8010BD58(globalCtx, 0x16);
this->actionFunc = func_80AA1150;
@ -376,7 +376,7 @@ void func_80AA10EC(EnMa1* this, GlobalContext* globalCtx) {
}
void func_80AA1150(EnMa1* this, GlobalContext* globalCtx) {
PLAYER->stateFlags2 |= 0x800000;
GET_PLAYER(globalCtx)->stateFlags2 |= 0x800000;
if (globalCtx->msgCtx.unk_E3EE == 3) {
globalCtx->nextEntranceIndex = 0x157;
gSaveContext.nextCutsceneIndex = 0xFFF1;
@ -445,7 +445,7 @@ void EnMa1_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ma1.c", 1226);
camera = ACTIVE_CAM;
camera = GET_ACTIVE_CAM(globalCtx);
distFromCamera = Math_Vec3f_DistXZ(&this->actor.world.pos, &camera->eye);
func_800F6268(distFromCamera, 0x2F);
func_80093D18(globalCtx->state.gfxCtx);