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

8
src/overlays/actors/ovl_En_Kz/z_en_kz.c
View file

@ -65,7 +65,7 @@ static struct_80034EC0_Entry sAnimations[] = {
};
u16 EnKz_GetTextNoMaskChild(GlobalContext* globalCtx, EnKz* this) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (CHECK_QUEST_ITEM(QUEST_ZORA_SAPPHIRE)) {
return 0x402B;
@ -78,7 +78,7 @@ u16 EnKz_GetTextNoMaskChild(GlobalContext* globalCtx, EnKz* this) {
}
u16 EnKz_GetTextNoMaskAdult(GlobalContext* globalCtx, EnKz* this) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (INV_CONTENT(ITEM_TRADE_ADULT) >= ITEM_FROG) {
if (!(gSaveContext.infTable[19] & 0x200)) {
@ -185,7 +185,7 @@ void EnKz_UpdateEyes(EnKz* this) {
s32 func_80A9C95C(GlobalContext* globalCtx, EnKz* this, s16* arg2, f32 unkf, callback1_800343CC callback1,
callback2_800343CC callback2) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 sp32;
s16 sp30;
f32 xzDistToPlayer;
@ -228,7 +228,7 @@ s32 func_80A9C95C(GlobalContext* globalCtx, EnKz* this, s16* arg2, f32 unkf, cal
}
void func_80A9CB18(EnKz* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (func_80A9C95C(globalCtx, this, &this->unk_1E0.unk_00, 340.0f, EnKz_GetText, func_80A9C6C0)) {
if ((this->actor.textId == 0x401A) && !(gSaveContext.eventChkInf[3] & 8)) {