From 75e4f784924393ccedb27f2831e5a36fe11bada5 Mon Sep 17 00:00:00 2001
From: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
Date: Tue, 3 Jul 2018 13:36:50 -0400
Subject: Merge branch 'master' of
 https://github.com/luckytyphlosion/pokegold-spaceworld

---
 macros/queue.asm   | 34 +++++++++++++++++-----------------
 macros/scripts.asm | 28 ++++++++++++++--------------
 2 files changed, 31 insertions(+), 31 deletions(-)

(limited to 'macros')

diff --git a/macros/queue.asm b/macros/queue.asm
index c868dc8..37fb1cb 100755
--- a/macros/queue.asm
+++ b/macros/queue.asm
@@ -1,17 +1,17 @@
-queue_ab: MACRO
-	ld hl, \1
-	ldh a, [hROMBank]
-	call QueueScript
-ENDM
-
-queue_ba: MACRO
-	ldh a, [hROMBank]
-	ld hl, \1
-	call QueueScript
-ENDM
-
-far_queue: MACRO
-	ld hl, \1
-	ld a, BANK(\1)
-	call QueueScript
-ENDM
+queue_ab: MACRO
+	ld hl, \1
+	ldh a, [hROMBank]
+	call QueueScript
+ENDM
+
+queue_ba: MACRO
+	ldh a, [hROMBank]
+	ld hl, \1
+	call QueueScript
+ENDM
+
+far_queue: MACRO
+	ld hl, \1
+	ld a, BANK(\1)
+	call QueueScript
+ENDM
diff --git a/macros/scripts.asm b/macros/scripts.asm
index 73ad461..e392391 100755
--- a/macros/scripts.asm
+++ b/macros/scripts.asm
@@ -1,14 +1,14 @@
-init_script_table: MACRO
-script_id = 0	
-ENDM
-
-add_script: MACRO
-	dw \1
-\1ScriptID = script_id
-script_id = script_id + 1
-ENDM
-
-set_script: MACRO
-	ld a, \1ScriptID
-	ld [wFieldMoveScriptID], a
-ENDM
+init_script_table: MACRO
+script_id = 0	
+ENDM
+
+add_script: MACRO
+	dw \1
+\1ScriptID = script_id
+script_id = script_id + 1
+ENDM
+
+set_script: MACRO
+	ld a, \1ScriptID
+	ld [wFieldMoveScriptID], a
+ENDM
-- 
cgit v1.2.3