diff --git a/config/GAFE01_00/config.yml b/config/GAFE01_00/config.yml index 2091990f..a2a068d2 100644 --- a/config/GAFE01_00/config.yml +++ b/config/GAFE01_00/config.yml @@ -25371,3 +25371,8 @@ modules: binary: assets/act_ant_v.bin header: assets/act_ant_v.inc custom_type: vtx + + - symbol: glider_v + binary: assets/glider_v.bin + header: assets/glider_v.inc + custom_type: vtx \ No newline at end of file diff --git a/config/GAFE01_00/foresta/splits.txt b/config/GAFE01_00/foresta/splits.txt index fcd53195..a163baee 100644 --- a/config/GAFE01_00/foresta/splits.txt +++ b/config/GAFE01_00/foresta/splits.txt @@ -3627,7 +3627,7 @@ f_furniture.c: .rodata start:0x0000C100 end:0x0000C28C .data start:0x00087840 end:0x00092DA0 -data/dataobject/dataobject_92DA0: +data/model/glider.c: .data start:0x00092DA0 end:0x00092EA0 data/npc/model/mdl/bev_1.c: @@ -3636,10 +3636,10 @@ data/npc/model/mdl/bev_1.c: data/npc/model/tex/bev_1.c: .data start:0x000952E0 end:0x00096000 -data/npc/model/mdl/act_ant.c: +data/model/act_ant.c: .data start:0x00096000 end:0x00096328 -data/npc/model/mdl/act_ant_anim.c: +data/model/act_ant_anim.c: .data start:0x00096328 end:0x00096338 data/npc/model/mdl/ant_1.c: diff --git a/configure.py b/configure.py index 2e988c87..db72679f 100644 --- a/configure.py +++ b/configure.py @@ -2631,8 +2631,9 @@ config.libs = [ Object(Matching, "data/field/mvactor/tent.c"), Object(Matching, "data/field/mvactor/title_demo.c"), Object(Matching, "data/field/mvactor/water_test.c"), - Object(Matching, "data/npc/model/mdl/act_ant.c"), - Object(Matching, "data/npc/model/mdl/act_ant_anim.c"), + Object(Matching, "data/model/act_ant.c"), + Object(Matching, "data/model/act_ant_anim.c"), + Object(Matching, "data/model/glider.c"), ], ), ] diff --git a/src/data/npc/model/mdl/act_ant.c b/src/data/model/act_ant.c similarity index 100% rename from src/data/npc/model/mdl/act_ant.c rename to src/data/model/act_ant.c diff --git a/src/data/npc/model/mdl/act_ant_anim.c b/src/data/model/act_ant_anim.c similarity index 100% rename from src/data/npc/model/mdl/act_ant_anim.c rename to src/data/model/act_ant_anim.c diff --git a/src/data/model/glider.c b/src/data/model/glider.c new file mode 100644 index 00000000..43af819a --- /dev/null +++ b/src/data/model/glider.c @@ -0,0 +1,21 @@ +#include "libforest/gbi_extensions.h" +#include "PR/gbi.h" +#include "evw_anime.h" + +Vtx glider_v[] = { +#include "assets/glider_v.inc" +}; + +Gfx glider_model[] = { + gsSPTexture(65535, 65535, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_OPA_SURF2), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, 1, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetPrimColor(0, 128, 255, 255, 255, 255), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPVertex(glider_v, 11, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(6, 7, 8, 0, 4, 9, 10, 0), + gsSPEndDisplayList(), + +};