Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeeme…

…rald into pull-bev2
BuffelSaft · Jun 6, 2021 · 5bb8171 · 5bb8171
2 parents 35dac61 + 3448e19
commit 5bb8171
Show file tree

Hide file tree

Showing 445 changed files with 30,417 additions and 26,838 deletions.
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
@@ -1364,7 +1364,7 @@
 	various \battler, 15
 	.endm
 
-	.macro arenajudmengtstring id:req
+	.macro arenajudgmentstring id:req
 	various \id, VARIOUS_ARENA_JUDGMENT_STRING
 	.endm
 

diff --git a/asm/macros/event.inc b/asm/macros/event.inc
@@ -918,10 +918,10 @@
 	.byte 0x76
 	.endm
 
-	@ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.)
-	.macro showcontestwinner a:req
+	@ Draws an image of the winner of the contest. winnerId is any CONTEST_WINNER_* constant.
+	.macro showcontestpainting winnerId:req
 	.byte 0x77
-	.byte \a
+	.byte \winnerId
 	.endm
 
 	@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille 

diff --git a/berry_fix/charmap.txt b/berry_fix/charmap.txt
@@ -437,8 +437,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
@@ -437,8 +437,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
@@ -450,8 +450,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