mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +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_Hy/z_en_hy.c
View file

@ -262,7 +262,7 @@ void func_80A6F7CC(EnHy* this, GlobalContext* globalCtx, s32 getItemId) {
}
u16 func_80A6F810(GlobalContext* globalCtx, Actor* thisx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
EnHy* this = THIS;
u16 textId = Text_GetFaceReaction(globalCtx, (this->actor.params & 0x7F) + 37);
@ -441,7 +441,7 @@ s16 func_80A70058(GlobalContext* globalCtx, Actor* thisx) {
case 0x70F3:
Rupees_ChangeBy(beggarRewards[this->actor.textId - 0x70F0]);
func_80034EC0(&this->skelAnime, D_80A72050, 17);
Player_UpdateBottleHeld(globalCtx, PLAYER, ITEM_BOTTLE, PLAYER_AP_BOTTLE);
Player_UpdateBottleHeld(globalCtx, GET_PLAYER(globalCtx), ITEM_BOTTLE, PLAYER_AP_BOTTLE);
break;
case 0x7016:
gSaveContext.infTable[12] |= 1;
@ -565,7 +565,7 @@ void func_80A70734(EnHy* this, GlobalContext* globalCtx) {
}
void func_80A70834(EnHy* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if ((this->actor.params & 0x7F) == 5) {
if (!Inventory_HasSpecificBottle(ITEM_BLUE_FIRE) && !Inventory_HasSpecificBottle(ITEM_BUG) &&
@ -606,7 +606,7 @@ void func_80A70834(EnHy* this, GlobalContext* globalCtx) {
}
void func_80A70978(EnHy* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s16 phi_a3;
switch (this->actor.params & 0x7F) {