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

16
src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View file

@ -177,7 +177,7 @@ void func_80984DB8(DemoIm* this) {
}
void func_80984E58(DemoIm* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 yawDiff;
s16 phi_a3;
@ -190,7 +190,7 @@ void func_80984E58(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80984F10(DemoIm* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
this->unk_2D4.unk_18 = player->actor.world.pos;
this->unk_2D4.unk_14 = kREG(16) + 12.0f;
@ -199,7 +199,7 @@ void func_80984F10(DemoIm* this, GlobalContext* globalCtx) {
}
void func_80984F94(DemoIm* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
this->unk_2D4.unk_18 = player->actor.world.pos;
this->unk_2D4.unk_14 = kREG(16) + 4.0f;
@ -308,7 +308,7 @@ void func_80985358(DemoIm* this, GlobalContext* globalCtx) {
}
void func_809853B4(DemoIm* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 playerX = player->actor.world.pos.x;
f32 playerY = player->actor.world.pos.y + 80.0f;
f32 playerZ = player->actor.world.pos.z;
@ -326,7 +326,7 @@ void func_8098544C(DemoIm* this, GlobalContext* globalCtx) {
s32 pad[2];
if ((gSaveContext.chamberCutsceneNum == 4) && (gSaveContext.sceneSetupIndex < 4)) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
this->action = 1;
globalCtx->csCtx.segment = D_8098786C;
@ -825,7 +825,7 @@ void func_809869B0(DemoIm* this, GlobalContext* globalCtx) {
}
s32 func_809869F8(DemoIm* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 playerPosX = player->actor.world.pos.x;
f32 thisPosX = this->actor.world.pos.x;
@ -836,7 +836,7 @@ s32 func_809869F8(DemoIm* this, GlobalContext* globalCtx) {
}
s32 func_80986A5C(DemoIm* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 playerPosX = player->actor.world.pos.x;
f32 thisPosX = this->actor.world.pos.x;
@ -859,7 +859,7 @@ s32 func_80986AD0(DemoIm* this, GlobalContext* globalCtx) {
void func_80986B2C(GlobalContext* globalCtx) {
if (func_8010BDBC(&globalCtx->msgCtx) == 2) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
globalCtx->nextEntranceIndex = 0xCD;
globalCtx->fadeTransition = 38;