diff options
| author | krimtonz <33664508+krimtonz@users.noreply.github.com> | 2020-06-25 09:03:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 10:03:40 -0400 |
| commit | a316f8d88d1d00bdb27c57080249c0f1dcc1f815 (patch) | |
| tree | 02d551772ed8d15f933a9b76866bf0bb32102cef /src/code | |
| parent | 13117fd8376452a9c9d3b8e0b4864e5fdd6ded73 (diff) | |
match func_80034B54 (#227)
* match func_80034B54
* remove asm
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index cf79d5efc..85ab507f0 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -3824,26 +3824,20 @@ Gfx* func_80034B28(GraphicsContext* gfxCtx) { return displayList; } -#ifdef NON_MATCHING -// doesn't generate the 2 useless move instructions before returning Gfx* func_80034B54(GraphicsContext* gfxCtx) { - Gfx* displayList; Gfx* displayListHead; + Gfx* displayList; - displayList = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); - displayListHead = displayList; + displayList = displayListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); - gSPEndDisplayList(displayListHead); + gSPEndDisplayList(displayListHead++); return displayList; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_80034B54.s") -#endif void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw2 overrideLimbDraw, PostLimbDraw2 postLimbDraw, Actor* actor, s16 alpha) { |