mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 08:20: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_Gb/z_en_gb.c
View file

@ -271,7 +271,7 @@ void func_80A2F7C0(EnGb* this) {
}
void func_80A2F83C(EnGb* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (!func_80A2F760(this)) {
if (this->actionTimer != 0) {
@ -319,7 +319,7 @@ void func_80A2F9C0(EnGb* this, GlobalContext* globalCtx) {
gSaveContext.infTable[0xB] |= 0x40;
}
func_80A2F180(this);
Player_UpdateBottleHeld(globalCtx, PLAYER, ITEM_BOTTLE, PLAYER_AP_BOTTLE);
Player_UpdateBottleHeld(globalCtx, GET_PLAYER(globalCtx), ITEM_BOTTLE, PLAYER_AP_BOTTLE);
Rupees_ChangeBy(10);
this->actionFunc = func_80A2F83C;
}
@ -331,7 +331,7 @@ void func_80A2FA50(EnGb* this, GlobalContext* globalCtx) {
gSaveContext.infTable[0xB] |= 0x40;
}
func_80A2F180(this);
Player_UpdateBottleHeld(globalCtx, PLAYER, ITEM_BOTTLE, PLAYER_AP_BOTTLE);
Player_UpdateBottleHeld(globalCtx, GET_PLAYER(globalCtx), ITEM_BOTTLE, PLAYER_AP_BOTTLE);
Rupees_ChangeBy(50);
HIGH_SCORE(HS_POE_POINTS) += 100;
if (HIGH_SCORE(HS_POE_POINTS) != 1000) {
@ -340,7 +340,7 @@ void func_80A2FA50(EnGb* this, GlobalContext* globalCtx) {
}
this->actionFunc = func_80A2F83C;
} else {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
player->exchangeItemId = EXCH_ITEM_NONE;
this->textId = 0x70F8;