From 746a06f1de77dd6ffdba76ea33bb0181773326b6 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sun, 4 Aug 2024 21:03:56 -0400 Subject: [PATCH] Use bankless symbols for VC constants This is valid according to the .sym file spec: --- tools/make_patch.c | 12 +++++++----- vc/pokecrystal11.constants.asm | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/make_patch.c b/tools/make_patch.c index 113911c6e87..85ffb34bfa4 100644 --- a/tools/make_patch.c +++ b/tools/make_patch.c @@ -103,12 +103,14 @@ int parse_number(const char *input, int base) { void parse_symbol_value(char *input, int *restrict bank, int *restrict address) { char *colon = strchr(input, ':'); - if (!colon) { - error_exit("Error: Cannot parse bank+address: \"%s\"\n", input); + if (colon) { + *colon++ = '\0'; + *bank = parse_number(input, 16); + *address = parse_number(colon, 16); + } else { + *bank = 0; + *address = parse_number(input, 16); } - *colon++ = '\0'; - *bank = parse_number(input, 16); - *address = parse_number(colon, 16); } void parse_symbols(const char *filename, struct Symbol **symbols) { diff --git a/vc/pokecrystal11.constants.asm b/vc/pokecrystal11.constants.asm index d0096641d53..8410f5f074c 100644 --- a/vc/pokecrystal11.constants.asm +++ b/vc/pokecrystal11.constants.asm @@ -2,7 +2,7 @@ MACRO vc_const DEF x = \1 - println "00:{04x:x} \1" ; same format as rgblink's .sym file + println "{02x:x} \1" ; same format as rgblink's .sym file ENDM ; [fight begin]