From 699495bfcb732559114ad1450e704844a86308a1 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Sun, 10 Dec 2017 13:37:15 -0500
Subject: Consistent capitalization for map names, matching their constants

---
 constants/wram_constants.asm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'constants/wram_constants.asm')

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 5bb1013ac..424595ec4 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -95,13 +95,13 @@ NUM_OBJECT_STRUCTS EQU 13
 
 ; After-Champion Spawn
 SPAWN_LANCE EQU 1
-SPAWN_RED EQU 2
+SPAWN_RED   EQU 2
 
 ; wPokemonWithdrawDepositParameter
-PC_WITHDRAW EQU 0
-PC_DEPOSIT EQU 1
-DAYCARE_WITHDRAW EQU 2
-DAYCARE_DEPOSIT EQU 3
+PC_WITHDRAW       EQU 0
+PC_DEPOSIT        EQU 1
+DAY_CARE_WITHDRAW EQU 2
+DAY_CARE_DEPOSIT  EQU 3
 
 ; wCurrentDexMode
 	const_def
-- 
cgit v1.2.3


From 41acb0667a321865277f50a45e662b1aae939a00 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Mon, 11 Dec 2017 01:02:28 -0500
Subject: Document macros/map.asm Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F;
 use MORN/DAY/NITE for shifted values (cleaner for person_events) Prefix FLOOR
 to the `elevfloor` constants

---
 constants/wram_constants.asm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'constants/wram_constants.asm')

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 424595ec4..ade157165 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -46,10 +46,15 @@ FACE_RIGHT EQU 1
 
 ; TimeOfDay: ; d269
 	const_def
-	const MORN     ; 0
-	const DAY      ; 1
-	const NITE     ; 2
-	const DARKNESS ; 3
+	const MORN_F     ; 0
+	const DAY_F      ; 1
+	const NITE_F     ; 2
+	const DARKNESS_F ; 3
+
+MORN     EQU 1 << MORN_F
+DAY      EQU 1 << DAY_F
+NITE     EQU 1 << NITE_F
+DARKNESS EQU 1 << DARKNESS_F
 
 ; ScriptFlags: ; d434
 SCRIPT_RUNNING EQU 2
-- 
cgit v1.2.3


From 31cce83e9b3bab01d8a605b170549fbd25ca5fee Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Mon, 11 Dec 2017 13:47:58 -0500
Subject: Move lots of data tables into individual data/ files (This is not
 expected to be their final location, but it makes them easier to relocate
 when necessary, and easier for users to edit until the whole project's file
 structure is finalized.)

---
 constants/wram_constants.asm | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

(limited to 'constants/wram_constants.asm')

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index ade157165..a1047fc53 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -7,27 +7,38 @@
 	const WILDMON    ; 4
 
 ; Options: (bits) ; cfcc
-const_value SET 5
-	const STEREO       ; 5
-	const BATTLE_SHIFT ; 6
-	const BATTLE_SCENE ; 7
-
-; Options: (bits 0-2 values) ; cfcc
-FAST_TEXT      EQU 0
-MED_TEXT       EQU 1
-SLOW_TEXT      EQU 2
-NO_TEXT_SCROLL EQU 4
+const_value SET 4
+	const NO_TEXT_SCROLL ; 4
+	const STEREO         ; 5
+	const BATTLE_SHIFT   ; 6
+	const BATTLE_SCENE   ; 7
+
+; Options: (bits 0-2)
+TEXT_DELAY_FAST EQU 1
+TEXT_DELAY_MED  EQU 3
+TEXT_DELAY_SLOW EQU 5
+
+; TextBoxFrame: ; cfce
+	const_def
+	const FRAME_1 ; 0
+	const FRAME_2 ; 1
+	const FRAME_3 ; 2
+	const FRAME_4 ; 3
+	const FRAME_5 ; 4
+	const FRAME_6 ; 5
+	const FRAME_7 ; 6
+	const FRAME_8 ; 7
 
 ; Options2:
 	const_def
 	const MENU_ACCOUNT ; 0
 
 ; GBPrinter:
-PRINT_LIGHTEST EQU $00
-PRINT_LIGHTER  EQU $20
-PRINT_NORMAL   EQU $40
-PRINT_DARKER   EQU $60
-PRINT_DARKEST  EQU $7f
+GBPRINTER_LIGHTEST EQU $00
+GBPRINTER_LIGHTER  EQU $20
+GBPRINTER_NORMAL   EQU $40
+GBPRINTER_DARKER   EQU $60
+GBPRINTER_DARKEST  EQU $7f
 
 ; WalkingDirection: ; d043
 const_value SET -1
-- 
cgit v1.2.3


From 5be98bae3c3c27b4b57bb8fda9368cf6c7f0d473 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Mon, 11 Dec 2017 15:20:32 -0500
Subject: Move more data tables into data/ files.

---
 constants/wram_constants.asm | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'constants/wram_constants.asm')

diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index a1047fc53..23692fdef 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -48,6 +48,11 @@ const_value SET -1
 	const LEFT     ; 2
 	const RIGHT    ; 3
 
+DOWN_MASK  EQU 1 << DOWN
+UP_MASK    EQU 1 << UP
+LEFT_MASK  EQU 1 << LEFT
+RIGHT_MASK EQU 1 << RIGHT
+
 ; FacingDirection: ; d044
 FACE_CURRENT EQU 0
 FACE_DOWN  EQU 8
-- 
cgit v1.2.3