diff options
| author | Nuss <67802335+hack-nuss@users.noreply.github.com> | 2023-09-19 07:04:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-19 15:04:23 +1000 |
| commit | fa71fbeaab8631bcd2bfd8d68e1b73f1b4d1801e (patch) | |
| tree | 685b982e6dc559c826a761c22f112afd82aefb52 | |
| parent | df800c74aecfb6b89ee976df8a2f11451f295e37 (diff) | |
Stone Tower Smoke (#1382)
* funen xml
* description
* outname
| -rw-r--r-- | assets/xml/objects/object_funen.xml | 5 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/assets/xml/objects/object_funen.xml b/assets/xml/objects/object_funen.xml index 7a0410008..0f9d0a484 100644 --- a/assets/xml/objects/object_funen.xml +++ b/assets/xml/objects/object_funen.xml @@ -1,6 +1,7 @@ <Root> + <!-- Object for Stone Tower Smoke --> <File Name="object_funen" Segment="6"> - <DList Name="object_funen_DL_0000D0" Offset="0xD0" /> <!-- Original name is "obj_smork_modelT" --> - <Texture Name="object_funen_Tex_0001C0" OutName="tex_0001C0" Format="ia8" Width="32" Height="32" Offset="0x1C0" /> + <DList Name="gStoneTowerSmokeDL" Offset="0xD0" /> <!-- Original name is "obj_smork_modelT" --> + <Texture Name="gStoneTowerSmokeTex" OutName="stone_tower_smoke" Format="ia8" Width="32" Height="32" Offset="0x1C0" /> </File> </Root> diff --git a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c index 409cbd837..a75a43cda 100644 --- a/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c +++ b/src/overlays/actors/ovl_Obj_Funen/z_obj_funen.c @@ -43,6 +43,6 @@ void ObjFunen_Draw(Actor* thisx, PlayState* play) { gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(play->state.gfxCtx, 0, 0, temp, 0x20, 0x20, 1, 0, temp, 0x20, 0x20)); - gSPDisplayList(POLY_XLU_DISP++, object_funen_DL_0000D0); + gSPDisplayList(POLY_XLU_DISP++, gStoneTowerSmokeDL); CLOSE_DISPS(play->state.gfxCtx); } |