From aad94c34334ee44f1298175df38f14dc27ae5fb8 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Wed, 16 Dec 2020 13:15:54 -0500
Subject: Fix asmdiff.sh to work without DKP, also improve the makefile command
 for recognizing a toolchain.

The new command requires the toolchain binary path to exist in the file system before building using a toolchain (to handle the case where gba-dev is uninstalled but $(DEVKITARM) still exists))
---
 asmdiff.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'asmdiff.sh')

diff --git a/asmdiff.sh b/asmdiff.sh
index 9e8749acf..534281fdf 100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 
-OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
+if [[ -d "$DEVKITARM/bin/" ]]; then
+    OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
+else
+    OBJDUMP_BIN="arm-none-eabi-objdump"
+fi
+OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
 OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 $OBJDUMP $OPTIONS baserom.gba > baserom.dump
 $OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
-- 
cgit v1.2.3


From cc5db41f30708c1cc2d33a46879c96a9404764a3 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Wed, 16 Dec 2020 13:29:02 -0500
Subject: Revert multiple source change commits for rebase.

---
 asmdiff.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'asmdiff.sh')

diff --git a/asmdiff.sh b/asmdiff.sh
index 534281fdf..9e8749acf 100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,11 +1,6 @@
 #!/bin/bash
 
-if [[ -d "$DEVKITARM/bin/" ]]; then
-    OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
-else
-    OBJDUMP_BIN="arm-none-eabi-objdump"
-fi
-OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
+OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
 OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 $OBJDUMP $OPTIONS baserom.gba > baserom.dump
 $OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
-- 
cgit v1.2.3


From 936ba7f1bf492a805596716660cd751e35fc74cd Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Wed, 16 Dec 2020 15:10:01 -0500
Subject: Apply all source related changes for the new INSTALL.md in one
 commit.

For people who want to have dkPless builds in their repo.
---
 asmdiff.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'asmdiff.sh')

diff --git a/asmdiff.sh b/asmdiff.sh
index 6ea588131..f5a701074 100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,11 +1,19 @@
 #!/bin/bash
 
-OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
+if [[ -d "$DEVKITARM/bin/" ]]; then
+    OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
+else
+    OBJDUMP_BIN="arm-none-eabi-objdump"
+fi
+
+OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
+
 if [ $(($1)) -ge $((0x8000000)) ]; then
     OPTIONS="--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))"
 else
     OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 fi
+
 $OBJDUMP $OPTIONS baserom.gba > baserom.dump
 $OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
 diff -u baserom.dump pokeemerald.dump
-- 
cgit v1.2.3


From 345aab63cf2550646a6a56c2c8fe8473d5bf996a Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Wed, 16 Dec 2020 20:31:10 -0500
Subject: [Round 2] Revert multiple source change commits for re-commit.

---
 asmdiff.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'asmdiff.sh')

diff --git a/asmdiff.sh b/asmdiff.sh
index f5a701074..6ea588131 100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,19 +1,11 @@
 #!/bin/bash
 
-if [[ -d "$DEVKITARM/bin/" ]]; then
-    OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
-else
-    OBJDUMP_BIN="arm-none-eabi-objdump"
-fi
-
-OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
-
+OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
 if [ $(($1)) -ge $((0x8000000)) ]; then
     OPTIONS="--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))"
 else
     OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 fi
-
 $OBJDUMP $OPTIONS baserom.gba > baserom.dump
 $OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
 diff -u baserom.dump pokeemerald.dump
-- 
cgit v1.2.3


From 166183d5ed73059922b9679b832b591dd6fa073b Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Wed, 16 Dec 2020 20:31:56 -0500
Subject: [Round 2] Apply all source related changes for the new INSTALL.md in
 one commit.

---
 asmdiff.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'asmdiff.sh')

diff --git a/asmdiff.sh b/asmdiff.sh
index 6ea588131..f5a701074 100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,11 +1,19 @@
 #!/bin/bash
 
-OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
+if [[ -d "$DEVKITARM/bin/" ]]; then
+    OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
+else
+    OBJDUMP_BIN="arm-none-eabi-objdump"
+fi
+
+OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
+
 if [ $(($1)) -ge $((0x8000000)) ]; then
     OPTIONS="--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))"
 else
     OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 fi
+
 $OBJDUMP $OPTIONS baserom.gba > baserom.dump
 $OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
 diff -u baserom.dump pokeemerald.dump
-- 
cgit v1.2.3


From 5a5acfb0ada48c89d1e398dea3fd3ef701213b60 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Wed, 16 Dec 2020 21:24:08 -0500
Subject: [Round 3] Revert multiple source change commits for re-commit.

---
 asmdiff.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'asmdiff.sh')

diff --git a/asmdiff.sh b/asmdiff.sh
index f5a701074..6ea588131 100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,19 +1,11 @@
 #!/bin/bash
 
-if [[ -d "$DEVKITARM/bin/" ]]; then
-    OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
-else
-    OBJDUMP_BIN="arm-none-eabi-objdump"
-fi
-
-OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
-
+OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
 if [ $(($1)) -ge $((0x8000000)) ]; then
     OPTIONS="--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))"
 else
     OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 fi
-
 $OBJDUMP $OPTIONS baserom.gba > baserom.dump
 $OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
 diff -u baserom.dump pokeemerald.dump
-- 
cgit v1.2.3


From 3d686116d8acb9f3daa1db9669de6eca11a861d5 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Wed, 16 Dec 2020 21:24:44 -0500
Subject: [Round 3] Apply all source related changes for the new INSTALL.md in
 one commit.

---
 asmdiff.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'asmdiff.sh')

diff --git a/asmdiff.sh b/asmdiff.sh
index 6ea588131..f5a701074 100755
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,11 +1,19 @@
 #!/bin/bash
 
-OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
+if [[ -d "$DEVKITARM/bin/" ]]; then
+    OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
+else
+    OBJDUMP_BIN="arm-none-eabi-objdump"
+fi
+
+OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
+
 if [ $(($1)) -ge $((0x8000000)) ]; then
     OPTIONS="--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))"
 else
     OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 fi
+
 $OBJDUMP $OPTIONS baserom.gba > baserom.dump
 $OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
 diff -u baserom.dump pokeemerald.dump
-- 
cgit v1.2.3