diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-03-13 23:21:27 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2022-03-13 23:21:27 -0400 |
| commit | 4d102dcb3fde1817c109a7522864ff1ed61007d9 (patch) | |
| tree | 2df9682e564e5ab9523c090d74bd694d015f1664 | |
| parent | a4bc0ab74f23ef4e208a8a86769d8f1a797180ab (diff) | |
Allow `vc_const` to work with charmap characters (necessary for pokegold)
| -rw-r--r-- | macros/vc.asm | 30 | ||||
| -rw-r--r-- | 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] |