summaryrefslogtreecommitdiff
path: root/src/code/z_fireobj.c
diff options
context:
space:
mode:
authorIsghj <42048411+isghj5@users.noreply.github.com>2021-12-26 19:08:36 -0800
committerGitHub <noreply@github.com>2021-12-27 03:08:36 +0000
commitaf7525e2d363c8fa41e938c44433ff92cce89b9f (patch)
tree380397f678931ec14a16a28a5ef587786d970858 /src/code/z_fireobj.c
parentfdcf1d3fd33f12824e62835140185c4405fd2385 (diff)
[Object] Bigpo object documentation (+ some gameplay_keep) (#525)
* Bigpo: object documentation starts and already issues * Bigpo: almost all named * Bigpo: done with object except ubused blobs * Bigpo: added flame docs to gameplay_keep and minor cleaning, format pass * Bigpo: forgot to remove sym and replace everywhere, with formater pass * Bigpo: forgot about actorfixer * Bigpo: disasm cant find asset xml values, have to put this undefined sym back for now * Bigpo: warnings * Bigpo: remove extern for gameplay_keep display list reference from aqua * EnBigpo: suggested fixes to header calls and function name Co-authored-by: Isghj8 <isghj8@gmail.com> Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Diffstat (limited to 'src/code/z_fireobj.c')
-rw-r--r--src/code/z_fireobj.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/code/z_fireobj.c b/src/code/z_fireobj.c
index 6e543d115..7c5de646a 100644
--- a/src/code/z_fireobj.c
+++ b/src/code/z_fireobj.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
+#include "objects/gameplay_keep/gameplay_keep.h"
typedef enum {
FIRE_STATE_0,
@@ -162,7 +163,7 @@ void FireObj_Draw(GlobalContext* globalCtx, FireObj* fire) {
Matrix_Scale(fire->xScale, fire->yScale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
- gSPDisplayList(POLY_XLU_DISP++, D_0407D590);
+ gSPDisplayList(POLY_XLU_DISP++, gGameplayKeepDrawFlameDL);
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}