mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-12 13:34:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update to latest from ghidra project

Browse Source
This commit is contained in:
rozlette
2019-12-14 23:38:35 -06:00
parent d6f9c091cc
commit 9bc4990814
10 changed files with 1979 additions and 1757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_0x800A5AC0.c
+3 -3
View File
@@ -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]);
}