From 87c30f66d2da533d524d67e45c775404f385fba0 Mon Sep 17 00:00:00 2001
From: emilybrooks <emilybrooksemilybrooks@gmail.com>
Date: Sat, 16 Mar 2024 08:09:26 -0700
Subject: 1/2 of structure objects extracted (#156)

* house2

* split yamishop

* split douzou

* split kago

* split dump

* split uranai

* split house

* fixed names

* obj_s_house3

* forgot

* obj_s_house4

* house5

* started winter houses

* w house3

* w_house4

* w_house5

* myhome2

* s myhome done

* w_myhome1

* freedom

* kouban

* small fixes
---
 src/objects/object_00DF4000/object_00DF4000.c | 39 +++++++++++++--------------
 1 file changed, 19 insertions(+), 20 deletions(-)

(limited to 'src/objects/object_00DF4000')

diff --git a/src/objects/object_00DF4000/object_00DF4000.c b/src/objects/object_00DF4000/object_00DF4000.c
index 1ca3564..593ff35 100644
--- a/src/objects/object_00DF4000/object_00DF4000.c
+++ b/src/objects/object_00DF4000/object_00DF4000.c
@@ -1,17 +1,16 @@
-#include "unk.h"
-#include "objects/object_00D5E000/obj_yamishop/obj_yamishop.h"
+#include "ultratypes.h"
 
-UNK_TYPE4 padDF4000[] = { 0x00000000, 0x00000000 };
+s32 padDF4000[] = { 0x00000000, 0x00000000 };
 
 u32 StructureObjectAddresses[] = {
     0x06023BB0, // obj_s_house1
-    0x06026388, //
-    0x06028B18, //
-    0x0602B208, //
-    0x0602D838, //
-    0x0603C710, //
-    0x0603EEE0, //
-    0x060417D0, //
+    0x06026388, // obj_s_house2
+    0x06028B18, // obj_s_house3
+    0x0602B208, // obj_s_house4
+    0x0602D838, // obj_s_house5
+    0x0603C710, // obj_s_myhome1
+    0x0603EEE0, // obj_s_myhome2
+    0x060417D0, // obj_s_myhome3
     0x060583F0, //
     0x0605C470, //
     0x06060E38, //
@@ -22,7 +21,7 @@ u32 StructureObjectAddresses[] = {
     0x06078D48, //
     0x06080A90, //
     0x060834C0, //
-    0x0604BC80, //
+    0x0604BC80, // obj_s_kouban
     0x06012AD0, //
     0x06013A60, //
     0x060556A0, //
@@ -96,14 +95,14 @@ u32 StructureObjectAddresses[] = {
     0x06021ED8, //
     0x0600D178, //
     0x0607EE80, //
-    0x06030140, //
-    0x06032910, //
-    0x060350A0, //
-    0x06037790, //
-    0x06039E00, //
-    0x060441E8, //
-    0x060469B8, //
-    0x06049268, //
+    0x06030140, // obj_w_house1
+    0x06032910, // obj_w_house2
+    0x060350A0, // obj_w_house3
+    0x06037790, // obj_w_house4
+    0x06039E00, // obj_w_house5
+    0x060441E8, // obj_w_myhome1
+    0x060469B8, // obj_w_myhome2
+    0x06049268, // obj_w_myhome3
     0x0605A430, //
     0x0605E958, //
     0x060633E8, //
@@ -114,7 +113,7 @@ u32 StructureObjectAddresses[] = {
     0x0607AFB8, //
     0x06080A90, //
     0x060834C0, //
-    0x0604DD80, //
+    0x0604DD80, // obj_w_kouban
     0x06012AD0, //
     0x06013A60, //
     0x06055C10, //
-- 
cgit v1.2.3