Merge branch 'd_a_npc_kn' of github.com:pheenoh/tp into d_a_npc_kn

Author: Pheenoh

.clangd

@@ -1,5 +1,9 @@
 CompileFlags:
-  Add: [-Wno-c++11-compat-deprecated-writable-strings, -Wno-extern-initializer, -Wno-multichar]
+  Add: [-Wno-c++11-compat-deprecated-writable-strings, -Wno-extern-initializer, -Wno-multichar, "-fdeclspec"]
+Diagnostics:
+  Suppress:
+    - "warn_char_constant_too_large"
+    - "illegal_union_or_anon_struct_member"
 ---
 If:
   PathMatch: .*/*.inc

.github/workflows/build.yml

@@ -32,20 +32,7 @@ jobs:
       run: |
         python configure.py --map --version ${{ matrix.version }} \
             --binutils /binutils --compilers /compilers
-        ninja all_source build/${{ matrix.version }}/progress.json \
-            build/${{ matrix.version }}/report.json
-
-    # Upload progress if we're on the main branch
-    - name: Upload progress
-      if: github.ref == 'refs/heads/main'
-      continue-on-error: true
-      env:
-        PROGRESS_SLUG: twilightprincess
-        PROGRESS_API_KEY: ${{ secrets.PROGRESS_API_KEY }}
-      run: |
-        python tools/upload_progress.py -b https://progress.decomp.club/ \
-          -p $PROGRESS_SLUG -v ${{ matrix.version }} \
-          build/${{ matrix.version }}/progress.json
+        ninja all_source progress build/${{ matrix.version }}/report.json
 
     # Upload map files
     - name: Upload map

.vscode/tasks.json

@@ -2,6 +2,20 @@
   // Use Ctrl+Shift+B to run build tasks.
   // Or "Run Build Task" in the Command Palette.
   "version": "2.0.0",
+  "inputs": [
+    {
+        "id": "gameVersion",
+        "type": "pickString",
+        "options": [
+            "GZ2E01",
+            "GZ2P01",
+            "GZ2J01",
+            "ShieldD",
+        ],
+        "default": "GZ2E01",
+        "description": "Game version to build."
+    },
+  ],
   "tasks": [
     {
       "label": "ninja",
@@ -12,5 +26,11 @@
         "isDefault": true
       }
     },
+    {
+      "label": "configure",
+      "type": "shell",
+      "command": "${command:python.interpreterPath} configure.py --version ${input:gameVersion}",
+      "problemMatcher": [],
+    },
   ]
 }

config/GZ2E01/config.yml

@@ -6,6 +6,18 @@ splits: config/GZ2E01/splits.txt
 symbols: config/GZ2E01/symbols.txt
 mw_comment_version: 11 # GC Linker 2.7
 quick_analysis: true # Initial analysis completed
+force_active: [
+  _MetroTRK_Has_Framing,
+]
+
+block_relocations:
+- source: .sdata:0x804505ac
+add_relocations:
+- source: .sdata:0x804505ac
+  type: abs
+  target: buffer__14mDoMtx_stack_c
+  addend: 0x300
+
 modules:
 - object: files/RELS.arc:rels/mmem/f_pc_profile_lst.rel
   hash: 183231361986731ad6bd26624a03a44dceda905b
@@ -340,8 +352,8 @@ modules:
     binary: assets/l_J_hana00_cDL.bin
     header: assets/l_J_hana00_cDL.h
   - symbol: l_matDL
-    binary: assets/l_matDL.bin
-    header: assets/l_matDL.h
+    binary: assets/l_matDL__d_a_grass.bin
+    header: assets/l_matDL__d_a_grass.h
     header_type: none
     custom_type: matDL
   - symbol: l_matLight4DL
@@ -362,8 +374,8 @@ modules:
     binary: assets/l_J_hana01_c_01DL.bin
     header: assets/l_J_hana01_c_01DL.h
   - symbol: l_mat2DL
-    binary: assets/l_mat2DL.bin
-    header: assets/l_mat2DL.h
+    binary: assets/l_mat2DL__d_a_grass.bin
+    header: assets/l_mat2DL__d_a_grass.h
     header_type: none
     custom_type: matDL
   - symbol: l_mat2Light4DL

config/GZ2E01/rels/d_a_L7demo_dr/symbols.txt

@@ -32,7 +32,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @3948 = .rodata:0x00000014; // type:object size:0x4 scope:local
 @3949 = .rodata:0x00000018; // type:object size:0x4 scope:local
 @3950 = .rodata:0x0000001C; // type:object size:0x4 scope:local
-@3951 = .rodata:0x00000020; // type:object size:0x4 scope:local data:float
+@3951 = .rodata:0x00000020; // type:object size:0x4 scope:local align:4 data:float
 @3952 = .rodata:0x00000024; // type:object size:0x4 scope:local
 @4123 = .rodata:0x00000028; // type:object size:0x4 scope:local
 @4124 = .rodata:0x0000002C; // type:object size:0x4 scope:local
@@ -44,8 +44,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @4184 = .rodata:0x00000044; // type:object size:0x4 scope:local
 @4185 = .rodata:0x00000048; // type:object size:0x4 scope:local
 @4186 = .rodata:0x0000004C; // type:object size:0x4 scope:local
-@4217 = .rodata:0x00000050; // type:object size:0x4 scope:local data:float
-@4218 = .rodata:0x00000054; // type:object size:0x4 scope:local data:float
+@4217 = .rodata:0x00000050; // type:object size:0x4 scope:local align:4 data:float
+@4218 = .rodata:0x00000054; // type:object size:0x4 scope:local align:4 data:float
 @4290 = .rodata:0x00000058; // type:object size:0x4 scope:local
 @4291 = .rodata:0x0000005C; // type:object size:0x4 scope:local
 @4292 = .rodata:0x00000060; // type:object size:0x4 scope:local

config/GZ2E01/rels/d_a_L7low_dr/symbols.txt

@@ -23,7 +23,7 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @3770 = .rodata:0x00000004; // type:object size:0x4 scope:local
 @3771 = .rodata:0x00000008; // type:object size:0x4 scope:local
 @3772 = .rodata:0x0000000C; // type:object size:0x4 scope:local
-@3773 = .rodata:0x00000010; // type:object size:0x4 scope:local data:float
+@3773 = .rodata:0x00000010; // type:object size:0x4 scope:local align:4 data:float
 @3774 = .rodata:0x00000014; // type:object size:0x4 scope:local
 @3775 = .rodata:0x00000018; // type:object size:0x4 scope:local
 @3776 = .rodata:0x0000001C; // type:object size:0x4 scope:local

config/GZ2E01/rels/d_a_L7op_demo_dr/symbols.txt

@@ -38,8 +38,8 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 ...rodata.0 = .rodata:0x00000000; // type:label scope:local
 @3850 = .rodata:0x00000000; // type:object size:0x4 scope:local
 @3851 = .rodata:0x00000004; // type:object size:0x4 scope:local
-@3852 = .rodata:0x00000008; // type:object size:0x4 scope:local data:float
-@3853 = .rodata:0x0000000C; // type:object size:0x4 scope:local data:float
+@3852 = .rodata:0x00000008; // type:object size:0x4 scope:local align:4 data:float
+@3853 = .rodata:0x0000000C; // type:object size:0x4 scope:local align:4 data:float
 @4115 = .rodata:0x00000010; // type:object size:0x4 scope:local
 @4116 = .rodata:0x00000014; // type:object size:0x4 scope:local data:string
 @4117 = .rodata:0x00000018; // type:object size:0x4 scope:local

config/GZ2E01/rels/d_a_andsw/symbols.txt

@@ -5,10 +5,10 @@ Create__9daAndsw_cFv = .text:0x00000078; // type:function size:0x40 scope:global
 create__9daAndsw_cFv = .text:0x000000B8; // type:function size:0x68 scope:global
 execute__9daAndsw_cFv = .text:0x00000120; // type:function size:0x9C scope:global
 _delete__9daAndsw_cFv = .text:0x000001BC; // type:function size:0x8 scope:global
-daAndsw_Execute__FP9daAndsw_c = .text:0x000001C4; // type:function size:0x20 scope:global
-daAndsw_Delete__FP9daAndsw_c = .text:0x000001E4; // type:function size:0x20 scope:global
-daAndsw_Create__FP10fopAc_ac_c = .text:0x00000204; // type:function size:0x20 scope:global
+daAndsw_Execute__FP9daAndsw_c = .text:0x000001C4; // type:function size:0x20 scope:local
+daAndsw_Delete__FP9daAndsw_c = .text:0x000001E4; // type:function size:0x20 scope:local
+daAndsw_Create__FP10fopAc_ac_c = .text:0x00000204; // type:function size:0x20 scope:local
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
-l_daAndsw_Method = .data:0x00000000; // type:object size:0x20 scope:global
+l_daAndsw_Method = .data:0x00000000; // type:object size:0x20 scope:local
 g_profile_ANDSW = .data:0x00000020; // type:object size:0x30 scope:global

config/GZ2E01/rels/d_a_arrow/symbols.txt

@@ -62,11 +62,11 @@ _dtors = .dtors:0x00000000; // type:label scope:global
 @3768 = .rodata:0x00000000; // type:object size:0xC scope:local
 l_atCpsSrc = .rodata:0x0000000C; // type:object size:0x4C scope:global
 l_coSphSrc = .rodata:0x00000058; // type:object size:0x40 scope:global
-@4130 = .rodata:0x00000098; // type:object size:0x4 scope:local data:float
+@4130 = .rodata:0x00000098; // type:object size:0x4 scope:local align:4 data:float
 @4131 = .rodata:0x000000A0; // type:object size:0x8 scope:local
 @4132 = .rodata:0x000000A8; // type:object size:0x8 scope:local
 @4133 = .rodata:0x000000B0; // type:object size:0x8 scope:local
-@4187 = .rodata:0x000000B8; // type:object size:0x4 scope:local data:float
+@4187 = .rodata:0x000000B8; // type:object size:0x4 scope:local align:4 data:float
 effName$4192 = .rodata:0x000000BC; // type:object size:0xC scope:local
 effName$4214 = .rodata:0x000000C8; // type:object size:0x8 scope:local
 localEffPos$4215 = .rodata:0x000000D0; // type:object size:0xC scope:local
@@ -75,23 +75,23 @@ localEffPos$4215 = .rodata:0x000000D0; // type:object size:0xC scope:local
 @4445 = .rodata:0x000000E4; // type:object size:0x4 scope:local
 @4446 = .rodata:0x000000E8; // type:object size:0x4 scope:local
 @4447 = .rodata:0x000000EC; // type:object size:0x4 scope:local
-@4541 = .rodata:0x000000F0; // type:object size:0x4 scope:local data:float
+@4541 = .rodata:0x000000F0; // type:object size:0x4 scope:local align:4 data:float
 @4576 = .rodata:0x000000F4; // type:object size:0x4 scope:local
 @4577 = .rodata:0x000000F8; // type:object size:0x4 scope:local
 @4578 = .rodata:0x000000FC; // type:object size:0x4 scope:local
 @4579 = .rodata:0x00000100; // type:object size:0x4 scope:local
 @4582 = .rodata:0x00000108; // type:object size:0x8 scope:local
-@4606 = .rodata:0x00000110; // type:object size:0x4 scope:local data:float
+@4606 = .rodata:0x00000110; // type:object size:0x4 scope:local align:4 data:float
 @4607 = .rodata:0x00000114; // type:object size:0x4 scope:local
 @4630 = .rodata:0x00000118; // type:object size:0x4 scope:local
 @4631 = .rodata:0x0000011C; // type:object size:0x4 scope:local
 @4632 = .rodata:0x00000120; // type:object size:0x4 scope:local
 @4633 = .rodata:0x00000124; // type:object size:0x4 scope:local data:string
 @4674 = .rodata:0x00000128; // type:object size:0x4 scope:local
 @4675 = .rodata:0x0000012C; // type:object size:0x4 scope:local
-@4749 = .rodata:0x00000130; // type:object size:0x4 scope:local data:float
+@4749 = .rodata:0x00000130; // type:object size:0x4 scope:local align:4 data:float
 @4763 = .rodata:0x00000134; // type:object size:0x4 scope:local
-@4868 = .rodata:0x00000138; // type:object size:0x4 scope:local data:float
+@4868 = .rodata:0x00000138; // type:object size:0x4 scope:local align:4 data:float
 @5356 = .rodata:0x0000013C; // type:object size:0x4 scope:local
 @5357 = .rodata:0x00000140; // type:object size:0x4 scope:local
 @5358 = .rodata:0x00000144; // type:object size:0x4 scope:local
@@ -112,6 +112,7 @@ tmpColor$5589 = .rodata:0x00000164; // type:object size:0x8 scope:local
 ...data.0 = .data:0x00000000; // type:label scope:local
 cNullVec__6Z2Calc = .data:0x00000000; // type:object size:0xC scope:global
 @1787 = .data:0x0000000C; // type:object size:0x4 scope:local
+lbl_45_data_10 = .data:0x00000010; // type:object size:0x10
 @4777 = .data:0x00000020; // type:object size:0xC scope:local data:4byte
 @4874 = .data:0x0000002C; // type:object size:0xC scope:local
 @4974 = .data:0x00000038; // type:object size:0xC scope:local

config/GZ2E01/rels/d_a_b_bh/symbols.txt

@@ -43,8 +43,8 @@ __destroy_global_chain_reference = .dtors:0x00000000; // type:object size:0x4 sc
 _dtors = .dtors:0x00000000; // type:label scope:global
 ...rodata.0 = .rodata:0x00000000; // type:label scope:local
 @3764 = .rodata:0x00000000; // type:object size:0x4 scope:local
-@3778 = .rodata:0x00000004; // type:object size:0x4 scope:local data:float
-@3779 = .rodata:0x00000008; // type:object size:0x4 scope:local data:float
+@3778 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float
+@3779 = .rodata:0x00000008; // type:object size:0x4 scope:local align:4 data:float
 @3946 = .rodata:0x0000000C; // type:object size:0x4 scope:local
 @3947 = .rodata:0x00000010; // type:object size:0x4 scope:local
 @3948 = .rodata:0x00000014; // type:object size:0x4 scope:local