mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 16:30:19 +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

20
src/overlays/actors/ovl_En_Zl3/z_en_zl3.c
View file

@ -46,25 +46,25 @@ static void* sEyeTextures[] = { gZelda2EyeOpenTex, gZelda2EyeHalfTex, gZelda2Eye
static void* sMouthTextures[] = { gZelda2MouthSeriousTex, gZelda2MouthHappyTex, gZelda2MouthOpenTex };
s32 D_80B5A468 = 0;
static s32 D_80B5A468 = 0;
Vec3f D_80B5A46C = { 0.0f, 0.0f, 0.0f };
static Vec3f D_80B5A46C = { 0.0f, 0.0f, 0.0f };
Vec3f D_80B5A478 = { 0.0f, 10.0f, 0.0f };
static Vec3f D_80B5A478 = { 0.0f, 10.0f, 0.0f };
f32 D_80B5A484 = 0.0f;
static f32 D_80B5A484 = 0.0f;
Vec3f D_80B5A488 = { 0.0f, 0.0f, 0.0f };
static Vec3f D_80B5A488 = { 0.0f, 0.0f, 0.0f };
s32 D_80B5A494 = -1;
static s32 D_80B5A494 = -1;
Vec3f D_80B5A498 = { 148.0f, 260.0f, -87.0f };
static Vec3f D_80B5A498 = { 148.0f, 260.0f, -87.0f };
Vec3f D_80B5A4A4 = { -12.0f, 260.0f, -147.0f };
static Vec3f D_80B5A4A4 = { -12.0f, 260.0f, -147.0f };
Vec3f D_80B5A4B0 = { 42.0f, 260.0f, 13.0f };
static Vec3f D_80B5A4B0 = { 42.0f, 260.0f, 13.0f };
u32 D_80B5A4BC = 0;
static u32 D_80B5A4BC = 0;
void func_80B533B0(Actor* thisx, GlobalContext* globalCtx) {
EnZl3* this = THIS;