mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 03:14:38 +00:00
Code Issues Projects Releases Wiki Activity

EnWf OK and documented (#967)

Browse source 
* a ton of progress, 14 functions remain

* cleanup

* a few more functions done, 11 remain

* finally all updated

* another function matched

* another action finished

* damage table

* death action done

* started very large action func

* more progress on long action funcs

* large action func matched

* 5 functions remain

* another large action finished

* start another action, doesn't match yet

* a few new functions, neither match

* done working on this for now

* Correct one nonmatching, fix compiler warnings

* Two functions left

* one left

* remove remaining gotos

* OK

* Delete outdated comment

* namefixer

* Flag macros

* audio, dmgeff, some colour

* Import symbols from object, reloc, name a few things

* Rest of object done

* Named a few more things, add action enum

* Name body parts and another couple of actions

* Last few names

* Delete asm

* Format

* undefined_syms, mods where possible

* Correct parent to EnEncount1

* Review

* Last newline

* louis and Dragorn's reviews

* Format

* More review

* Put back to isInvisible and or, as in EnGeldB

* Remove if (0)s in func_8009728C and change pointer arithmetic cast

* More review

* Unname headRot, make "fallthrough" case clearer, other review

* Format

* Even more review

* Rephrase

Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com>
This commit is contained in:
EllipticEllipsis 2021-09-24 23:35:42 +01:00 • committed by GitHub
parent 8e318d257e
commit 16471bb68d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 1583 additions and 4805 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/code/z_actor.c
View file

@ -3947,7 +3947,7 @@ s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s
}
}
void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3) {
void func_8003555C(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel) {
Color_RGBA8 color1;
Color_RGBA8 color2;
@ -3960,7 +3960,7 @@ void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* ar
color2.b = 50;
//! @bug color1 and color2 alpha components not set before being passed on
EffectSsKiraKira_SpawnSmall(globalCtx, arg1, arg2, arg3, &color1, &color2);
EffectSsKiraKira_SpawnSmall(globalCtx, pos, velocity, accel, &color1, &color2);
}
Vec3f D_80116268 = { 0.0f, -1.5f, 0.0f };
@ -3973,8 +3973,8 @@ Gfx D_80116280[] = {
gsSPEndDisplayList(),
};
void func_800355B8(GlobalContext* globalCtx, Vec3f* arg1) {
func_8003555C(globalCtx, arg1, &D_80116268, &D_80116274);
void func_800355B8(GlobalContext* globalCtx, Vec3f* pos) {
func_8003555C(globalCtx, pos, &D_80116268, &D_80116274);
}
u8 func_800355E4(GlobalContext* globalCtx, Collider* collider) {