diff options
| author | rozlette <uberpanzermensch@gmail.com> | 2019-09-20 01:43:40 -0500 |
|---|---|---|
| committer | rozlette <uberpanzermensch@gmail.com> | 2019-09-20 01:43:40 -0500 |
| commit | 4c11f2f36475bca9b8a2ea52a63e57da3cbbc9cd (patch) | |
| tree | ec78c7acfcb44107b3ebb31d1c11b2b26e471283 /src/code/code_0x800A5AC0.c | |
| parent | 70b60dfce5ed2c26bb42cdcb6f2f821c1140127b (diff) | |
Add tons of function names. Datatypes TODO
Diffstat (limited to 'src/code/code_0x800A5AC0.c')
| -rw-r--r-- | src/code/code_0x800A5AC0.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c index 207cf9315..b1b3c0245 100644 --- a/src/code/code_0x800A5AC0.c +++ b/src/code/code_0x800A5AC0.c @@ -5,28 +5,28 @@ // This file is most likely En_A_Obj -UNK_RET func_800A5AC0(void* a0, UNK_TYPE a1) { +UNK_RET EnAObj_Init(void* a0, UNK_TYPE a1) { s800A5AC0* s0 = (s800A5AC0*)a0; s0->unk116 = ((s0->unk1C >> 8) & 0xFF) | 0x300; s0->unk1C = (s0->unk1C & 0xFF) - 9; - func_800FFADC((z_Actor*)s0, (z_ActorCompInitEntry*)&D_801ADEAC); + Lib_ApplyActorInitVars((z_Actor*)s0, (z_ActorCompInitEntry*)&D_801ADEAC); func_800B3BA4(&s0->unkBC, 0, (UNK_PTR)&func_800B3FC0, 12); - func_800E1374(a1, &s0->unk148, (z_Actor*)s0, &D_801ADE80); - func_800E7DF8((z_Actor*)s0, &s0->unk148); + Collision_InitCylinder(a1, &s0->unk148, (z_Actor*)s0, &D_801ADE80); + Collision_CylinderMoveToActor((z_Actor*)s0, &s0->unk148); s0->unkB6 = 255; - s0->unk144 = func_800A5B98; + s0->unk144 = EnAObj_Update1; } -UNK_RET func_800A5B6C(s800A5AC0* a0, z_GlobalContext* a1) { +UNK_RET EnAObj_Fini(s800A5AC0* a0, z_GlobalContext* a1) { UNK_TYPE* a2 = &a0->unk148; - func_800E11EC(a1, a2); + Collision_FiniCylinder(a1, a2); } -UNK_RET func_800A5B98(s800A5AC0* a0, UNK_TYPE a1) { +UNK_RET EnAObj_Update1(s800A5AC0* a0, UNK_TYPE a1) { s16 v0; s32 v1; if (func_800B84D0(a0, a1) != 0) { - a0->unk144 = (void(*)(s800A5AC0*, UNK_TYPE))func_800A5C28; //! Is this cast correct? + a0->unk144 = (void(*)(s800A5AC0*, UNK_TYPE))EnAObj_Update2; //! Is this cast correct? } else { v0 = a0->unk92 - a0->unkBE; v1 = (v0 < 0)? -v0 : v0; @@ -36,18 +36,18 @@ UNK_RET func_800A5B98(s800A5AC0* a0, UNK_TYPE a1) { } } -UNK_RET func_800A5C28(s800A5AC0* a0) { +UNK_RET EnAObj_Update2(s800A5AC0* a0) { if (func_800B867C(a0) != 0) { - a0->unk144 = func_800A5B98; + a0->unk144 = EnAObj_Update1; } } -UNK_RET func_800A5C60(s800A5AC0* a0, UNK_TYPE a1) { +UNK_RET EnAObj_Main(s800A5AC0* a0, UNK_TYPE a1) { (a0->unk144)(a0, a1); func_800B675C(a0, 0x42340000); - func_800E2928(a1, a1 + 0x18884, &a0->unk148); + Collision_AddOT(a1, a1 + 0x18884, &a0->unk148); } -UNK_RET func_800A5CB8(s800A5AC0* a0, UNK_TYPE a1) { +UNK_RET EnAObj_Draw(s800A5AC0* a0, UNK_TYPE a1) { func_800BDFC0(a1, D_801ADEB0[a0->unk1C], a1, a0); } |
