From aec46b902314d631c28cb917c58f2a9b71d7a140 Mon Sep 17 00:00:00 2001 From: gijs Date: Wed, 27 Sep 2023 01:34:06 +0200 Subject: [PATCH] Migrated gfx from `14E530` --- linker_scripts/symbols/addr.txt | 4 ++- splat.yaml | 3 +- src/gfx/_ob_disastrous_knot.c | 55 +++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 src/gfx/_ob_disastrous_knot.c diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 4d87dd0..ea02f66 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -60,7 +60,9 @@ zero = 0x800AE9D0; // type:f32 dtor = 0x800AA730; // type:f32 xseed = 0x800AA740; // type:u32 -__MAYBE_VERTICES_801FD350 = 0x801FD350; // rom:0x14E530 +VTX_801FD350 = 0x801FD350; // rom:0x14E530 +VTX_801FD390 = 0x801FD390; // rom:0x14E570 + __MAYBE_VERTICES_801FD558 = 0x801FD558; // rom:0x14E738 __MAYBE_VERTICES_801FD600 = 0x801FD600; // rom:0x14E7E0 __MAYBE_VERTICES_801FD790 = 0x801FD790; // rom:0x14E970 diff --git a/splat.yaml b/splat.yaml index 402936d..48bd618 100644 --- a/splat.yaml +++ b/splat.yaml @@ -701,7 +701,8 @@ segments: - [0x14DE90, data] - [0x14E3E0, .data, "vtx/_ob_abundant_frogs"] - - [0x14E530, data] + - [0x14E530, .data, "gfx/_ob_disastrous_knot"] + - [0x14E5E0, data] - [0x14EA70, .rodata, "overlay_145210/_ob_shivering_chalk"] - [0x14EAC0, .rodata, "overlay_145210/_ob_hypnotic_lamp"] diff --git a/src/gfx/_ob_disastrous_knot.c b/src/gfx/_ob_disastrous_knot.c new file mode 100644 index 0000000..47e1b97 --- /dev/null +++ b/src/gfx/_ob_disastrous_knot.c @@ -0,0 +1,55 @@ +#include "common.h" + +/* 14E530 801FD350 */ +u32 VTX_801FD350[] = { + 0xFFE80025, + 0x00000000, + 0x00000000, + 0x000000FF, + 0xFFE80011, + 0x00000000, + 0x000004C0, + 0x000000FF, + 0x00180011, + 0x00000000, + 0x0BC004C0, + 0x000000FF, + 0x00180025, + 0x00000000, + 0x0BC00000, + 0x000000FF +}; + +/* 14E570 801FD390 */ +u32 VTX_801FD390[] = { + 0xFFE80011, + 0x00000000, + 0x00000500, + 0x000000C0, + 0xFFE8FFFD, + 0x00000000, + 0x000009C0, + 0x00000000, + 0x0018FFFD, + 0x00000000, + 0x0BC009C0, + 0x00000000, + 0x00180011, + 0x00000000, + 0x0BC00500, + 0x000000C0 +}; + +/* 14E5B0 801FD3D0 */ +Gfx DISPLAY_LIST_801FD3D0[] = { + gsSPVertex(VTX_801FD350, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList() +}; + +/* 14E5C8 801FD3E8 */ +Gfx DISPLAY_LIST_801FD3E8[] = { + gsSPVertex(VTX_801FD390, 4, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSPEndDisplayList() +}; \ No newline at end of file