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

---
 constants/script_constants.asm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'constants/script_constants.asm')

diff --git a/constants/script_constants.asm b/constants/script_constants.asm
index 15a08c0..5dc3e8d 100755
--- a/constants/script_constants.asm
+++ b/constants/script_constants.asm
@@ -1,18 +1,18 @@
-
-; Script IDs
-	const_def
-	const SCRIPT_ID_00   ; 00
-	const SCRIPT_ID_01   ; 01
-	const SCRIPT_ID_02   ; 02
-	const SCRIPT_ID_03   ; 03
-	const SCRIPT_ID_04   ; 04
-	const SCRIPT_ID_05   ; 05
-	
-; Flags
-SCRIPT_FINISHED_F      EQU 7
-
-; Masks/Return Values
-SCRIPT_FINISHED_MASK EQU 1 << SCRIPT_FINISHED_F
-SCRIPT_SUCCESS  EQU $f
-SCRIPT_FAIL     EQU 0
-
+
+; Script IDs
+	const_def
+	const SCRIPT_ID_00   ; 00
+	const SCRIPT_ID_01   ; 01
+	const SCRIPT_ID_02   ; 02
+	const SCRIPT_ID_03   ; 03
+	const SCRIPT_ID_04   ; 04
+	const SCRIPT_ID_05   ; 05
+	
+; Flags
+SCRIPT_FINISHED_F      EQU 7
+
+; Masks/Return Values
+SCRIPT_FINISHED_MASK EQU 1 << SCRIPT_FINISHED_F
+SCRIPT_SUCCESS  EQU $f
+SCRIPT_FAIL     EQU 0
+
-- 
cgit v1.2.3