summaryrefslogtreecommitdiff
path: root/src/code/z_actor.c
diff options
context:
space:
mode:
authorRoman971 <romanlasnier@hotmail.com>2020-03-18 01:09:21 +0100
committerRoman971 <romanlasnier@hotmail.com>2020-03-18 01:09:31 +0100
commit76eb52ab5277ad69cd0908f8492483ef5881ee75 (patch)
tree3368f674fd32ec864c8d167ee3c86b25bcb8b5f7 /src/code/z_actor.c
parent2c7a339a81ddb3698bac0a3bb4238dd3e65d34ce (diff)
Various fixes/matches
- Matched all remaining functions in `__osMalloc.c`, 2 functions in `code_8007BF90.c`, 1 in `code_800A9F30.c`, 2 in `fault.c`, 1 in `fault_drawer.c`, 1 in `gfxprint.c`, 2 in `z_camera.c` - Improved most other remaining non matchings to ensure they are actually equivalent and to get them closer to matching - Added a `alloc.h` header file in the process of working on `fault.c` non matchings - Decompiled `padmgr.c` data/bss in order to improve padmgr non matchings - Removed unused `z_en_wallmas.c` data files - Moved functions confirmed to be in `z_cheap_proc.c` to their own file with that name
Diffstat (limited to 'src/code/z_actor.c')
-rw-r--r--src/code/z_actor.c32
1 files changed, 2 insertions, 30 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 3b6698c30..71bba11f2 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -4332,7 +4332,7 @@ s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3)
if (arg3 < var)
{
- actor->flags &= ~0x1;
+ actor->flags &= ~1;
Math_SmoothScaleMaxMinS(&arg2, 0, 6, 0x14, 1);
}
else
@@ -4426,35 +4426,7 @@ s32 func_80035124(Actor* actor, GlobalContext* globalCtx)
return ret;
}
-/* z_cheap_proc.c */
-
-void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist)
-{
- GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
- Gfx* gfxArr[4];
-
- func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214);
-
- func_80093D18(globalCtx->state.gfxCtx);
- gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 216), G_MTX_MODELVIEW | G_MTX_LOAD);
- gSPDisplayList(gfxCtx->polyOpa.p++, dlist);
-
- func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219);
-}
-
-void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist)
-{
- GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
- Gfx* gfxArr[4];
-
- func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228);
-
- func_80093D84(globalCtx->state.gfxCtx);
- gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 230), G_MTX_MODELVIEW | G_MTX_LOAD);
- gSPDisplayList(gfxCtx->polyXlu.p++, dlist);
-
- func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233);
-}
+#include "z_cheap_proc.c"
u8 func_800353E8(GlobalContext* globalCtx)
{