ref: 4d102dcb3fde1817c109a7522864ff1ed61007d9
parent: a4bc0ab74f23ef4e208a8a86769d8f1a797180ab
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Mar 13 19:21:27 EDT 2022
Allow `vc_const` to work with charmap characters (necessary for pokegold)
--- 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
--- a/vc/pokecrystal11.constants.asm
+++ b/vc/pokecrystal11.constants.asm
@@ -3,7 +3,8 @@
; 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]