Various updates for classes, symbols, header files, etc

Author: Dogmander

configs/main.yaml

@@ -173,7 +173,7 @@ segments:
       #- [0x1900B0, cpp, text_0028F0B0]
       - [0x190150, cpp, text_0028F150]
       - [0x191F58, cpp, text_00290F58]
-      - [0x1975D0, cpp, text_002965D0]
+      - [0x1975D0, cpp, FGDK3/Code/Location]
       - [0x197670, cpp, FGDK3/Code/Playstation2/IOPMem]
       - [0x198578, cpp, text_00297578]
       - [0x1A2D88, cpp, text_002A1D88]
@@ -212,8 +212,7 @@ segments:
       - [0x20A778, cpp, text_00309778]
       - [0x20BC08, cpp, FGDK3/Code/StringUtils]
       - [0x20C698, cpp, FGDK3/Code/ShapeParams]
-      - [0x211BE8, cpp, text_00310BE8]
-      #- [0x211BE8, cpp, FGDK3/Code/FileSystem_Zip]
+      - [0x211BE8, cpp, FGDK3/Code/FileSystem_Zip]
       #- [cpp, FGDK3/Code/Playstation2/File_FileDescriptor]
       - [0x216F28, cpp, text_00315F28] # zlib functions
       # 0x216F28 inflate.c
@@ -345,7 +344,7 @@ segments:
       - [0x33C9E0, .rodata, FGDK3/Code/Playstation2/Sound]
       - [0x33CAD0, .rodata, FGDK3/Code/Playstation2/sifManager]
       - [0x33CBC0, .rodata, text_0026FFB8]
-      - [0x33CE40, .rodata, text_00271A20]
+      - [0x33CE40, .rodata, text_00271A20] # SavedGame
       #- [0x33CE68, .rodata, FGDK3/Code/Playstation2/RunPath]
       #- [0x33CEE0]
       - [0x33D280, .rodata, text_00275FF8]
@@ -358,7 +357,7 @@ segments:
       #- [0x33FA98, .rodata, text_0028F0B0]
       #-[0x33FA98, .rodata, FGDK3/Code/Playstation2/IOPMem]
       - [0x33FAF0, .rodata, text_00290F58]
-      - [0x33FC60, .rodata, text_002965D0]
+      - [0x33FC60, .rodata, FGDK3/Code/Location]
       - [0x33FC70, .rodata, FGDK3/Code/Playstation2/IOPMem]
       - [0x33FE30, .rodata, text_00297578]
       - [0x340250, .rodata, text_002A1D88]
@@ -406,8 +405,7 @@ segments:
       - [0x348CD0, .rodata, text_00309778]
       - [0x348CF8, .rodata, FGDK3/Code/StringUtils]
       - [0x348D20, .rodata, FGDK3/Code/ShapeParams]
-      #- [0x349040, .rodata, FGDK3/Code/FileSystem_Zip]
-      - [0x349040, .rodata, text_00310BE8]
+      - [0x349040, .rodata, FGDK3/Code/FileSystem_Zip]
       - [0x349540, .rodata, text_00315F28] # zlib stuff?
       - [0x349C08, .rodata, FGDK3/ResLibs/AnimRes/Code/AnimRes]
       - [0x349DF0, .rodata, FGDK3/ResLibs/ScriptRes/Code/ScriptThread]

configs/sym.txt

@@ -35,7 +35,7 @@
 TARGET_DIR   = "target"
 
 # Compilation Flags
-INCLUDE_PATHS        = "-Iinclude -I include/MultiStream -I include/ee_gcc -I include/ee -I include/ee_gcc/gcc-lib -I include/ee_gcc/machine -I include/ee_gcc/sys -I include/common -I include/Dogs -I include/FGDK3"
+INCLUDE_PATHS        = "-Iinclude -I include/MultiStream -I include/ee_gcc -I include/ee -I include/ee_gcc/gcc-lib -I include/ee_gcc/machine -I include/ee_gcc/sys -I include/common -I include/Dogs -I include/FGDK3 -I include/zlib-1.1.3"
 CC_DIR               = f"{TOOLS_DIR}/ee-gcc2.95.3"
 COMMON_COMPILE_FLAGS = f"-g0"
 COMPILER_FLAGS_C     = f"-x c {COMMON_COMPILE_FLAGS}"
@@ -67,7 +67,7 @@
     "src/FGDK3/Code/GameShell.cpp",
     "src/text_002FCF70.cpp",
     "src/text_00307D30.cpp",
-    "src/text_00310BE8.cpp"
+    "src/FGDK3/Code/FileSystem_Zip.cpp"
 ]
 
 UNCOMPATIBLE_SN_AS_SPLITS = [

configure.py

@@ -7,7 +7,7 @@
 class Button : public WorldObject {
     public:
         static ClassInfo* s_classInfo;
-        int unk5C0; // receiver actorId
+        int unk5C0; // button receiver actorId
         float unk5C4; // button hold time (seconds)?
 
         int unk5E0;

include/Dogs/Button.h

@@ -3,7 +3,7 @@
 
 #include "WorldObj.h"
 
-class Camera : public WorldObject {
+class Camera : public WorldObject/**/ {
     public:
         int unk5D0;
         Camera(ClassInfo*, SimObj_Universe*, int, short);

include/Dogs/Camera.h

@@ -115,7 +115,8 @@ class Console {
 };
 
 class ConsoleLayer /* : public Widget_Border, public InputBinding */ {
-
+	public:
+		float unk100; // cursor blink?
 };
 
 

include/Dogs/Console.h

@@ -7,7 +7,6 @@
 #include "FGDK3/RelRecv.h"
 
 
-
 extern void * const Creatres_StdInit_UsedModules[];
 
 Status Creatres_InternalInitialise();

include/Dogs/Creatres.h

@@ -3,9 +3,17 @@
 
 #include "WorldObj.h"
 
-class Dog : public WorldObject {
+// in JumpIF.h?
+class Jump_IF /* public Interface<Jump_IF> */{
+
+};
+class Dog : public WorldObject/*, public Jump_IF, public AnimationMovedObject_IF*/ {
     public:
         static ClassInfo* s_classInfo;
+        float unk5E0; // hitcheck radius
+        float unk5E4;
+        bool unk644; // jumping
+        float unk678;
         float unk684;
         /* 0x830 */ bool m_isSwimming;
         float unk838; // sink/swim (mass?)
@@ -22,7 +30,8 @@ class Dog : public WorldObject {
         // 0x86C float boneScale
         // 0x870 float boneRotation
 
-        union {int i;float f;} unkB0C; // shinyness?
+        union {int i;float f;} unkB0C; // shinyness/wetness? (set to 0 when entering water, increases when out of water)
+        float unkB10; // time in water? (-1 when out of water)
         Dog(ClassInfo*, SimObj_Universe*, int, short);
         virtual ~Dog();
         virtual ClassInfo* func_0013A200();
@@ -35,10 +44,12 @@ class Dog : public WorldObject {
         //? 00188408
         //0012e998
         //0012e9c8
-        virtual float func_0012E240(void);
+        // virtual ? func_0012E050
+        virtual float func_0012E240();
 
         virtual bool GetSwimmingState();
         virtual int func_001365B0();
+        virtual void func_001365C8(float);
         //func_0021f3d8
         //? 0021f488
         //? 0021f548
@@ -51,6 +62,19 @@ class DogHitPrimReceiver : public SimObj_HitReceiver {
         virtual ~DogHitPrimReceiver();
 };
 
+
+class DogPushOffHitPrimReceiver /* : public SimObj_HitReceiver, public SimObj_HitPrimReceiver */ {
+
+};
+
+class DogAntiSnagHitReceiver /* : public SimObj_HitReceiver */ {
+
+};
+
+class DogSphereObjHitReceiver /* : public SimObj_HitReceiver */ {
+
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/Dogs/Dog.h

@@ -2,8 +2,9 @@
 #define ELEMENT3D_H
 
 #include "unk.h"
+#include "SimObj.h"
 
-class Element3D : public ShapeInstance {
+class Element3D : public ShapeInstance, public GenericObject/*, public Location_IF, public BoneManagerProvider_IF, public AnimPosProvider_IF, public AnimVarProvider_IF*/  {
     public:
         /* 0x108 */ short m_shapeId;
         Element3D(ClassInfo*, short);

include/Dogs/Element3D.h

@@ -3,6 +3,10 @@
 
 #include "WorldObj.h"
 
+class StaticFootPrint /*: public SimObject */ {
+    public:
+        int unk11C;
+};
 
 class FootPrints : public WorldObject {
     public: