Eliminate version.asm (resolves #464)

This commit is contained in:
Remy Oukaour 2018-01-09 00:51:53 -05:00
parent 459d5d3164
commit 05e5eaf12f
5 changed files with 8 additions and 8 deletions

View File

@ -52,7 +52,8 @@ tools:
$(MAKE) -C tools/ $(MAKE) -C tools/
$(crystal11_obj): RGBASMFLAGS = -D CRYSTAL11 $(crystal_obj): RGBASMFLAGS = -D _CRYSTAL
$(crystal11_obj): RGBASMFLAGS = -D _CRYSTAL -D CRYSTAL11
# The dep rules have to be explicit or else missing files won't be reported. # The dep rules have to be explicit or else missing files won't be reported.
# As a side effect, they're evaluated immediately instead of when the rule is invoked. # As a side effect, they're evaluated immediately instead of when the rule is invoked.

View File

@ -1,5 +1,3 @@
INCLUDE "version.asm"
INCLUDE "charmap.asm" INCLUDE "charmap.asm"
INCLUDE "macros.asm" INCLUDE "macros.asm"

View File

@ -16,6 +16,9 @@ HP_GREEN EQU 0
HP_YELLOW EQU 1 HP_YELLOW EQU 1
HP_RED EQU 2 HP_RED EQU 2
; G/S version ID: 0 = Gold, 1 = Silver (used by checkver)
GS_VERSION EQU 0
; save file corruption check values ; save file corruption check values
SAVE_CHECK_VALUE_1 EQU 99 SAVE_CHECK_VALUE_1 EQU 99
SAVE_CHECK_VALUE_2 EQU 127 SAVE_CHECK_VALUE_2 EQU 127

View File

@ -1975,12 +1975,12 @@ GetVarAction:
Script_checkver: Script_checkver:
; script command 0x18 ; script command 0x18
ld a, [Version] ld a, [.gs_version]
ld [ScriptVar], a ld [ScriptVar], a
ret ret
Version: .gs_version:
db VERSION db GS_VERSION
Script_pokenamemem: Script_pokenamemem:
; script command 0x40 ; script command 0x40

View File

@ -1,2 +0,0 @@
_CRYSTAL EQU 1
VERSION EQU 0