Merge pull request #14 from SM64-STROOP/Development

Release 0.2.8
SM64-TAS-ABC · Feb 25, 2017 · bd25e29 · bd25e29
2 parents 1887f56 + 7797117
commit bd25e29
Show file tree

Hide file tree

Showing 175 changed files with 4,341 additions and 1,794 deletions.
diff --git a/README.md b/README.md
@@ -1,9 +1,9 @@
 # STROOP
 *SuperMario64 Technical Run-time Observer and Object Processor*
 
-  STROOP is a overly complicated diagnostic tool for Super Mario 64 which allows for complicated mario bullsh*t and manipulation. 
+  STROOP is a overly complicated diagnostic tool for Super Mario 64 which allows for complicated mario stuff and manipulation. 
 
-  *...I'll rewrite this description later - Dane*
+  *(...I'll rewrite this description later - Dane)*
 
        
 ## Downloading Stroop
@@ -28,6 +28,6 @@ The latest release of Stroop can be downloaded from our [Releases Page](https://
 
 Requirements:
   * Visual Studio *(2015 recommended)*
-  * OpenTK 1.1 *(Version 1.1.1589.5941 used, others may work)*
+  * OpenTK 1.1 *(Version 1.1.1589.5942 used, others may work)*
 
 Before building Stroop, OpenTK is a prerequisite. This is easiest installed by using the NuGet package manager. Stroop can be easily build from the source code by opening up the solution file in Visual Studio and performing a build. 
diff --git a/Source/SM64 Diagnostic/Config/CameraData.xml b/Source/SM64 Diagnostic/Config/CameraData.xml
@@ -26,4 +26,5 @@
   <Data type="short" address="0xc28168" absoluteAddress="true">Pitch Shake</Data>
   <Data type="short" address="0xc2816c" absoluteAddress="true">Roll Shake</Data>
   <Data type="short" address="0xc28156" absoluteAddress="true">Camera Mode</Data>
+  <Data type="uint" address="0x00C199B0" absoluteAddress="true" useHex="true" isObject="true">Secondary Object</Data>
 </CameraData>
diff --git a/Source/SM64 Diagnostic/Config/Config.xml b/Source/SM64 Diagnostic/Config/Config.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Config>
-  <RefreshRateFreq>60</RefreshRateFreq>
-  <RAMStartAddress>0x008eba80</RAMStartAddress>
-  <ProcessDefaultName>Mupen</ProcessDefaultName>
-  <RAMSize>0x400000</RAMSize>
+  <Emulators>
+    <Emulator name="Mupen 5.0 RR" processName="mupen64-rerecording" ramStart="0x008EBA80"/>
+    <Emulator name="Nemu64 0.8" processName="Nemu64" ramStart="0x10020000"/>
+  </Emulators>
+  <RefreshRateFreq>30</RefreshRateFreq>
+  <RamSize>0x400000</RamSize>
   <ObjectSlots>
     <FirstObjectAddress>0x8033D488</FirstObjectAddress>
     <ObjectStructSize>0x0260</ObjectStructSize>
@@ -32,22 +34,23 @@
     <FirstObjectGroupingAddress>0x8033CBE0</FirstObjectGroupingAddress>
     <ProcessGroupStructSize>0x68</ProcessGroupStructSize>
     <ProcessGroupsOrdering>
-      <Group index ="0x0B" color="#ff00a5"/>
-      <Group index ="0x09" color="#ff0000"/>
-      <Group index ="0x0A" color="#ff5400"/>
-      <Group index ="0x00" color="#ffa100"/>
-      <Group index ="0x05" color="#fff600"/>
-      <Group index ="0x04" color="#10ff00"/>
-      <Group index ="0x02" color="#00ffe9"/>
-      <Group index ="0x06" color="#0015ff"/>
-      <Group index ="0x08" color="#8000ff"/>
-      <Group index ="0x0C" color="#ff00ff"/>
+      <Group index ="0x0B" color="#FF00A5"/>
+      <Group index ="0x09" color="#FF0000"/>
+      <Group index ="0x0A" color="#FF5400"/>
+      <Group index ="0x00" color="#FFA100"/>
+      <Group index ="0x05" color="#FFF600"/>
+      <Group index ="0x04" color="#10FF00"/>
+      <Group index ="0x02" color="#00FFE9"/>
+      <Group index ="0x06" color="#0015FF"/>
+      <Group index ="0x08" color="#8000FF"/>
+      <Group index ="0x0C" color="#FF00FF"/>
     </ProcessGroupsOrdering>
-    <VacantPointerAddress color="#aaaaaa">0x80361150</VacantPointerAddress>
+    <VacantPointerAddress color="#AAAAAA">0x80361150</VacantPointerAddress>
   </ObjectGroups>
   <Mario>
-    <MarioStructAddress>0x8033b170</MarioStructAddress>
+    <MarioStructAddress>0x8033B170</MarioStructAddress>
     <ActionOffset>0x0C</ActionOffset>
+    <PrevActionOffset>0x10</PrevActionOffset>
     <CoordinateOffsetX>0x3C</CoordinateOffsetX>
     <CoordinateOffsetY>0x40</CoordinateOffsetY>
     <CoordinateOffsetZ>0x44</CoordinateOffsetZ>
@@ -67,23 +70,26 @@
     <SlidingSpeedXOffset>0x58</SlidingSpeedXOffset>
     <SlidingSpeedZOffset>0x5C</SlidingSpeedZOffset>
     <PeakHeightOffset>0xBC</PeakHeightOffset>
+    <ObjectReferenceAddress>0x80361158</ObjectReferenceAddress>
   </Mario>
   <Hud>
-    <HpAddress>0x8033b21e</HpAddress>
-    <LiveCountAddress>0x8033b21c</LiveCountAddress>
-    <CoinCountAddress>0x8033b218</CoinCountAddress>
-    <StarCountAddress>0x8033b21a</StarCountAddress>
-    <DisplayLiveCountAddress>0x8033b260</DisplayLiveCountAddress>
-    <DisplayCoinCountAddress>0x8033b262</DisplayCoinCountAddress>
-    <DisplayStarCountAddress>0x8033b268</DisplayStarCountAddress>
+    <HpAddress>0x8033B21e</HpAddress>
+    <LiveCountAddress>0x8033B21D</LiveCountAddress>
+    <CoinCountAddress>0x8033B218</CoinCountAddress>
+    <StarCountAddress>0x8033B21A</StarCountAddress>
+    <DisplayHpAddress>0x8033B266</DisplayHpAddress>
+    <DisplayLiveCountAddress>0x8033B260</DisplayLiveCountAddress>
+    <DisplayCoinCountAddress>0x8033B262</DisplayCoinCountAddress>
+    <DisplayStarCountAddress>0x8033B264</DisplayStarCountAddress>
     <FullHp>2176</FullHp>
+    <FullHpInt>8</FullHpInt>
     <StandardLives>4</StandardLives>
     <StandardCoins>0</StandardCoins>
     <StandardStars>120</StandardStars>
   </Hud>
   <Debug>
-    <ToggleAddress>0x8033d263</ToggleAddress>
-    <SettingAddress>0x80330e94</SettingAddress>
+    <ToggleAddress>0x8033D263</ToggleAddress>
+    <SettingAddress>0x80330E94</SettingAddress>
   </Debug>
   <TriangleOffsets>
     <surfaceType>0x00</surfaceType>
@@ -110,16 +116,16 @@
   <HolpX>0x8033B3C8</HolpX>
   <HolpY>0x8033B3CC</HolpY>
   <HolpZ>0x8033B3D0</HolpZ>
-  <CameraX>0x8033c6a4</CameraX>
-  <CameraY>0x8033c6a8</CameraY>
-  <CameraZ>0x8033c6aC</CameraZ>
-  <CameraRot>0x8033c6e4</CameraRot>
+  <CameraX>0x8033C6A4</CameraX>
+  <CameraY>0x8033C6A8</CameraY>
+  <CameraZ>0x8033C6AC</CameraZ>
+  <CameraRot>0x8033C6E4</CameraRot>
   <LevelAddress>0x8033B249</LevelAddress>
   <AreaAddress>0x8033B24A</AreaAddress>
   <LoadingPointAddress>0x8033BACA</LoadingPointAddress>
   <MissionLayoutAddress>0x8033BAC8</MissionLayoutAddress>
   <RngAddress>0x8038EEE0</RngAddress>
-  <RngRecordingAreaAddress>0x803e0000</RngRecordingAreaAddress>
+  <RngRecordingAreaAddress>0x803E0000</RngRecordingAreaAddress>
   <DebugAddress></DebugAddress>
   <DebugModeAddress></DebugModeAddress>
 </Config>
diff --git a/Source/SM64 Diagnostic/Config/Hacks.xml b/Source/SM64 Diagnostic/Config/Hacks.xml
@@ -3,6 +3,7 @@
   <Config>
     <HackDirectory>Resources\Hacks\</HackDirectory>
   </Config>
+  <SpawnHack path="SpawnHack.hck" behavior="0x8033D3D0" gfxId="0x8033D3D4" extra="0x8033D3D8"/>
   <Hack name="Pu Visibility (by Peter Fedak)" path="PuVisible.hck" />
   <Hack name="Camera 45 Degrees" path="Camera45Hack.hck" />
 </Hacks>