diff options
| author | rozlette <uberpanzermensch@gmail.com> | 2019-12-14 23:38:35 -0600 |
|---|---|---|
| committer | rozlette <uberpanzermensch@gmail.com> | 2019-12-14 23:38:35 -0600 |
| commit | 9bc4990814d2e953df294bc57f7bca1918bd3bac (patch) | |
| tree | 9f0ea9c0964956d25056bda289b13fa8c00f1128 /src/code/code_0x800A5AC0.c | |
| parent | d6f9c091cc3bec8425e9bcf93ce39f1d9b733c94 (diff) | |
Update to latest from ghidra project
Diffstat (limited to 'src/code/code_0x800A5AC0.c')
| -rw-r--r-- | src/code/code_0x800A5AC0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/code_0x800A5AC0.c b/src/code/code_0x800A5AC0.c index 6093f412f..ae76b71d9 100644 --- a/src/code/code_0x800A5AC0.c +++ b/src/code/code_0x800A5AC0.c @@ -10,7 +10,7 @@ UNK_RET EnAObj_Init(ActorEnAObj* a0, GlobalContext* a1) { s0->base.textId = ((s0->base.variable >> 8) & 0xFF) | 0x300; s0->base.variable = (s0->base.variable & 0xFF) - 9; Lib_ApplyActorInitVars((Actor*)s0, (ActorInitVar*)&enAObjInitVar); - func_800B3BA4(&s0->base.unkBC, 0, (UNK_PTR)&func_800B3FC0, 12); + Actor_SetPostDrawParams(&s0->base.postDrawParams, 0, (actor_post_draw_func*)func_800B3FC0, 12); Collision_InitCylinder(a1, &s0->collision, (Actor*)s0, &enAObjCylinderInit); Collision_CylinderMoveToActor((Actor*)s0, &s0->collision); s0->base.unkA0.unk16 = 255; @@ -28,7 +28,7 @@ UNK_RET EnAObj_Update1(ActorEnAObj* a0, GlobalContext* a1) { if (func_800B84D0((Actor*)a0, a1) != 0) { a0->update = (actor_func)EnAObj_Update2; } else { - v0 = a0->base.unk92 - a0->base.unkBC.rotation.y; + v0 = a0->base.unk92 - a0->base.postDrawParams.rotation.y; v1 = (v0 < 0)? -v0 : v0; if ((v1 < 10240) || ((a0->base.variable == 1) && (v1 > 22528))) { func_800B863C((Actor*)a0, a1); @@ -49,5 +49,5 @@ UNK_RET EnAObj_Main(ActorEnAObj* a0, GlobalContext* a1) { } UNK_RET EnAObj_Draw(ActorEnAObj* a0, GlobalContext* a1) { - func_800BDFC0(a1, D_801ADEB0[a0->base.variable]); + func_800BDFC0(a1, enAObjDisplayLists[a0->base.variable]); } |