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

14
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -540,7 +540,7 @@ s16 EnGo2_GetStateGoronCityLink(GlobalContext* globalCtx, EnGo2* this) {
}
u16 EnGo2_GetTextIdGoronDmtBiggoron(GlobalContext* globalCtx, EnGo2* this) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (gSaveContext.bgsFlag) {
player->exchangeItemId = EXCH_ITEM_CLAIM_CHECK;
@ -846,7 +846,7 @@ void EnGo2_SwapInitialFrameAnimFrameCount(EnGo2* this) {
}
s32 func_80A44AB0(EnGo2* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
f32 arg2;
if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
@ -1052,7 +1052,7 @@ void EnGo2_BiggoronSetTextId(EnGo2* this, GlobalContext* globalCtx, Player* play
}
void func_80A45288(EnGo2* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 linkAge;
if (this->actionFunc != EnGo2_GoronFireGenericAction) {
@ -1591,7 +1591,7 @@ void EnGo2_CurledUp(EnGo2* this, GlobalContext* globalCtx) {
if (Animation_OnFrame(&this->skelAnime, this->skelAnime.endFrame)) {
if ((this->actor.params & 0x1F) == GORON_DMT_BIGGORON) {
quake = Quake_Add(ACTIVE_CAM, 3);
quake = Quake_Add(GET_ACTIVE_CAM(globalCtx), 3);
Quake_SetSpeed(quake, -0x3CB0);
Quake_SetQuakeValues(quake, 8, 0, 0, 0);
Quake_SetCountdown(quake, 16);
@ -1797,7 +1797,7 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, GlobalContext* globalCtx) {
case 1:
if (DECR(this->animTimer)) {
if (this->animTimer == 60 || this->animTimer == 120) {
func_8005B1A4(ACTIVE_CAM);
func_8005B1A4(GET_ACTIVE_CAM(globalCtx));
func_800F4524(&D_801333D4, NA_SE_EV_GORON_WATER_DROP, 60);
}
} else {
@ -1828,7 +1828,7 @@ void EnGo2_BiggoronEyedrops(EnGo2* this, GlobalContext* globalCtx) {
}
void EnGo2_GoronLinkStopRolling(EnGo2* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
switch (this->goronState) {
case 0:
@ -1857,7 +1857,7 @@ void EnGo2_GoronLinkStopRolling(EnGo2* this, GlobalContext* globalCtx) {
}
void EnGo2_GoronFireGenericAction(EnGo2* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
Vec3s D_80A4854C = { 0x00, 0x00, 0x00 };
switch (this->goronState) {