Decompile overlay 1 (Part 9) (#109)

src/001_SceneInit/Game/AdventureModeManager_001.cpp

@@ -17,8 +17,17 @@
 
 extern "C" void *func_ov000_02066294();
 
-extern s16 data_ov001_020c27a8;
-extern s16 data_ov001_020c276c;
+static const s16 data_ov001_020c27a8[] = {
+    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E,
+    0x000F, 0x0010, 0x0011, 0x0012, 0x0014, 0x0015, 0x0018, 0x001C, 0x0019, 0x001A, 0x001D, 0x001E, 0x001F,
+    0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, 0x0017, 0x0028, 0x003C, 0x0000, 0x0114,
+    0xEBAA, 0x4EB7, 0x4006, 0x3696, 0x5F01, 0x1F83, 0xE521, 0x335B, 0xE7EF, 0x197C, 0xE84B,
+};
+
+static const s16 data_ov001_020c276c[] = {
+    0x0000, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x0012, 0x0013,
+    0x0014, 0x0015, 0x0018, 0x0019, 0x001A, 0x001B, 0x001E, 0x001F, 0x0020, 0x0021, 0x0022, 0x0026, 0x0027, 0x003C, 0x0000,
+};
 
 GameModeManagerBase *AdventureModeManager::Create(UnkStruct_0204a110_Sub2 *param1) {
     return new(HeapIndex_1) AdventureModeManager(param1);
@@ -101,7 +110,7 @@ void AdventureModeManager::vfunc_14() {
     UnkStruct_027e0cf8::Create();
 
     if (data_027e09a4->IsTrain()) {
-        this->mUnk_004.func_ov001_020bd734(&data_ov001_020c276c);
+        this->mUnk_004.func_ov001_020bd734(data_ov001_020c276c);
 
         if (data_027e09a4->IsNotCutscene()) {
             if (data_027e09a4->IsDarkRealm()) {
@@ -111,7 +120,7 @@ void AdventureModeManager::vfunc_14() {
             }
         }
     } else {
-        this->mUnk_004.func_ov001_020bd734(&data_ov001_020c27a8);
+        this->mUnk_004.func_ov001_020bd734(data_ov001_020c27a8);
         if (data_027e09a4->IsNotCutscene()) {
             this->mUnk_004.func_0201c00c(0, 1);
         }

src/001_SceneInit/Player/PlayerActorBase_001.cpp

@@ -4,11 +4,17 @@
 #include "System/SysNew.hpp"
 #include "Unknown/UnkStruct_027e09a4.hpp"
 
-extern const char data_ov001_020c264c[][16];
-extern const char data_ov001_020c26bc[][16];
 extern "C" u16 *func_ov021_020ea868(int);
 extern "C" void func_ov000_0205c584(void *, int, int);
 
+static const char data_ov001_020c264c[][16] = {
+    "swA", "sheath", "swB", "sheathB", "belt", "cap", "body_all",
+};
+
+static const char data_ov001_020c26bc[][16] = {
+    "center", "body_chn", "waist_chn", "cl_podA", "cl_LhandA", "cl_RhandA", "LlegB_jnt", "RlegB_jnt", "head_jnt",
+};
+
 ModelRender_Derived4::ModelRender_Derived4(PlayerCharacter character, unk32 param2, G3d_Model *pModel,
                                            G3d_BoneMtxStruct *pCacheJntAnm) :
     ModelRender_Derived3(character, pModel),

src/001_SceneInit/UnkStruct_027e0cf8_08_00_001.cpp

@@ -1,7 +1,15 @@
 #include "Unknown/UnkStruct_027e0cf8.hpp"
 
-extern s16 data_ov001_020c2750[];
-extern s16 data_ov001_020c275e[];
+static const int data_ov001_020c274c[] = {0x0C};
+DECOMP_FORCE(data_ov001_020c274c);
+
+static const s16 data_ov001_020c2750[] = {
+    0, 0, -1, -1, -3, -4, -6,
+};
+
+static const s16 data_ov001_020c275e[] = {
+    -6, -4, -3, -2, -1, 0, 0,
+};
 
 UnkStruct_027e0cf8_08_00::UnkStruct_027e0cf8_08_00(u8 bgType) :
     AdventureModeManager_1B8_Base(bgType, true, AdventureModeManager_1B8_Base_1C(0x00, 0x00, 0x100, 0xC0), true, true) {

src/001_SceneInit/code_020bfdd0.cpp

@@ -5,6 +5,8 @@
 
 #include <dsprot.h>
 
+static UnkStruct_ov001_020c46f4_Base *data_ov001_020c46f4 = NULL;
+
 void func_ov001_020bfdd0() {
     if (data_ov001_020c46f4 != NULL) {
         DELETE(data_ov001_020c46f4);

src/001_SceneInit/code_020bfeec.cpp

@@ -3,7 +3,7 @@
 
 #include <dsprot.h>
 
-extern ActorUnkLBCK *data_ov001_020c46f8;
+static ActorUnkLBCK *data_ov001_020c46f8 = NULL;
 
 void func_ov001_020bfeec(void) {
     data_ov001_020c46f8->func_ov000_020984d0();

src/001_SceneInit/code_020c099c.cpp

@@ -3,6 +3,19 @@
 
 #include <dsprot.h>
 
+// probably not here but it's unused
+class UnkStruct_ov001_020c2fd4 {
+public:
+    /* 00 */ unk32 mUnk_00;
+
+    UnkStruct_ov001_020c2fd4() {
+        mUnk_00 = 0x00010005;
+    }
+};
+static const UnkStruct_ov001_020c2fd4 data_ov001_020c2fd4;
+
+static UnkStruct_ov001_020c46fc *data_ov001_020c46fc = NULL;
+
 void func_ov001_020c099c(void) {
     data_ov001_020c46fc = new(HeapIndex_1) UnkStruct_ov001_020c46fc();
 }