Merge remote-tracking branch 'upstream/master' into coord

2026-08-01 00:08:54 -04:00 · 2022-01-23 17:24:55 +02:00
parent a1ae3b229b 85aaada18f
commit 70e2ef5877
149 changed files with 693 additions and 827 deletions
@@ -29335,16 +29335,6 @@
    "start": 862648,
    "size": 8
  },
-  {
-    "path": "enemy66/gUnk_080D2ABC.bin",
-    "start": 862908,
-    "size": 88
-  },
-  {
-    "path": "enemy66/gUnk_080D2ABC_1.bin",
-    "start": 863000,
-    "size": 320
-  },
  {
    "path": "data_080D3D94/gUnk_080D3D94.bin",
    "start": 867732,
@@ -2861,7 +2861,7 @@
    "size": 52
  },
  {
-    "path": "sounds/sfx10C.bin",
+    "path": "sounds/sfxButtonPress.bin",
    "start": 14557448,
    "type": "midi",
    "options": {
@@ -3906,7 +3906,7 @@
    "size": 60
  },
  {
-    "path": "sounds/sfx16B.bin",
+    "path": "sounds/sfxPressurePlate.bin",
    "start": 14565100,
    "type": "midi",
    "options": {