Add split for text_00272F50, text_00296818

Author: Dogmander

configs/main.yaml

@@ -162,6 +162,7 @@ segments:
       - [0x170BA0, cpp, FGDK3/Code/Playstation2/sifManager]
       - [0x170FB8, cpp, text_0026FFB8] # shape.cpp?
       - [0x172A20, cpp, text_00271A20]
+      - [0x173F50, cpp, text_00272F50] # beginning of RunPath.cpp?
       - [0x176FF8, cpp, text_00275FF8]
       - [0x1785D0, cpp, text_002775D0] # beginning of RelRecv.cpp?
       - [0x17A880, cpp, FGDK3/Code/NavGraphRes] # navgraph functions
@@ -175,6 +176,7 @@ segments:
       - [0x191F58, cpp, text_00290F58]
       - [0x1975D0, cpp, FGDK3/Code/Location]
       - [0x197670, cpp, FGDK3/Code/Playstation2/IOPMem]
+      - [0x197818, cpp, text_00296818]
       - [0x198578, cpp, text_00297578]
       - [0x1A2D88, cpp, text_002A1D88]
       - [0x1A59A0, cpp, FGDK3/Code/Playstation2/GE_RenderHardware]
@@ -347,6 +349,7 @@ segments:
       - [0x33CAD0, .rodata, FGDK3/Code/Playstation2/sifManager]
       - [0x33CBC0, .rodata, text_0026FFB8]
       - [0x33CE40, .rodata, text_00271A20] # SavedGame
+      - [0x33CE68, .rodata, text_00272F50]
       #- [0x33CE68, .rodata, FGDK3/Code/Playstation2/RunPath]
       #- [0x33CEE0]
       - [0x33D280, .rodata, text_00275FF8]
@@ -361,6 +364,7 @@ segments:
       - [0x33FAF0, .rodata, text_00290F58]
       - [0x33FC60, .rodata, FGDK3/Code/Location]
       - [0x33FC70, .rodata, FGDK3/Code/Playstation2/IOPMem]
+      - [0x33FCB8, .rodata, text_00296818]
       - [0x33FE30, .rodata, text_00297578]
       - [0x340250, .rodata, text_002A1D88]
       - [0x340320, .rodata, FGDK3/Code/Playstation2/GE_RenderHardware]

configs/sym.txt

@@ -1105,6 +1105,7 @@ __19Resource_LayoutUnitP19Resource_LayoutUnit = 0x00273D08; // type:func
 _$_19Resource_LayoutUnit = 0x00273D28; // type:func
 _$_22Resource_LayoutOverlay = 0x00273F68; // type:func
 func_00274200__22Resource_LayoutOverlay = 0x00274200; // type:func
+func_00274400__22Resource_LayoutOverlay = 0x00274400; // type:func
 _$_20Resource_LayoutGroup = 0x00274680; // type:func
 //func_00275288 = 0x00275288; // type:func
 
@@ -1187,6 +1188,7 @@ __tf12CreateAction = 0x00288440;
 __16MenuRegisterable = 0x002887E8; // type:func
 
 // MultiStream SDK
+SOUND_InitIOP = 0x00288B30; // type:func
 SOUND_StartCommand = 0x00288D60; // type:func
 SOUND_EndCommand = 0x00288DC0; // type:func
 SOUND_AddData = 0x00288F50; // type:func

include/Dogs/Console.h

@@ -5,23 +5,23 @@
 #include <stdarg.h>
 #include <eekernel.h>
 
-#include "Game.h"
+//
 
 typedef struct {
 	/* 0x120 */ int m_lines;
 	// 0x124 scroll
 	/* 0x13C */ bool m_textEnabled;
-} consoleStruct;
+} s_func_001A0628; // consoleStruct
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 void func_001A0810(void);
 void func_001A0900(void);
 void func_001A0968(void*, int);
-void func_001A0B08(consoleStruct*, int, char*);
-void func_001A0D80(int, int, int); 
-void func_001A0B90(int, char*, int);
+void func_001A0B08(s_func_001A0628*, int, char*);
+void func_001A0D80(s_func_001A0628*, int, int);
+void func_001A0B90(s_func_001A0628*, char*, int);
 
 
 void func_001A12A0(char arg0, int arg1);
@@ -91,17 +91,17 @@ int func_001AADF8(void);
 
 class Console {
 	public:
-		void Help(consoleStruct*);
-		void Time(consoleStruct*);
-		void ListActors(consoleStruct*);
-		void ToggleDebugConsole(consoleStruct*);
+		void Help(s_func_001A0628*);
+		void Time(s_func_001A0628*);
+		void ListActors(s_func_001A0628*);
+		void ToggleDebugConsole(s_func_001A0628*);
 		void Break();
-		void Save(consoleStruct*);
-		void Load(consoleStruct*);
-		void IsMediaReady(consoleStruct*);
-		void DirMemCard(consoleStruct*);
-		void FormatMemCard(consoleStruct*);
-		void UnformatMemCard(consoleStruct*);
+		void Save(s_func_001A0628*);
+		void Load(s_func_001A0628*);
+		void IsMediaReady(s_func_001A0628*);
+		void DirMemCard(s_func_001A0628*);
+		void FormatMemCard(s_func_001A0628*);
+		void UnformatMemCard(s_func_001A0628*);
 		void TestDoggyDoAnims();
 		void Parse();
 		void Patch();

include/Dogs/Dog.h

@@ -28,7 +28,7 @@ class Dog : public WorldObject/*, public Jump_IF, public AnimationMovedObject_IF
         int unk85C;
         float unk868; // status bone height
         // 0x86C float boneScale
-        // 0x870 float boneRotation
+        // 0x870 float boneRotation (radians)
 
         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)

include/Dogs/Game.h

@@ -8,6 +8,12 @@
 #include "FGDK3/GameShell.h"
 #include "Dogs/Lights.h"
 
+#include "text_001B07A8.h"
+
+#include "Dogs/Console.h"
+
+#include "Dogs/GameState.h"
+#include "Dogs/Scent.h"
 
 typedef struct {
     char unk0[0x4F8];
@@ -26,8 +32,8 @@ typedef struct {
     float unk24;
     float unk28;
     /* 0x2C */ int m_language;
-} s_Game_Document_584;
-// constructed by 001B1FA8
+} s_func_001B1FA8; // settings
+
 
 extern void * const Game_StdInit_UsedModules[];
 
@@ -56,7 +62,9 @@ class Game_Document : public GameShell, public WorldObject_Universe, public DogS
         int unk1D8;
         int unk1DC;
         //
-        s_0044EB68_1E0* unk1E0;
+        s_func_0023E698* unk1E0;
+        s_func_00154120* unk1E4;
+
         //
         int unk1E8;
         bool unk1EC; // musicEnabled?
@@ -66,7 +74,8 @@ class Game_Document : public GameShell, public WorldObject_Universe, public DogS
         int unk1FC; // script thread profiling actorId
         int unk200;
         int unk204;
-        // 0x3E0 GameDesktop (virtualdesktop)
+        // 0018b528 unk210?
+        GameDesktop* unk3E0;
         int unk3E8;
         int unk3EC;
         int unk3F0; // windowed mode?
@@ -88,13 +97,14 @@ class Game_Document : public GameShell, public WorldObject_Universe, public DogS
         /* 0x4F0 */ bool m_renderHitSpheres;
         int unk4F4; // navcells actorId
         int unk4F8; // navcells thing
-        // 0x4FC GameStateReq?
+        s_func_001D8328* unk4FC;
         int unk500;
-        int unk504;
+        s_func_001A0628* unk504;
         //
         ShapeInstance unk51C; // backdrop (sky)
-        int* unk550;
-        //
+        s_func_001B07A8* unk550;
+        s_func_001B0B90* unk554;
+        s_func_001B11E0* unk558;
         bool unk55C; // makes speech/music quieter?
         int unk560;
         float unk564;
@@ -105,7 +115,8 @@ class Game_Document : public GameShell, public WorldObject_Universe, public DogS
         int unk578;
         int unk57C; // current collar
         int unk580;
-        s_Game_Document_584* unk584; // settings
+        s_func_001B1FA8* unk584; // settings
+
         float unk588;
         float unk58C;
         float unk5A0;
@@ -133,12 +144,12 @@ class SimObj_FilterFlagsAndEq : public SimObj_Filter {
         /* virtual */ int func_001D6B40();
 };
 
-const char* func_001B2470(s_Game_Document_584*, int);
-const char* func_001B24F8(s_Game_Document_584*);
-const char* func_001B2578(s_Game_Document_584*);
-void func_001B25F8(s_Game_Document_584*);
-void func_001B2620(s_Game_Document_584*);
-void func_001B2640(s_Game_Document_584*, int);
+const char* func_001B2470(s_func_001B1FA8*, int);
+const char* func_001B24F8(s_func_001B1FA8*);
+const char* func_001B2578(s_func_001B1FA8*);
+void func_001B25F8(s_func_001B1FA8*);
+void func_001B2620(s_func_001B1FA8*);
+void func_001B2640(s_func_001B1FA8*, int);
 
 #ifdef __cplusplus
 extern "C" {
@@ -149,6 +160,7 @@ s_func_001C6DC8* func_001C6DC8(Game_Document*);
 void func_001C8120(void);
 bool func_001C8128();
 void func_001C88D0(Game_Document*, int level, int gate);
+void func_001CA000(Game_Document*, bool);
 void func_001CCE58(Game_Document*);
 void func_001D1F70(Game_Document*);
 void func_001D22B0(Game_Document*, int level, int gate);

include/Dogs/GameState.h

@@ -110,6 +110,10 @@ class FadeOutReq : public GameState::GameStateReq {
         //func_001DA070
 };
 
+typedef struct {
+
+} s_func_001D8328; // inherits SwitchViewReq?
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/Dogs/Scent.h

@@ -3,6 +3,10 @@
 
 #include "SimObj.h"
 
+typedef struct {
+
+} s_func_00154120;
+
 class Scent : public SimObject {
     public:
         float unk114;

include/FGDK3/GameShell.h

@@ -11,7 +11,7 @@ class GameShell {
         long unk8;
         /* 0x10 */ float m_deltaTime;
         /* 0x14 */ float m_gameSpeed; // normally set to 0.125f, see also 0x1C4 in Game_Document
-        void* unk18;
+        void* unk18; // s_func_002fa8e8?
         /* 0x1C */ bool m_disabled;
         // 0x20 float m_currentFps
         // 0x24 float m_frameTime

include/FGDK3/NavGraphRes.h

@@ -2,8 +2,6 @@
 #define NAVGRAPHRES_H
 
 #include "FGDK3/Playstation2/Thread.h"
-#include "ThrowCat.h"
-#include "RelRecv.h"
 
 extern void * const NavGraphRes_StdInit_UsedModules[];
 

include/FGDK3/Playstation2/IOPMem.h

@@ -10,4 +10,12 @@ void IOPMem_InternalFinalise();
 Status IOPMem_Initialise();
 void IOPMem_Finalise();
 
+#ifdef __cplusplus
+extern "C" {
 #endif
+void func_002967C8(void* arg0, int arg1);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* IOPMEM_H */