Add split for text_002D6BE8, progress

Author: Dogmander

configs/main.yaml

@@ -183,6 +183,7 @@ segments:
       - [0x1CB560, cpp, text_002CA560]
       - [0x1D3D80, cpp, FGDK3/Code/GameShell] # -O0 - Guessed filepath and name
       - [0x1D4598, cpp, text_002D3598]
+      - [0x1D7BE8, cpp, text_002D6BE8]
       - [0x1DA560, cpp, text_002D9560]
       - [0x1DBB38, cpp, FGDK3/Code/DrawShape]
       - [0x1DF720, cpp, text_002DE720]
@@ -369,6 +370,7 @@ segments:
 
       - [0x343CE8, .rodata, FGDK3/Code/GameShell]
       - [0x343D68, .rodata, text_002D3598]
+      - [0x344B70, .rodata, text_002D6BE8]
       - [0x344DC8, .rodata, text_002D9560]
       - [0x345438, .rodata, FGDK3/Code/DrawShape]
       - [0x345498, .rodata, text_002DE720]

configs/sym.txt

@@ -445,6 +445,7 @@ func_001738B0__13SoundCreature = 0x001738B0; // type:func
 
 __9SphereObjP9ClassInfoP15SimObj_Universeis = 0x001738D8; // type:func
 __tf9SphereObj = 0x00177568;
+func_001775C0__9SphereObj = 0x001775C0; // type:func
 __tf15BallHitReceiver = 0x00177688;
 
 
@@ -788,6 +789,8 @@ __tf11PausedLayer = 0x001ED318;
 
 // Platform
 _$_8Platform = 0x001ED5A8; // type:func
+__13SwingPlatformP9ClassInfoP15SimObj_Universeis = 0x001EE840; // type:func
+_$_13SwingPlatform = 0x001EEA08; // type:func
 func_001F07C8__19PlatformHitReceiver = 0x001F07C8; // type:func
 
 __tf17Player_GrowlTimer = 0x001F7378;
@@ -900,6 +903,7 @@ __tft8Resource1Z12Sound_Effect = 0x0024BE88;
 __14Widget_Desktop = 0x0024C0D8; // type:func
 __6WidgetPci = 0x0024C6D8; // type:func
 _$_6Widget = 0x0024C768; // type:func
+_$_14Widget_Graphic = 0x0024E810; // type:func
 __tf13Widget_Window = 0x0025D2A0;
 __tf11Widget_Menu = 0x0025D390;
 __tf15Widget_MenuItem = 0x0025D480;
@@ -996,6 +1000,7 @@ _$_25Tree34_NodeAllocatorBasic = 0x0026A8A0; // type:func
 __tf20Tree34_NodeAllocator = 0x0026A8D0;
 
 TimSrv_InternalInitialise__Fv = 0x0026AD70; // type:func
+func_0026AD98__Fv = 0x0026AD98; // type:func
 TimSrv_InternalFinalise__Fv = 0x0026ADE8; // type:func
 TimSrv_Initialise__Fv = 0x0026AE08; // type:func
 TimSrv_Finalise__Fv = 0x0026AE38; // type:func
@@ -1054,7 +1059,7 @@ StdMem_Finalise__Fv = 0x0026C648; // type:func
 StdInit_InitialisationSequence__FP25StdInit_ModuleDescription = 0x0026CB28; // type:func
 StdInit_FinalisationSequence__FP25StdInit_ModuleDescription = 0x0026CD58; // type:func
 CheckError__18StdInit_ClientBaseG6Status = 0x0026CE20; // type:func
-PrepareReport_6StatusPci = 0x0026CE60; // type:func
+PrepareReport__6StatusPci = 0x0026CE60; // type:func
 __tf6Status = 0x0026CF20; // type:func
 SoundManager_InternalInitialise__Fv = 0x0026D178; // type:func
 SoundManager_InternalFinalise__Fv = 0x0026D260;  //type:func
@@ -1095,6 +1100,7 @@ RunPath_InternalInitialise__Fv = 0x00272F50; // type:func
 RunPath_InternalFinalise__Fv = 0x00272F98; // type:func
 RunPath_Initialise__Fv = 0x00272FA0; // type:func
 RunPath_Finalise__Fv = 0x00272FD0; // type:func
+RunPath_Get__Fv = 0x00272FF0; // type:func
 __19Resource_LayoutUnitP19Resource_LayoutUnit = 0x00273D08; // type:func
 _$_19Resource_LayoutUnit = 0x00273D28; // type:func
 _$_22Resource_LayoutOverlay = 0x00273F68; // type:func
@@ -1104,6 +1110,7 @@ _$_20Resource_LayoutGroup = 0x00274680; // type:func
 
 __16Resource_Generic = 0x00275328;
 _$_16Resource_Generic = 0x002753E0; // type:func
+func_00275520__16Resource_Generic = 0x00275520; // type:func
 __tf19Resource_LayoutUnit = 0x00275BA8;
 __20Resource_LayoutGroupP19Resource_LayoutUnitiPv = 0x00274628; // type:func
 func_00274A00__29Resource_LayoutInclusiveGroup = 0x00274A00; // type:func
@@ -1293,6 +1300,7 @@ __12MeshInstancePC8MeshData = 0x0028F150; // type:func
 _$_12MeshInstance = 0x0028F1A8; // type:func
 Render__12MeshInstanceP9GE_Device = 0x0028F228; // type:func
 Main_RunGame__Fv = 0x00296248; // type:func
+Main_Terminate__Fv = 0x002963D0; // type:func
 IOPMem_InternalInitialise__Fv = 0x00296670; // type:func
 IOPMem_InternalFinalise__Fv = 0x002966B8; // type:func
 IOPMem_Initialise__Fv = 0x002966C0; // type:func
@@ -1437,7 +1445,7 @@ FontRes_InternalFinalise__Fv = 0x002D6A00; // type:func
 FontRes_Initialise__Fv = 0x002D6A08; // type:func
 FontRes_Finalise__Fv = 0x002D6A38; // type:func
 __tf14Font_Resources = 0x002D6B38;
-__tf18Resource1Z11Font_Header = 0x002D6B98;
+__tft8Resource1Z11Font_Header = 0x002D6B98;
 _$_6Endian = 0x002D7950; // type:func
 func_002D7980__6Endian = 0x002D7980; // type:func
 _$_16Endian_ExpandMem = 0x002D8850; // type:func
@@ -1678,6 +1686,8 @@ func_002FBB78__18InputDevice_Device = 0x002FBB78; // type:func
 __tf18InputDevice_Device = 0x002FBC60;
 func_002FBCA0__18InputDevice_Device = 0x002FBCA0; // type:func
 func_002FBCA8__18InputDevice_Device = 0x002FBCA8; // type:func
+
+func_002FBD70__11InputCD_PS2 = 0x002FBD70; // type:func
 __tf11InputCD_PS2 = 0x002FBF48;
 __tf7InputCD = 0x002FBFB0;
 // Controller.cpp
@@ -1715,8 +1725,10 @@ _$_12File_MemCard = 0x002FFFE0; // type:func
 func_00300040__12File_MemCard = 0x00300040; // type:func
 func_00300140__12File_MemCard = 0x00300140; // type:func
 func_00300988__12File_MemCard = 0x00300988; // type:func
-__22FileSystemDisc_MemCardi = 0x00300BE8;
+__22FileSystemDisc_MemCardi = 0x00300BE8; // type:func
+_$_22FileSystemDisc_MemCard = 0x00300CC8; // type:func
 __21StorageDevice_MemCardi = 0x00301548; // type:func
+func_003016A0__21StorageDevice_MemCard = 0x003016A0; // type:func
 func_00301798__21StorageDevice_MemCard = 0x00301798; // type:func
 __tf21StorageDevice_MemCard = 0x00301AC8;
 __tf22FileSystemDisc_MemCard = 0x00301B38;
@@ -1844,6 +1856,11 @@ __tft8Resource1Z12ScriptHeader = 0x0031CBF0;
 __6ScriptPvii = 0x0031CC40; // type:func
 _$_6Script = 0x0031CCB0; // type:func
 func_0031E8C0__6Script = 0x0031E8C0; // type:func
+func_0031E8C8__6Script = 0x0031E8C8; // type:func
+func_0031E8D8__6Script = 0x0031E8D8; // type:func
+func_0031E8E8__6Script = 0x0031E8E8; // type:func
+func_0031EA40__6Script = 0x0031EA40; // type:func
+func_0031EA48__6Script = 0x0031EA48; // type:func
 __tf6Script = 0x0031EA50;
 ShapeRes_InternalInitialise__Fv = 0x0031EEA0; // type:func
 ShapeRes_InternalFinalise__Fv = 0x0031EF08; // type:func
@@ -1881,6 +1898,8 @@ sceCdInitEeCb = 0x00328220; // type:func
 sceCdLayerSearchFile = 0x00328638; // type:func
 sceCdSearchFile = 0x00328950; // type:func
 sceCdRead = 0x00329390; // type:func
+sceCdGetDiskType = 0x00329570; // type:func
+sceCdGetError = 0x00329608; // type:func
 sceCdStatus = 0x003296A0; // type:func
 sceCdStRead = 0x00329858; // type:func
 sceCdStPause = 0x003299E0; // type:func
@@ -1941,6 +1960,7 @@ _sdrCBThread = 0x0032E940; // type:func
 _sdrCB = 0x0032E9A8; // type:func
 sceMcInit = 0x0032EA48; // type:func
 sceMcClose = 0x0032EF50; // type:func
+sceMcFormat = 0x0032FAA8; // type:func
 sceScfGetLanguage = 0x003302F0; // type:func
 sceScfGetAspect = 0x00330370; // type:func
 tanf = 0x00330CC8; // type:func
@@ -2000,6 +2020,7 @@ scePrintf = 0x00343120; // type:func
 sceSifSetRpcQueue = 0x00344408; // type:func
 sceSifRegisterRpc = 0x003444A0; // type:func
 sceSifRpcLoop = 0x003448B8; // type:func
+sceFsReset = 0x003451E8; // type:func
 sceOpen = 0x00345220; // type:func
 sceClose = 0x003454A8; // type:func
 sceLseek = 0x00345628; // type:func

include/Dogs/Basket.h

@@ -7,17 +7,18 @@
 class Basket : public Container {
     public:
 
-        int unk620;
-        //unk624
-        int unk628;
+        bool unk620; // 0 when held, otherwise 1; apply gravity?
+        float unk624;
+        bool unk628; // 0 when held, otherwise 1
         //
         int unk660;
         Basket(ClassInfo*, SimObj_Universe*, int, short);
         virtual ~Basket();
         virtual ClassInfo* func_00106198();
 
+        virtual void func_00105DF8();
         virtual int func_00104D78();
 };
 
 
-#endif
+#endif /* BASKET_H */

include/Dogs/Button.h

@@ -2,14 +2,14 @@
 #define BUTTON_H
 
 #include "WorldObj.h"
-
+#include <libvu0.h>
 
 class Button : public WorldObject {
     public:
         static ClassInfo* s_classInfo;
         int unk5C0; // button receiver actorId
         float unk5C4; // button hold time (seconds)?
-
+        sceVu0FVECTOR unk5D0;
         int unk5E0;
         int unk5E4;
         int unk5E8; // toggle state?

include/Dogs/Creatres.h

@@ -3,17 +3,17 @@
 
 #include "FGDK3/Playstation2/Thread.h"
 
-#include "FGDK3/ThrowCat.h"
-#include "FGDK3/RelRecv.h"
-
-
 extern void * const Creatres_StdInit_UsedModules[];
 
 Status Creatres_InternalInitialise();
 void Creatres_InternalFinalise();
 Status Creatres_Initialise();
 void Creatres_Finalise();
 
+class Creature_Resources /**/ {
+
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/Dogs/DustEffects.h

@@ -6,7 +6,9 @@
 class DustEffectManager : public SimObject {
     public:
         static ClassInfo* s_classInfo;
-        int unk11C;
+        int unk118; // dust texture id/num (might be short type)
+        int unk11C; // max dust particles?
+
         DustEffectManager(ClassInfo*, SimObj_Universe*, int, short);
         virtual ~DustEffectManager();
         virtual ClassInfo* func_0013B260();

include/Dogs/Element3D.h

@@ -6,6 +6,7 @@
 
 class Element3D : public ShapeInstance, public GenericObject/*, public Location_IF, public BoneManagerProvider_IF, public AnimPosProvider_IF, public AnimVarProvider_IF*/  {
     public:
+        // 0xD0 BoneManager?
         /* 0x108 */ short m_shapeId;
         Element3D(ClassInfo*, short);
         virtual ~Element3D();

include/Dogs/Game.h

@@ -6,7 +6,7 @@
 #include "FGDK3/Playstation2/Thread.h"
 
 #include "FGDK3/GameShell.h"
-
+#include "Dogs/Lights.h"
 
 
 typedef struct {
@@ -77,7 +77,7 @@ class Game_Document : public GameShell, public WorldObject_Universe, public DogS
         int unk404;
         //unk408
         int unk4B0;
-        // unk4D0 LightManager
+        LightManager* unk4D0;
         /* 0x4D4 */ bool m_verbose;
         /* 0x4D8 */ bool m_renderSkeleton;
         /* 0x4DC */ bool m_renderOrient;
@@ -95,7 +95,7 @@ class Game_Document : public GameShell, public WorldObject_Universe, public DogS
         ShapeInstance unk51C; // backdrop (sky)
         int* unk550;
         //
-        int unk55C;
+        bool unk55C; // makes speech/music quieter?
         int unk560;
         float unk564;
         int unk56C;
@@ -122,7 +122,7 @@ class Game_Document : public GameShell, public WorldObject_Universe, public DogS
 
 };
 
-extern Game_Document* TheGame;
+extern Game_Document* TheGame; // should this be a static in Game_Document?
 
 class SimObj_Filter {
 
@@ -147,12 +147,13 @@ void func_0019A860(s_func_001C6DC8*, int, int); // TODO:Move to unk.h or BookMet
 void func_00196470(s_func_001C6DC8*, int); // TODO:Move to unk.h or BookMetaphor header
 s_func_001C6DC8* func_001C6DC8(Game_Document*);
 void func_001C8120(void);
-int func_001C8128();
+bool func_001C8128();
 void func_001C88D0(Game_Document*, int level, int gate);
 void func_001CCE58(Game_Document*);
 void func_001D1F70(Game_Document*);
 void func_001D22B0(Game_Document*, int level, int gate);
 void func_001D2480(Game_Document*);
+void func_001D27F8(Game_Document*);
 void func_001D3F38(Game_Document*);
 void func_001D3F58(Game_Document*);
 void func_001D4650(void);

include/Dogs/Gameutil.h

@@ -3,9 +3,6 @@
 
 #include "FGDK3/Playstation2/Thread.h"
 
-// overlay header? goes here
-#include "FGDK3/Inpevent.h"
-
 Status Gameutil_InternalInitialise();
 void Gameutil_InternalFinalise();
 Status Gameutil_Initialise();

include/Dogs/Levelres.h

@@ -2,9 +2,6 @@
 #define LEVELRES_H
 
 #include "FGDK3/Playstation2/Thread.h"
-
-#include "FGDK3/ThrowCat.h"
-
 #include "unk.h"
 
 extern void * const LevelRes_StdInit_UsedModules[];