fragment32 and 22630/232C0 (#173)

Author: Kelebek1

include/variables.h

@@ -269,6 +269,17 @@ extern u8 D_3008670[];
 extern u8 D_3009678[];
 extern u8 D_3012D80[];
 extern u8 D_301C488[];
+extern u8 D_2002480[];
+extern u8 D_2002900[];
+extern u8 D_2003900[];
+extern u8 D_2004900[];
+extern u8 D_2004C00[];
+extern u8 D_2005A10[];
+extern u8 D_2006820[];
+extern u8 D_20068A0[];
+extern u8 D_2006920[];
+extern u8 D_20069A0[];
+extern u8 D_2002000[];
 
 extern u8 D_800818E0[0x20];
 
@@ -394,4 +405,12 @@ extern unk_D_8007596C D_8007596C[151];
 
 extern u32 D_8C000000; // start of some rom area
 
+typedef struct unk_D_80072B00 {
+    /* 0x00 */ char unk00[2];
+    /* 0x02 */ u8 unk_02;
+    /* 0x03 */ u8 unk_03;
+    /* 0x04 */ char unk04[1];
+    /* 0x05 */ u8 unk_05;
+} unk_D_80072B00; // size = 0x6
+
 #endif

linker_scripts/us/symbol_addrs.txt

@@ -494,4 +494,17 @@ D_03001F98 = 0x03001F98;
 D_03002F60 = 0x03002F60;
 D_03003F28 = 0x03003F28;
 D_3006060 = 0x3006060;
-D_3000000 = 0x3000000;
+D_3000000 = 0x3000000;
+D_2002480 = 0x2002480;
+D_2002900 = 0x2002900;
+D_2003900 = 0x2003900;
+D_2004900 = 0x2004900;
+D_2004C00 = 0x2004C00;
+D_2005A10 = 0x2005A10;
+D_2006820 = 0x2006820;
+D_20068A0 = 0x20068A0;
+D_2006920 = 0x2006920;
+D_20069A0 = 0x20069A0;
+D_2002000 = 0x2002000;
+D_8006FEE8 = 0x8006FEE8; // size:0xC type:char
+D_800AC910 = 0x800AC910; // size:0x58

src/19840.c

@@ -507,7 +507,7 @@ unk_D_86002F30* func_80019D90(unk_func_80026268_arg0* arg0) {
     unk_D_86002F30* sp24 = NULL;
     MemoryBlock* sp20;
 
-    sp2C = func_8000484C(D_800ABE10.unk_A04.unk_00, arg0->unk_00 - 1);
+    sp2C = func_8000484C(D_800ABE10.unk_A04.unk_00, arg0->unk_00.unk_00 - 1);
     if (sp2C != NULL) {
         sp20 = func_80002D10(main_pool_get_available(), 0);
         func_8001BEE8(&sp28, arg0);

src/1C720.c

@@ -128,10 +128,10 @@ unk_D_86002F58_004_000_010_02C* func_8001BEE8(unk_D_86002F58_004_000_010_02C* ar
     u8 var_a0;
     s8* var_v1;
 
-    sp30 = &D_8006FF00[arg1->unk_00 - 1];
+    sp30 = &D_8006FF00[arg1->unk_00.unk_00 - 1];
     sp34.raw = 0;
 
-    func_80021CA4(sp38, arg1->unk_00);
+    func_80021CA4(sp38, arg1->unk_00.unk_00);
 
     if (HAL_Strcmp(arg1->unk_30, sp38) != 0) {
         var_a0 = ((arg1->unk_0E >> 8) & 0xFF) + (arg1->unk_0E & 0xFF);
@@ -160,7 +160,7 @@ unk_D_86002F58_004_000_010_02C* func_8001BEE8(unk_D_86002F58_004_000_010_02C* ar
 void func_8001C014(s32* arg0, unk_func_8001C014* arg1, u16 arg2) {
     unk_func_80026268_arg0 stack;
 
-    stack.unk_00 = arg2;
+    stack.unk_00.unk_00 = arg2;
     stack.unk_0E = arg1->unk_02;
 
     _bcopy(arg1->unk_04, stack.unk_30, 0x10);
@@ -183,7 +183,7 @@ void func_8001C07C(unk_func_8001C07C_arg0* arg0) {
     stack.unk_0C.raw = 0;
 
     if (!(arg0->unk_00 & 0x40) && (arg0->unk_00 & 0x80)) {
-        if (arg0->unk_04 != NULL && stack.unk_08 == arg0->unk_04->unk_00) {
+        if (arg0->unk_04 != NULL && stack.unk_08 == arg0->unk_04->unk_00.unk_00) {
             func_8001BEE8(&stack.unk_0C, arg0->unk_04);
             if ((stack.unk_08 == 0x19) && (arg0->unk_04->unk_52 & 0x80)) {
                 stack.unk_08 = 0x99;