From d374d8d026c84bb4ac81e8b7ac6131199a1a5e07 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sat, 15 Aug 2020 14:08:53 -0400
Subject: [PATCH] Various repo improvements (#316)

* Narrowing down ido5-required files, assist.py, permuter settings

* OSX support changes, +x on setup scripts

* ZAP2 Update for OSX

* Remove assist.py

* Removing ido 5 things
---
 .gitignore                   | 1 +
 Makefile                     | 4 ++--
 extract_assets.py            | 0
 extract_baserom.py           | 0
 tools/ZAP2                   | 2 +-
 tools/permuter_settings.toml | 7 +++++++
 6 files changed, 11 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 extract_assets.py
 mode change 100644 => 100755 extract_baserom.py
 create mode 100644 tools/permuter_settings.toml

diff --git a/.gitignore b/.gitignore
index 9d9356c463..49d6418cdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ tools/disasm/output/*
 tools/asmsplitter/asm/*
 tools/asmsplitter/c/*
 ctx.c
+tools/*dSYM/
 
 # Assets
 *.rgba32.png
diff --git a/Makefile b/Makefile
index fc6b6b37d9..3929b5d640 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ PROJECT_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 ifeq ($(shell type mips-linux-gnu-ld >/dev/null 2>/dev/null; echo $$?), 0)
   MIPS_BINUTILS_PREFIX := mips-linux-gnu-
 else
-  MIPS_BINUTILS_PREFIX := mips64-elf-
+  $(error Please install or build mips-linux-gnu)
 endif
 
 # check that either QEMU_IRIX is set or qemu-irix package installed
@@ -160,7 +160,7 @@ build/undefined_syms.txt: undefined_syms.txt
 	$(CPP) -P $< > build/undefined_syms.txt
 
 clean:
-	$(RM) $(ROM) $(ELF) -r build
+	$(RM) -r $(ROM) $(ELF) build
 
 setup:
 	git submodule update --init --recursive
diff --git a/extract_assets.py b/extract_assets.py
old mode 100644
new mode 100755
diff --git a/extract_baserom.py b/extract_baserom.py
old mode 100644
new mode 100755
diff --git a/tools/ZAP2 b/tools/ZAP2
index a781b7b098..15fcb21d2c 160000
--- a/tools/ZAP2
+++ b/tools/ZAP2
@@ -1 +1 @@
-Subproject commit a781b7b098472076f99f52e4ad214823ea91be2d
+Subproject commit 15fcb21d2c4e2ef2f720d28a0f7dec259ddd06f5
diff --git a/tools/permuter_settings.toml b/tools/permuter_settings.toml
new file mode 100644
index 0000000000..b56a217cc5
--- /dev/null
+++ b/tools/permuter_settings.toml
@@ -0,0 +1,7 @@
+[preserve_macros]
+"g[DS]P.*" = "void"
+"gDma.*" = "void"
+LOG = "void"
+SET_FULLSCREEN_VIEWPORT = "void"
+ABS = "int"
+SQ = "int"