mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 15:31:15 +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

6
src/overlays/actors/ovl_En_St/z_en_st.c
View file

@ -571,7 +571,7 @@ s32 EnSt_DecrStunTimer(EnSt* this) {
if (this->stunTimer == 0) {
return 0;
}
this->stunTimer--; // @bug ? no return but v0 ends up being stunTimer before decrement
this->stunTimer--; //! @bug ? no return but v0 ends up being stunTimer before decrement
}
/**
@ -801,9 +801,9 @@ void EnSt_Init(Actor* thisx, GlobalContext* globalCtx) {
this->actor.flags |= 0x80;
}
if (this->actor.params == 1) {
this->actor.naviEnemyId = 5;
this->actor.naviEnemyId = 0x05;
} else {
this->actor.naviEnemyId = 4;
this->actor.naviEnemyId = 0x04;
}
EnSt_CheckCeilingPos(this, globalCtx);
this->actor.flags |= 0x4000;