Removed code files for Windy Valley objects and added them to objdefs…

….ini instead.
X-Hax · Mar 16, 2015 · ef73334 · ef73334
1 parent 9bf7731
commit ef73334
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 414 deletions.
diff --git a/Configuration/SADXPC/objdefs.ini b/Configuration/SADXPC/objdefs.ini
@@ -929,9 +929,12 @@ ZScl=1
 Draw=Model,exe,823384,OBJ_WINDY,XPos,YPos,ZPos,XRot,YRot,ZRot,1,1,1
 
 [004E2BC0]
-Name=O TREEM
-codefile=objdefs/Windy Valley/O_TREEM.cs
-codetype=SADXObjectDefinitions.Windy_Valley.O_TREEM
+Name=O_TREEM
+Model=Objects/Levels/Windy Valley/O_TREEM.sa1mdl
+Texture=OBJ_WINDY
+XScl=1
+YScl=1
+ZScl=1
 
 [004E1460]
 Name=O SAKUC
@@ -964,12 +967,20 @@ Name=O TURIBR2
 Name=O BROCU
 
 [004E2040]
-codefile=objdefs/Windy Valley/O_ISHIA.cs
-codetype=SADXObjectDefinitions.Windy_Valley.O_ISHIA
+Name=O_ISHIA
+Model=Objects/Levels/Windy Valley/O_ISHIA.sa1mdl
+Texture=OBJ_WINDY
+XScl=1
+YScl=1
+ZScl=1
 
 [004E2080]
-codefile=objdefs/Windy Valley/O_ISHIB.cs
-codetype=SADXObjectDefinitions.Windy_Valley.O_ISHIB
+Name=O_ISHIB
+Model=Objects/Levels/Windy Valley/O_ISHIB.sa1mdl
+Texture=OBJ_WINDY
+XScl=1
+YScl=1
+ZScl=1
 
 [004DFEF0]
 Name=O HANAA
@@ -981,8 +992,12 @@ Name=O HANAB
 Name=O GATE
 
 [004E1D80]
-codefile=objdefs/Windy Valley/O_GRASS.cs
-codetype=SADXObjectDefinitions.Windy_Valley.O_GRASS
+Name=O_GRASS
+Model=Objects/Levels/Windy Valley/O_GRASS.sa1mdl
+Texture=OBJ_WINDY
+XScl=1
+YScl=1
+ZScl=1
 
 [004E1CB0]
 Name=O TATES
@@ -991,12 +1006,20 @@ Name=O TATES
 Name=O TATEL
 
 [004E14A0]
-codefile=objdefs/Windy Valley/O_HANEA.cs
-codetype=SADXObjectDefinitions.Windy_Valley.O_HANEA
+Name=O_HANEA
+Model=Objects/Levels/Windy Valley/O_HANEA.sa1mdl
+Texture=OBJ_WINDY
+XScl=1
+YScl=1
+ZScl=1
 
 [004E14E0]
-codefile=objdefs/Windy Valley/O_HANEB.cs
-codetype=SADXObjectDefinitions.Windy_Valley.O_HANEB
+Name=O_HANEB
+Model=Objects/Levels/Windy Valley/O_HANEB.sa1mdl
+Texture=OBJ_WINDY
+XScl=1
+YScl=1
+ZScl=1
 
 [004E0FC0]
 Name=O E102BR
@@ -1008,8 +1031,12 @@ Name=O KAZAMI
 Name=O BALL
 
 [004E1520]
-codefile=objdefs/Windy Valley/O_BIGFLO.cs
-codetype=SADXObjectDefinitions.Windy_Valley.O_BIGFLO
+Name=O_BIGFLO
+Model=Objects/Levels/Windy Valley/O_BIGFLO.sa1mdl
+Texture=OBJ_WINDY
+XScl=1
+YScl=1
+ZScl=1
 
 [004E0A40]
 Name=O STBRID

diff --git a/SADXObjectDefinitions/SADXObjectDefinitions.csproj b/SADXObjectDefinitions/SADXObjectDefinitions.csproj
@@ -66,13 +66,6 @@
     <Compile Include="Level Effects\WindyValley2.cs" />
     <Compile Include="Level Effects\WindyValley3.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Windy Valley\O_BIGFLO.cs" />
-    <Compile Include="Windy Valley\O_GRASS.cs" />
-    <Compile Include="Windy Valley\O_HANEA.cs" />
-    <Compile Include="Windy Valley\O_HANEB.cs" />
-    <Compile Include="Windy Valley\O_ISHIA.cs" />
-    <Compile Include="Windy Valley\O_ISHIB.cs" />
-    <Compile Include="Windy Valley\O_TREEM.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

diff --git a/SADXObjectDefinitions/Windy Valley/O_BIGFLO.cs b/SADXObjectDefinitions/Windy Valley/O_BIGFLO.cs
diff --git a/SADXObjectDefinitions/Windy Valley/O_GRASS.cs b/SADXObjectDefinitions/Windy Valley/O_GRASS.cs
diff --git a/SADXObjectDefinitions/Windy Valley/O_HANEA.cs b/SADXObjectDefinitions/Windy Valley/O_HANEA.cs
diff --git a/SADXObjectDefinitions/Windy Valley/O_HANEB.cs b/SADXObjectDefinitions/Windy Valley/O_HANEB.cs
diff --git a/SADXObjectDefinitions/Windy Valley/O_ISHIA.cs b/SADXObjectDefinitions/Windy Valley/O_ISHIA.cs