From f28e6e78c6c73ff7609a7c057e101ae309a0bbfa Mon Sep 17 00:00:00 2001 From: Connor Olding Date: Tue, 27 Sep 2016 13:46:50 -0700 Subject: [PATCH] move all assembly files into their own directory --- Lua/inject.lua | 2 +- {patch => asm}/.gitignore | 0 {patch => asm}/argparse.lua | 0 {Lua/inject => asm}/beta.asm | 0 {Lua/inject => asm}/bombtornado.asm | 0 {patch => asm}/code.asm | 0 {patch => asm}/common.asm | 0 {patch => asm}/common.sh | 4 +--- {Lua/inject => asm}/crc32.asm | 0 {patch => asm}/dma O EUDB MQ.asm | 0 {Lua/inject => asm}/dpad control.asm | 0 {Lua/inject => asm}/entrances.asm | 0 {patch => asm}/extra.asm | 0 {patch => asm}/extra.lua | 0 {patch => asm}/mm-bq | 0 {patch => asm}/oot-dbg-comp | 2 +- {patch => asm}/oot-spawner | 3 +-- {patch => asm}/oot-widescreen | 5 ++--- {patch => asm}/patch.lua | 0 {Lua/inject => asm}/print.asm | 0 {patch => asm}/serialize.lua | 0 {Lua/inject => asm}/simple spawn.asm | 0 {Lua/inject => asm}/simple text.asm | 0 {patch => asm}/spawn O EUDB MQ.asm | 0 {Lua/inject => asm}/spawn mm early.asm | 0 {Lua/inject => asm}/spawn mm.asm | 0 {Lua/inject => asm}/spawn oot.asm | 0 {Lua/inject => asm}/spawn.asm | 0 {Lua/inject => asm}/widescreen-either.asm | 0 patch/widescreen-inline.asm => asm/widescreen-inline-rom.asm | 0 {Lua/inject => asm}/widescreen-inline.asm | 0 31 files changed, 6 insertions(+), 10 deletions(-) rename {patch => asm}/.gitignore (100%) rename {patch => asm}/argparse.lua (100%) rename {Lua/inject => asm}/beta.asm (100%) rename {Lua/inject => asm}/bombtornado.asm (100%) rename {patch => asm}/code.asm (100%) rename {patch => asm}/common.asm (100%) rename {patch => asm}/common.sh (95%) rename {Lua/inject => asm}/crc32.asm (100%) rename {patch => asm}/dma O EUDB MQ.asm (100%) rename {Lua/inject => asm}/dpad control.asm (100%) rename {Lua/inject => asm}/entrances.asm (100%) rename {patch => asm}/extra.asm (100%) rename {patch => asm}/extra.lua (100%) rename {patch => asm}/mm-bq (100%) rename {patch => asm}/oot-dbg-comp (99%) rename {patch => asm}/oot-spawner (85%) rename {patch => asm}/oot-widescreen (76%) rename {patch => asm}/patch.lua (100%) rename {Lua/inject => asm}/print.asm (100%) rename {patch => asm}/serialize.lua (100%) rename {Lua/inject => asm}/simple spawn.asm (100%) rename {Lua/inject => asm}/simple text.asm (100%) rename {patch => asm}/spawn O EUDB MQ.asm (100%) rename {Lua/inject => asm}/spawn mm early.asm (100%) rename {Lua/inject => asm}/spawn mm.asm (100%) rename {Lua/inject => asm}/spawn oot.asm (100%) rename {Lua/inject => asm}/spawn.asm (100%) rename {Lua/inject => asm}/widescreen-either.asm (100%) rename patch/widescreen-inline.asm => asm/widescreen-inline-rom.asm (100%) rename {Lua/inject => asm}/widescreen-inline.asm (100%) diff --git a/Lua/inject.lua b/Lua/inject.lua index ef659dc..3d021b2 100644 --- a/Lua/inject.lua +++ b/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] diff --git a/patch/.gitignore b/asm/.gitignore similarity index 100% rename from patch/.gitignore rename to asm/.gitignore diff --git a/patch/argparse.lua b/asm/argparse.lua similarity index 100% rename from patch/argparse.lua rename to asm/argparse.lua diff --git a/Lua/inject/beta.asm b/asm/beta.asm similarity index 100% rename from Lua/inject/beta.asm rename to asm/beta.asm diff --git a/Lua/inject/bombtornado.asm b/asm/bombtornado.asm similarity index 100% rename from Lua/inject/bombtornado.asm rename to asm/bombtornado.asm diff --git a/patch/code.asm b/asm/code.asm similarity index 100% rename from patch/code.asm rename to asm/code.asm diff --git a/patch/common.asm b/asm/common.asm similarity index 100% rename from patch/common.asm rename to asm/common.asm diff --git a/patch/common.sh b/asm/common.sh similarity index 95% rename from patch/common.sh rename to asm/common.sh index f999913..720c35b 100644 --- a/patch/common.sh +++ b/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) diff --git a/Lua/inject/crc32.asm b/asm/crc32.asm similarity index 100% rename from Lua/inject/crc32.asm rename to asm/crc32.asm diff --git a/patch/dma O EUDB MQ.asm b/asm/dma O EUDB MQ.asm similarity index 100% rename from patch/dma O EUDB MQ.asm rename to asm/dma O EUDB MQ.asm diff --git a/Lua/inject/dpad control.asm b/asm/dpad control.asm similarity index 100% rename from Lua/inject/dpad control.asm rename to asm/dpad control.asm diff --git a/Lua/inject/entrances.asm b/asm/entrances.asm similarity index 100% rename from Lua/inject/entrances.asm rename to asm/entrances.asm diff --git a/patch/extra.asm b/asm/extra.asm similarity index 100% rename from patch/extra.asm rename to asm/extra.asm diff --git a/patch/extra.lua b/asm/extra.lua similarity index 100% rename from patch/extra.lua rename to asm/extra.lua diff --git a/patch/mm-bq b/asm/mm-bq similarity index 100% rename from patch/mm-bq rename to asm/mm-bq diff --git a/patch/oot-dbg-comp b/asm/oot-dbg-comp similarity index 99% rename from patch/oot-dbg-comp rename to asm/oot-dbg-comp index 87327fd..1973ed9 100644 --- a/patch/oot-dbg-comp +++ b/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 diff --git a/patch/oot-spawner b/asm/oot-spawner similarity index 85% rename from patch/oot-spawner rename to asm/oot-spawner index 179548a..5b89a91 100755 --- a/patch/oot-spawner +++ b/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" diff --git a/patch/oot-widescreen b/asm/oot-widescreen similarity index 76% rename from patch/oot-widescreen rename to asm/oot-widescreen index 894b316..bb12e0b 100755 --- a/patch/oot-widescreen +++ b/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" diff --git a/patch/patch.lua b/asm/patch.lua similarity index 100% rename from patch/patch.lua rename to asm/patch.lua diff --git a/Lua/inject/print.asm b/asm/print.asm similarity index 100% rename from Lua/inject/print.asm rename to asm/print.asm diff --git a/patch/serialize.lua b/asm/serialize.lua similarity index 100% rename from patch/serialize.lua rename to asm/serialize.lua diff --git a/Lua/inject/simple spawn.asm b/asm/simple spawn.asm similarity index 100% rename from Lua/inject/simple spawn.asm rename to asm/simple spawn.asm diff --git a/Lua/inject/simple text.asm b/asm/simple text.asm similarity index 100% rename from Lua/inject/simple text.asm rename to asm/simple text.asm diff --git a/patch/spawn O EUDB MQ.asm b/asm/spawn O EUDB MQ.asm similarity index 100% rename from patch/spawn O EUDB MQ.asm rename to asm/spawn O EUDB MQ.asm diff --git a/Lua/inject/spawn mm early.asm b/asm/spawn mm early.asm similarity index 100% rename from Lua/inject/spawn mm early.asm rename to asm/spawn mm early.asm diff --git a/Lua/inject/spawn mm.asm b/asm/spawn mm.asm similarity index 100% rename from Lua/inject/spawn mm.asm rename to asm/spawn mm.asm diff --git a/Lua/inject/spawn oot.asm b/asm/spawn oot.asm similarity index 100% rename from Lua/inject/spawn oot.asm rename to asm/spawn oot.asm diff --git a/Lua/inject/spawn.asm b/asm/spawn.asm similarity index 100% rename from Lua/inject/spawn.asm rename to asm/spawn.asm diff --git a/Lua/inject/widescreen-either.asm b/asm/widescreen-either.asm similarity index 100% rename from Lua/inject/widescreen-either.asm rename to asm/widescreen-either.asm diff --git a/patch/widescreen-inline.asm b/asm/widescreen-inline-rom.asm similarity index 100% rename from patch/widescreen-inline.asm rename to asm/widescreen-inline-rom.asm diff --git a/Lua/inject/widescreen-inline.asm b/asm/widescreen-inline.asm similarity index 100% rename from Lua/inject/widescreen-inline.asm rename to asm/widescreen-inline.asm