From d2716fefca1dfe18f65e6de2de35616a36b571a2 Mon Sep 17 00:00:00 2001
From: gijs <ogre@noest.dev>
Date: Mon, 25 Sep 2023 13:57:04 +0200
Subject: [PATCH] Migrated Gfx at 0x8018FA70

---
 splat.yaml                  | 12 ++++++------
 src/gfx/ob_peaceful_screw.c | 21 +++++++++++++++++++++
 symbol_addrs.txt            |  9 ++++++++-
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 src/gfx/ob_peaceful_screw.c

diff --git a/splat.yaml b/splat.yaml
index 35a4ddb..76ad201 100644
--- a/splat.yaml
+++ b/splat.yaml
@@ -416,8 +416,8 @@ segments:
       - [0x5CF20, data]
       - [0x5CF30, data]
       - [0x5D560, data]
-      - [0x613B0, data]
-      - [0x647F0, data, "segment_obdata/ob_hard_hands"]
+      - [0x613B0, data, "data/item"]
+      - [0x647F0, data]
       - [0x650A0, data]
       - [0x650B0, data]
       - [0x65220, data]
@@ -425,13 +425,13 @@ segments:
       - [0x65260, data]
       - [0x65280, data]
       - [0x652A0, data]
-      - [0x65970, data]
+      - [0x65970, .data, "gfx/ob_peaceful_screw"]
       - [0x659E0, data]
       - [0x65B00, data]
-      - [0x65B80, data]
-      - [0x65C10, data]
+      - [0x65B80, data, "gfx/ob_long_skirt"]
+      - [0x65C10, data, "gfx/ob_pointless_account"]
       - [0x65C50, data]
-      - [0x65CC0, data, "segment_obdata/ob_empty_quill"]
+      - [0x65CC0, data]
       
       - [0x65D60, rodata, "segment_obdata/ob_blushing_ship"]
       - [0x65DD0, rodata]
diff --git a/src/gfx/ob_peaceful_screw.c b/src/gfx/ob_peaceful_screw.c
new file mode 100644
index 0000000..b8371e6
--- /dev/null
+++ b/src/gfx/ob_peaceful_screw.c
@@ -0,0 +1,21 @@
+#include <ultra64.h>
+
+#include "common.h"
+
+/* 65970 8018FA70 */
+Gfx DISPLAY_LIST_8018FA70[] = {
+    gsDPPipeSync(),
+    gsDPPipeSync(),
+    gsDPSetCycleType(G_CYC_1CYCLE),
+    gsDPPipeSync(),
+    gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD | G_SHADING_SMOOTH | G_CLIPPING | 0x0040F9FA),
+    gsSPSetGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH),
+    gsDPSetRenderMode(G_RM_OPA_SURF, G_RM_OPA_SURF2),
+    gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA),
+    gsDPSetTexturePersp(G_TP_PERSP),
+    gsDPSetAlphaCompare(G_AC_NONE),
+    gsSPDisplayList(obDlSetupMinResolution),
+    gsSPTexture(qu016(0.5), qu016(0.5), 0, G_TX_RENDERTILE, G_ON),
+    gsDPPipeSync(),
+    gsSPEndDisplayList(),
+};
\ No newline at end of file
diff --git a/symbol_addrs.txt b/symbol_addrs.txt
index 2310aeb..9325234 100644
--- a/symbol_addrs.txt
+++ b/symbol_addrs.txt
@@ -1,11 +1,18 @@
 
+__OVERLAY_INFO_8018F330 = 0x8018F330; // size:0x14
+__OVERLAY_INFO_8018F344 = 0x8018F344; // size:0x14
+__OVERLAY_INFO_8018F330 = 0x8018F330; // size:0x14
+__OVERLAY_INFO_8018F344 = 0x8018F344; // size:0x14
+__OVERLAY_INFO_8018FC1C = 0x8018FC1C; // size:0x14
+__OVERLAY_INFO_8018F360 = 0x8018F360; // size:0x14
+__OVERLAY_INFO_8018F380 = 0x8018F380; // size:0x14 
 __OVERLAY_INFO_79730_65C50 = 0x8018FD50;
 
 __OVERLAY_INFO_87200_65C78 = 0x8018FD78;
 __OVERLAY_INFO_87200_65C64 = 0x8018FD64;
 __setup_overlay_87200 = 0x8017B6B0;
 
-__OVERLAY_INFO_71280_65CA0 = 0x8018FDA0;
+__OVERLAY_INFO_71280_65CA0 = 0x8018FDA0; // size:0x14
 __setup_overlay_71280_51940 = 0x8017BA40; // rom:0x51940
 
 __OVERLAY_INFO_71280_65C8C = 0x8018FD8C;