From 4d102dcb3fde1817c109a7522864ff1ed61007d9 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 13 Mar 2022 23:21:27 -0400
Subject: [PATCH] Allow `vc_const` to work with charmap characters (necessary
 for pokegold)

---
 macros/vc.asm                  | 30 +++++++++++++++---------------
 vc/pokecrystal11.constants.asm |  3 ++-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/macros/vc.asm b/macros/vc.asm
index 781aa0b40..27cdb88b3 100644
--- a/macros/vc.asm
+++ b/macros/vc.asm
@@ -1,27 +1,27 @@
 vc_hook: MACRO
-    if DEF(_CRYSTAL11_VC)
-        .VC_\1::
-    endc
+if DEF(_CRYSTAL11_VC)
+.VC_\1::
+endc
 ENDM
 
 vc_patch: MACRO
-   if DEF(_CRYSTAL11_VC)
-        assert !DEF(CURRENT_VC_PATCH), "Already started a vc_patch"
+if DEF(_CRYSTAL11_VC)
+	assert !DEF(CURRENT_VC_PATCH), "Already started a vc_patch"
 CURRENT_VC_PATCH EQUS "\1"
-	.VC_{CURRENT_VC_PATCH}::
-    endc
+.VC_{CURRENT_VC_PATCH}::
+endc
 ENDM
 
 vc_patch_end: MACRO
-    if DEF(_CRYSTAL11_VC)
-        assert DEF(CURRENT_VC_PATCH), "No vc_patch started"
-        .VC_{CURRENT_VC_PATCH}_End::
-PURGE CURRENT_VC_PATCH
-    endc
+if DEF(_CRYSTAL11_VC)
+	assert DEF(CURRENT_VC_PATCH), "No vc_patch started"
+.VC_{CURRENT_VC_PATCH}_End::
+	PURGE CURRENT_VC_PATCH
+endc
 ENDM
 
 vc_assert: MACRO
-    if DEF(_CRYSTAL11_VC)
-        assert \#
-    endc
+if DEF(_CRYSTAL11_VC)
+	assert \#
+endc
 ENDM
diff --git a/vc/pokecrystal11.constants.asm b/vc/pokecrystal11.constants.asm
index 87a3c90b4..48aa45ac7 100644
--- a/vc/pokecrystal11.constants.asm
+++ b/vc/pokecrystal11.constants.asm
@@ -3,7 +3,8 @@ INCLUDE "constants.asm"
 ; These are all the asm constants needed to make the crystal11_vc patch.
 
 vc_const: MACRO
-	println "00:{04x:\1} \1" ; same format as rgblink's .sym file
+x = \1
+	println "00:{04x:x} \1" ; same format as rgblink's .sym file
 ENDM
 
 ; [fight begin]