rom patching

.editorconfig

@@ -15,3 +15,6 @@ indent_size = 2
 [{package-lock,package}.json]
 indent_style = space
 indent_size = 2
+
+[Makefile]
+indent_style = tab

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "patches/papermario"]
+	path = patches/papermario
+	url = [email protected]:pmret/papermario.git

.vscode/c_cpp_properties.json

@@ -0,0 +1,31 @@
+{
+    "version": 4,
+    "configurations": [
+        {
+            "name": "papermario",
+            "browse": {
+                "limitSymbolsToIncludedHeaders": true,
+                "path": [
+                    "${workspaceFolder}/patches/papermario/include",
+                    "${workspaceFolder}/patches/papermario/src"
+                ]
+            },
+            "includePath": [
+                "${workspaceFolder}/patches/papermario/include",
+                //"${workspaceFolder}/patches/papermario/ver/us/build/include",
+                "${workspaceFolder}/patches/papermario/src"
+                //"${workspaceFolder}/patches/papermario/assets/us"
+            ],
+            "defines": [
+                "F3DEX_GBI_2",
+                "_LANGUAGE_C",
+                "_MIPS_SZLONG=32",
+                "VERSION=us",
+                "VERSION_US"
+            ],
+            "cStandard": "c89",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "${default}"
+        }
+    ]
+}

.vscode/settings.json

@@ -18,4 +18,5 @@
         "editor.defaultFormatter": "dbaeumer.vscode-eslint",
         "editor.formatOnSave": true,
     },
+    "clang-tidy.blacklist": ["*"]
 }

mamar-web/package.json

@@ -17,6 +17,7 @@
     "idb-keyval": "^6.2.0",
     "mamar-wasm-bridge": "*",
     "mupen64plus-web": "^1.3.2",
+    "patches": "*",
     "pm64-typegen": "*",
     "react": "^18.2.0",
     "react-aria": "^3.19.0",

mamar-web/src/app/emu/PlaybackControls.tsx

@@ -1,30 +1,46 @@
 import { ActionButton, Flex, ToggleButton, View } from "@adobe/react-spectrum"
 import Play from "@spectrum-icons/workflow/Play"
-import { useEffect, useState } from "react"
+import * as patches from "patches"
+import { Bgm } from "pm64-typegen"
+import { useEffect, useMemo, useState } from "react"
 
 import { useBgm } from "../store"
 import useMupen from "../util/hooks/useMupen"
 import useRomData from "../util/hooks/useRomData"
+import Patcher from "../util/Patcher"
 
 import "./PlaybackControls.scss"
 
+function usePatchedRom(bgm: Bgm | undefined): ArrayBuffer | undefined {
+    const cleanRom = useRomData()
+
+    return useMemo(() => {
+        if (!bgm) {
+            return undefined
+        }
+
+        const rom = cleanRom.slice(0)
+        //const patcher = new Patcher(rom)
+        //patcher.overwriteFunction(0xF4A4, patches.skipIntroLogos)
+        //patcher.overwriteFunction(0x10, [0x1B99678D, 0xE109577C])
+
+        // TODO: encode bgm, write over Toad Town in SBN
+
+        return rom
+    }, [cleanRom, bgm])
+}
+
 export default function PlaybackControls() {
     const [bgm] = useBgm()
     const [isPlaying, setIsPlaying] = useState(false)
-    const romData = useRomData()
+    const romData = usePatchedRom(isPlaying ? bgm : undefined)
     const mupen = useMupen(romData)
 
     useEffect(() => {
-        if (!mupen || !bgm) {
-            mupen?.pause?.()
-            setIsPlaying(false)
-            return
-        }
-
         if (isPlaying) {
-            mupen.resume()
+            mupen?.resume?.()
         } else {
-            mupen.pause()
+            mupen?.pause?.()
         }
 
         const onKeydown = (event: KeyboardEvent) => {
@@ -34,21 +50,13 @@ export default function PlaybackControls() {
         }
         document.addEventListener("keydown", onKeydown)
         return () => document.removeEventListener("keydown", onKeydown)
-    }, [mupen, bgm, isPlaying])
+    }, [mupen, isPlaying])
 
     if (!bgm) {
         return <View />
     }
 
     return <Flex alignItems="center">
-        <ActionButton
-            onPress={() => {
-                mupen?.reloadRom(romData)
-            }}
-        >
-            Reload
-        </ActionButton>
-
         <ActionButton
             onPress={() => {
                 mupen?.softReset()

mamar-web/src/app/util/Patcher.ts

@@ -0,0 +1,13 @@
+export default class Patcher {
+    dv: DataView
+
+    constructor(rom: ArrayBuffer) {
+        this.dv = new DataView(rom)
+    }
+
+    overwriteFunction(romAddr: number, dataU32: number[]) {
+        for (let i = 0; i < dataU32.length; i++) {
+            this.dv.setUint32(romAddr + i * 4, dataU32[i], false)
+        }
+    }
+}

mamar-web/src/app/util/hooks/useMupen.ts

@@ -63,10 +63,15 @@ export default function useMupen(romData: ArrayBuffer | undefined): EmulatorCont
                 break
             console.log("reloading ROM")
             state.current = State.RELOADING
-            mupen.reloadRom(romData).finally(() => {
-                console.log("rom reload complete")
-                state.current = State.READY
-            })
+
+            // Emulator must be running to reload rom
+            mupen.resume()
+                .then(() => new Promise(r => setTimeout(r, 100)))
+                .then(() => mupen.reloadRom(romData))
+                .finally(() => {
+                    console.log("rom reload complete")
+                    state.current = State.READY
+                })
             break
         case State.RELOADING:
             console.warn("ignoring ROM reload, already reloading")

n64crc/Makefile

@@ -0,0 +1,12 @@
+CFLAGS ?= -O2
+
+all: build/n64crc.mjs build/n64crc
+
+build/n64crc: n64crc.c
+	gcc $(CFLAGS) -o $@ $<
+
+build/n64crc.mjs: n64crc.c
+	emcc $(CFLAGS) -DEMSCRIPTEN -sEXPORTED_RUNTIME_METHODS=ccall,cwrap -o $@ $<
+
+clean:
+	rm -f build/n64crc.mjs build/n64crc