Merge branch 'master' of https://github.com/pret/pokefirered into nuz…

…locke
anzz1 · Jun 3, 2021 · 3e88f2b · 3e88f2b
2 parents fdc3239 + 753b19d
commit 3e88f2b
Show file tree

Hide file tree

Showing 578 changed files with 19,084 additions and 15,047 deletions.
diff --git a/berry_fix/charmap.txt b/berry_fix/charmap.txt
@@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18
 
 TRANSPARENT = 00
 WHITE = 01
-DARK_GREY = 02
-LIGHT_GREY = 03
+DARK_GRAY = 02
+LIGHT_GRAY = 03
 RED = 04
 LIGHT_RED = 05
 GREEN = 06

diff --git a/berry_fix/payload/charmap.txt b/berry_fix/payload/charmap.txt
@@ -434,8 +434,8 @@ RESUME_MUSIC = FC 18
 
 TRANSPARENT = 00
 WHITE = 01
-DARK_GREY = 02
-LIGHT_GREY = 03
+DARK_GRAY = 02
+LIGHT_GRAY = 03
 RED = 04
 LIGHT_RED = 05
 GREEN = 06

diff --git a/charmap.txt b/charmap.txt
@@ -61,6 +61,10 @@ UP_ARROW    = 79
 DOWN_ARROW  = 7A
 LEFT_ARROW  = 7B
 RIGHT_ARROW = 7C
+SUPER_E     = 84
+'<'         = 85
+'>'         = 86
+SUPER_RE    = A0
 '0'         = A1
 '1'         = A2
 '2'         = A3
@@ -452,21 +456,23 @@ BIG   = FC 06 04
 @ colors
 
 TRANSPARENT = 00
-DARK_GREY = 01
-RED = 02
-GREEN = 03
-BLUE = 04
-YELLOW = 05
-CYAN = 06
-MAGENTA = 07
-LIGHT_GRAY = 08
-BLACK = 09
-BLACK2 = 0A @ duplicate of black?
-SILVER = 0B
-WHITE = 0C
-SKY_BLUE = 0D
-LIGHT_BLUE = 0E
-WHITE2 = 0F @ duplicate of white?
+WHITE = 01
+DARK_GRAY = 02
+LIGHT_GRAY = 03
+RED = 04
+LIGHT_RED = 05
+GREEN = 06
+LIGHT_GREEN = 07
+BLUE = 08
+LIGHT_BLUE = 09
+@ these next colors can be set to anything arbitrary at runtime
+@ usually though they'll have the textbox border colors as described below
+DYNAMIC_COLOR1 = 0A @ white
+DYNAMIC_COLOR2 = 0B @ white with a tinge of green
+DYNAMIC_COLOR3 = 0C @ white 2
+DYNAMIC_COLOR4 = 0D @ aquamarine
+DYNAMIC_COLOR5 = 0E @ blue-green
+DYNAMIC_COLOR6 = 0F @ cerulean
 
 @ sound and music