Use exported constants for VC patch

Makefile

@@ -117,7 +117,7 @@ $(pokecrystal_debug_obj):   RGBASMFLAGS += -D _DEBUG
 $(pokecrystal11_debug_obj): RGBASMFLAGS += -D _CRYSTAL11 -D _DEBUG
 $(pokecrystal11_vc_obj):    RGBASMFLAGS += -D _CRYSTAL11 -D _CRYSTAL11_VC
 
-%.patch: vc/%.constants.sym %_vc.gbc %.gbc vc/%.patch.template
+%.patch: %_vc.gbc %.gbc vc/%.patch.template
 	tools/make_patch $*_vc.sym $^ $@
 
 rgbdscheck.o: rgbdscheck.asm
@@ -146,10 +146,6 @@ $(foreach obj, $(pokecrystal_debug_obj), $(eval $(call DEP,$(obj),$(obj:_debug.o
 $(foreach obj, $(pokecrystal11_debug_obj), $(eval $(call DEP,$(obj),$(obj:11_debug.o=.asm))))
 $(foreach obj, $(pokecrystal11_vc_obj), $(eval $(call DEP,$(obj),$(obj:11_vc.o=.asm))))
 
-# Dependencies for VC files that need to run scan_includes
-%.constants.sym: %.constants.asm $(shell tools/scan_includes %.constants.asm) $(preinclude_deps) | rgbdscheck.o
-	$(RGBASM) $(RGBASMFLAGS) $< > $@
-
 endif
 
 

constants/gfx_constants.asm

@@ -12,6 +12,7 @@ DEF SCREEN_WIDTH  EQU 20 ; tiles
 DEF SCREEN_HEIGHT EQU 18 ; tiles
 DEF SCREEN_WIDTH_PX  EQU SCREEN_WIDTH  * TILE_WIDTH ; pixels
 DEF SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * TILE_WIDTH ; pixels
+EXPORT SCREEN_HEIGHT_PX ; needed for VC patch
 
 DEF BG_MAP_WIDTH  EQU 32 ; tiles
 DEF BG_MAP_HEIGHT EQU 32 ; tiles

constants/input_constants.asm

@@ -13,3 +13,10 @@ DEF NO_INPUT EQU %00000000
 
 DEF BUTTONS EQU A_BUTTON | B_BUTTON | SELECT | START
 DEF D_PAD   EQU D_RIGHT | D_LEFT | D_UP | D_DOWN
+
+; needed for VC patch
+EXPORT NO_INPUT
+EXPORT A_BUTTON
+EXPORT B_BUTTON
+EXPORT D_UP
+EXPORT D_DOWN

constants/map_constants.asm

@@ -502,3 +502,7 @@ ENDM
 	endgroup
 
 DEF NUM_MAP_GROUPS EQU const_value ; 26
+
+; needed for VC patch
+EXPORT MAPGROUP_CIANWOOD
+EXPORT MAP_CIANWOOD_PHOTO_STUDIO

constants/move_constants.asm

@@ -259,6 +259,16 @@
 	const BEAT_UP      ; fb
 DEF NUM_ATTACKS EQU const_value - 1
 
+; needed for VC patch
+EXPORT FISSURE
+EXPORT SELFDESTRUCT
+EXPORT THUNDER
+EXPORT FLASH
+EXPORT EXPLOSION
+EXPORT HORN_DRILL
+EXPORT HYPER_BEAM
+EXPORT PRESENT
+
 ; Battle animations use the same constants as the moves up to this point
 	const_next $ff
 	const ANIM_SWEET_SCENT_2     ; ff

macros/scripts/battle_anims.asm

@@ -25,6 +25,7 @@ MACRO anim_obj
 ENDM
 
 	const anim_1gfx_command ; $d1
+EXPORT anim_1gfx_command ; needed for VC patch
 MACRO anim_1gfx
 	db anim_1gfx_command
 	db \1 ; gfx1

tools/make_patch.c

@@ -1,5 +1,5 @@
 #define PROGRAM_NAME "make_patch"
-#define USAGE_OPTS "labels.sym constants.sym patched.gbc original.gbc vc.patch.template vc.patch"
+#define USAGE_OPTS "labels.sym patched.gbc original.gbc vc.patch.template vc.patch"
 
 #include "common.h"
 
@@ -449,20 +449,19 @@ bool verify_completeness(FILE *restrict orig_rom, FILE *restrict new_rom, struct
 }
 
 int main(int argc, char *argv[]) {
-	if (argc != 7) {
+	if (argc != 6) {
 		usage_exit(1);
 	}
 
 	struct Symbol *symbols = NULL;
 	parse_symbols(argv[1], &symbols);
-	parse_symbols(argv[2], &symbols);
 
-	FILE *new_rom = xfopen(argv[3], 'r');
-	FILE *orig_rom = xfopen(argv[4], 'r');
-	struct Buffer *patches = process_template(argv[5], argv[6], new_rom, orig_rom, symbols);
+	FILE *new_rom = xfopen(argv[2], 'r');
+	FILE *orig_rom = xfopen(argv[3], 'r');
+	struct Buffer *patches = process_template(argv[4], argv[5], new_rom, orig_rom, symbols);
 
 	if (!verify_completeness(orig_rom, new_rom, patches)) {
-		fprintf(stderr, PROGRAM_NAME ": Warning: Not all ROM differences are defined by \"%s\"\n", argv[6]);
+		fprintf(stderr, PROGRAM_NAME ": Warning: Not all ROM differences are defined by \"%s\"\n", argv[5]);
 	}
 
 	symbol_free(symbols);