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

Big cleanup (#775)

Browse source 
* Adult and child2 macros OK

* ICHAIN cleanup

* almost all overlay data

* format.sh

* func_8002FBAC NON_EQUIVALENT

* PR fixes (MZXrules)

* fix

* change //@ bug to //! @bug

* merge master and missed a //@bug

* fix ruto

* some more cleanup (#2)

* more `! @bug` formatting cleanup

* parenthesis cleanup

* hex naviEnemyId

* run formatter

* replace `IS_NOT_` macros with `!IS_`

* run formatter

* run formatter

* PR fixes (fig)

* Missed something

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
louist103 2021-08-21 19:12:57 -04:00 • committed by GitHub
parent 17c79a8f60
commit 556cdad7eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
177 changed files with 902 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Du/z_en_du.c
View file

@ -138,7 +138,7 @@ s16 func_809FDCDC(GlobalContext* globalCtx, Actor* actor) {
}
s32 func_809FDDB4(EnDu* this, GlobalContext* globalCtx) {
if (globalCtx->sceneNum == SCENE_SPOT18 && gSaveContext.linkAge == 1) {
if (globalCtx->sceneNum == SCENE_SPOT18 && LINK_IS_CHILD) {
return 1;
} else if (globalCtx->sceneNum == SCENE_HIDAN && !(gSaveContext.infTable[0x11] & 0x400) && LINK_IS_ADULT) {
return 1;
@ -277,7 +277,7 @@ void EnDu_Init(Actor* thisx, GlobalContext* globalCtx) {
EnDu_SetupAction(this, func_809FE890);
} else if (globalCtx->sceneNum == 4) {
EnDu_SetupAction(this, func_809FE638);
} else if (LINK_IS_CHILD) {
} else if (!LINK_IS_ADULT) {
EnDu_SetupAction(this, func_809FE3C0);
} else {
EnDu_SetupAction(this, func_809FE3B4);