new border!

data/pokemon/new_dex_text.asm

@@ -19,13 +19,13 @@ _GuardiaDexEntry::
 	dex
 
 _DeerDexEntry::
-	text "Once hunted"
-	next "in the past for"
-	next "its impressive"
+	text "It wildly swings"
+	next "its huge antlers"
+	next "to deter threats."
 
-	page "antlers, it's"
-	next "now under strict"
-	next "protection"
+	page "However, these"
+	next "antlers are highly"
+	next "prized by hunters"
 	dex
 
 _MadaamuDexEntry::
@@ -265,7 +265,7 @@ _CroakozunaDexEntry::
 
 	page "Then, it strikes"
 	next "with a flurry"
-	next "of strong slaps."
+	next "of strong slaps"
 	dex
 
 _GorotoraDexEntry::
@@ -275,7 +275,7 @@ _GorotoraDexEntry::
 
 	page "only be tamed"
 	next "by the bravest"
-	next "#MON TRAINERs"
+	next "#MON trainers"
 	dex
 
 _OmegaDexEntry::
@@ -359,13 +359,13 @@ _BarundaDexEntry::
 	dex
 
 _TsubomittoDexEntry::
-	text "A larger form"
-	next "of BELLSPROUT"
-	next "revered elsewhere."
+	text "A plant #MON"
+	next "that's revered in"
+	next "another region."
 
 	page "It can absorb"
 	next "useful nutrients"
-	next "found in soil."
+	next "found in soil"
 	dex
 
 _AnimonDexEntry::

data/sgb/sgb_border.asm

@@ -1,62 +1,28 @@
 BorderPalettes:
-IF DEF(_RED)
-	INCBIN "gfx/sgb/red_border.tilemap"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/sgb/blue_border.tilemap"
-ENDC
+	INCBIN "gfx/sgb/sgb_border.tilemap"
 
 	ds $100
 
-IF DEF(_RED)
-	RGB 30,29,29 ; PAL_SGB1
-	RGB 25,22,25
-	RGB 25,17,21
-	RGB 24,14,12
-ENDC
-IF DEF(_BLUE)
-	RGB 0,0,0 ; PAL_SGB1 (the first color is not defined, but if used, turns up as 30,29,29... o_O)
-	RGB 10,17,26
-	RGB 5,9,20
-	RGB 16,20,27
-ENDC
+	RGB 31,31,31 ; PAL_SGB1
+	RGB 31,31,00
+	RGB 16,18,31
+	RGB 03,03,03
 
 	ds $18
 
-IF DEF(_RED)
-	RGB 30,29,29 ; PAL_SGB2
-	RGB 22,31,16
-	RGB 27,20,6
-	RGB 15,15,15
-ENDC
-IF DEF(_BLUE)
-	RGB 30,29,29 ; PAL_SGB2
-	RGB 27,11,6
-	RGB 5,9,20
-	RGB 28,25,15
-ENDC
+	RGB 31,31,31 ; PAL_SGB2
+	RGB 31,17,00
+	RGB 28,14,00
+	RGB 03,03,03
 
 	ds $18
 
-IF DEF(_RED)
-	RGB 30,29,29 ; PAL_SGB3
-	RGB 31,31,17
-	RGB 18,21,29
-	RGB 15,15,15
-ENDC
-IF DEF(_BLUE)
-	RGB 30,29,29 ; PAL_SGB3
-	RGB 12,15,11
-	RGB 5,9,20
-	RGB 14,22,17
-ENDC
+	RGB 31,31,31 ; PAL_SGB3
+	RGB 31,15,18
+	RGB 01,22,06
+	RGB 03,03,03
 
 	ds $18
 
 SGBBorderGraphics:
-IF DEF(_RED)
-	INCBIN "gfx/sgb/red_border.2bpp"
-ENDC
-IF DEF(_BLUE)
-	INCBIN "gfx/sgb/blue_border.2bpp"
-ENDC
+	INCBIN "gfx/sgb/sgb_border.2bpp"