Merge pull request #492 from abnormalhare/main

match 438Dll/main.c

.vscode/settings.json

@@ -21,20 +21,81 @@
     ".clangd": "yaml",
     "m443dll.h": "c",
     "object.h": "c",
-    "executor.h": "c"
+    "executor.h": "c",
+    "m438dll.h": "c",
+    "audio.h": "c",
+    "musyx.h": "c",
+    "math.h": "c"
   },
   "search.useIgnoreFiles": false,
   "search.exclude": {
-      "build/*/config.json": true,
-      "build/**/*.MAP": true,
-      "build.ninja": true,
-      ".ninja_*": true,
-      "objdiff.json": true,
-      "progress.json": true,
-      "report.json": true,
-      "compile_commands.json": true,
+    "build/*/config.json": true,
+    "build/**/*.MAP": true,
+    "build.ninja": true,
+    ".ninja_*": true,
+    "objdiff.json": true,
+    "progress.json": true,
+    "report.json": true,
+    "compile_commands.json": true
   },
   "cmake.ignoreCMakeListsMissing": true,
   "editor.fontFamily": "Fira Code",
-  "editor.fontLigatures": true
+  "editor.fontLigatures": true,
+  "C_Cpp_Runner.cCompilerPath": "gcc",
+  "C_Cpp_Runner.cppCompilerPath": "g++",
+  "C_Cpp_Runner.debuggerPath": "gdb",
+  "C_Cpp_Runner.cStandard": "",
+  "C_Cpp_Runner.cppStandard": "",
+  "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat",
+  "C_Cpp_Runner.useMsvc": false,
+  "C_Cpp_Runner.warnings": [
+    "-Wall",
+    "-Wextra",
+    "-Wpedantic",
+    "-Wshadow",
+    "-Wformat=2",
+    "-Wcast-align",
+    "-Wconversion",
+    "-Wsign-conversion",
+    "-Wnull-dereference"
+  ],
+  "C_Cpp_Runner.msvcWarnings": [
+    "/W4",
+    "/permissive-",
+    "/w14242",
+    "/w14287",
+    "/w14296",
+    "/w14311",
+    "/w14826",
+    "/w44062",
+    "/w44242",
+    "/w14905",
+    "/w14906",
+    "/w14263",
+    "/w44265",
+    "/w14928"
+  ],
+  "C_Cpp_Runner.enableWarnings": true,
+  "C_Cpp_Runner.warningsAsError": false,
+  "C_Cpp_Runner.compilerArgs": [],
+  "C_Cpp_Runner.linkerArgs": [],
+  "C_Cpp_Runner.includePaths": [],
+  "C_Cpp_Runner.includeSearch": [
+    "*",
+    "**/*"
+  ],
+  "C_Cpp_Runner.excludeSearch": [
+    "**/build",
+    "**/build/**",
+    "**/.*",
+    "**/.*/**",
+    "**/.vscode",
+    "**/.vscode/**"
+  ],
+  "C_Cpp_Runner.useAddressSanitizer": false,
+  "C_Cpp_Runner.useUndefinedSanitizer": false,
+  "C_Cpp_Runner.useLeakSanitizer": false,
+  "C_Cpp_Runner.showCompilationTime": false,
+  "C_Cpp_Runner.useLinkTimeOptimization": false,
+  "C_Cpp_Runner.msvcSecureNoWarnings": false
 }

README.md

@@ -20,8 +20,8 @@ Supported versions:
 - `GMPE01_00`: Rev 0 (USA)
 - `GMPE01_01`: Rev 1 (USA)
 - `GMPP01_00`: Rev 0 (PAL)
-- `GMPP01_02`: REV 2 (PAL) 
-- `GMPJ01_00`: REV 0 (JP)
+- `GMPP01_02`: Rev 2 (PAL) 
+- `GMPJ01_00`: Rev 0 (JP)
 
 Dependencies
 ============

config/GMPE01_00/rels/m438Dll/symbols.txt

@@ -381,12 +381,13 @@ lbl_1_data_18 = .data:0x00000018; // type:object size:0x4
 lbl_1_data_1C = .data:0x0000001C; // type:object size:0xC
 lbl_1_data_28 = .data:0x00000028; // type:object size:0xC
 lbl_1_data_34 = .data:0x00000034; // type:object size:0xC
-lbl_1_data_40 = .data:0x00000040; // type:object size:0x23 data:string
+lbl_1_data_40 = .data:0x00000040; // type:object size:0x23 scope:local data:string
 lbl_1_data_64 = .data:0x00000064; // type:object size:0x4 data:4byte
-lbl_1_data_68 = .data:0x00000068; // type:object size:0x420
+lbl_1_data_68 = .data:0x00000068; // type:object size:0x420 data:float
 lbl_1_data_488 = .data:0x00000488; // type:object size:0x2C
 lbl_1_data_4B4 = .data:0x000004B4; // type:object size:0x30
 jumptable_1_data_4E4 = .data:0x000004E4; // type:object size:0x2C scope:local
+lbl_1_data_510 = .data:0x00000510; // type:object size:0x4
 lbl_1_data_514 = .data:0x00000514; // type:object size:0xC
 lbl_1_data_520 = .data:0x00000520; // type:object size:0x64
 lbl_1_data_584 = .data:0x00000584; // type:object size:0x64
@@ -433,6 +434,7 @@ lbl_1_data_8C8 = .data:0x000008C8; // type:object size:0x9 data:string
 lbl_1_data_8D1 = .data:0x000008D1; // type:object size:0x7 data:string
 lbl_1_data_8D8 = .data:0x000008D8; // type:object size:0x60
 lbl_1_data_938 = .data:0x00000938; // type:object size:0xB data:string
+lbl_1_bss_0 = .bss:0x00000000; // type:object size:0x4 data:4byte
 lbl_1_bss_4 = .bss:0x00000004; // type:object size:0x4 data:4byte
 lbl_1_bss_8 = .bss:0x00000008; // type:object size:0x4 data:4byte
 lbl_1_bss_C = .bss:0x0000000C; // type:object size:0x288

configure.py

@@ -1146,7 +1146,7 @@ def MatchingFor(*versions):
     Rel(
         "m438Dll",  # Chain Chomp Fever
         objects={
-            Object(NonMatching, "REL/m438Dll/main.c"),
+            Object(MatchingFor("GMPE01_00"), "REL/m438Dll/main.c"),
             Object(NonMatching, "REL/m438Dll/map.c"),
             Object(NonMatching, "REL/m438Dll/fire.c"),
         },

include/dolphin/mtx.h

@@ -31,7 +31,7 @@ typedef struct {
 
 } MtxStack, *MtxStackPtr;
 
-#define MTXDegToRad(a) ((a)*0.01745329252f)
+#define MTXDegToRad(a) ((a)*0.017453292f)
 #define MTXRadToDeg(a) ((a)*57.29577951f)
 #define MTXRowCol(m, r, c) ((m)[(r)][(c)])