move all assembly files into their own directory

Lua/inject.lua

@@ -76,7 +76,7 @@ start:
 ]]
 
 local function inject(fn, dumb)
-    local asm_dir = bizstring and 'inject/' or './mm/Lua/inject/'
+    local asm_dir = bizstring and '../patch/' or './mm/patch/'
     local asm_path = asm_dir..fn
 
     local point = dumb and no_point or injection_points[version]

asm/common.sh

@@ -3,7 +3,6 @@ fast=0
 [[ "$1" == "fast" ]] && fast=1 && shift || [[ "$1" == "test" ]] && fast=2 && shift
 args="$@"
 
-inject="$(readlink -f ../Lua/inject)"
 lips="$(readlink -f ../Lua/lib/lips)"
 YAZ0="$(readlink -f ../z64yaz0)"
 DUMP="$(readlink -f ../z64dump.py)"
@@ -74,9 +73,8 @@ copy_rom() {
 }
 
 cp *.lua build/
-cp "$inject"/*.asm build/
 cp *.asm build/
-cp *.bin build/
+#cp *.bin build/
 cd build
 
 # don't copy entire dir; avoid copying dotfiles (.git)

asm/oot-dbg-comp

@@ -325,6 +325,6 @@ if [ $fast -ne 2 ]; then
             quiet=0
         fi
     done
-    dump patch/build/patchme
+    dump asm/build/patchme
     copy_rom "$out" 32
 fi

asm/oot-spawner

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-inject=../Lua/inject
 rom=../../roms/everything/"Legend of Zelda, The - Ocarina of Time - Master Quest (E) (Debug) [f1].z64"
 lips=../Lua/lib/lips
 out=oot-spawner.z64
@@ -12,4 +11,4 @@ luajit patch.lua \
   -O 0x035D0000 -b $((0x80700000 - 0x035D0000)) \
   'spawn O EUDB MQ.asm' "$out"
 
-dump -f patch/build/"$out"
+dump -f asm/build/"$out"

asm/oot-widescreen

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-inject=../Lua/inject
 rom=../../roms/everything/"Legend of Zelda, The - Ocarina of Time - Master Quest (E) (Debug) [f1].z64"
 lips=../Lua/lib/lips
 out=oot-widescreen.z64
@@ -10,6 +9,6 @@ out=oot-widescreen.z64
 
 luajit patch.lua \
   -O 0x035D0000 -b $((0x80700000 - 0x035D0000)) \
-  widescreen-inline.asm "$out"
+  widescreen-inline-rom.asm "$out"
 
-dump -f patch/build/"$out"
+dump -f asm/build/"$out"