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

4
src/overlays/actors/ovl_En_Cs/z_en_cs.c
View file

@ -202,7 +202,7 @@ s32 EnCs_GetTalkState(EnCs* this, GlobalContext* globalCtx) {
}
s32 EnCs_GetTextID(EnCs* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
s32 textId = Text_GetFaceReaction(globalCtx, 15);
if (gSaveContext.itemGetInf[3] & 0x400) {
@ -391,7 +391,7 @@ void EnCs_Wait(EnCs* this, GlobalContext* globalCtx) {
}
void EnCs_Talk(EnCs* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
Player* player = GET_PLAYER(globalCtx);
if (SkelAnime_Update(&this->skelAnime) != 0) {
EnCs_SetAnimFromIndex(this, this->currentAnimIndex, &this->currentAnimIndex);