diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-09 00:51:53 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-09 00:51:53 -0500 |
| commit | 05e5eaf12fbb422d56615f15c3481d1cf53ed17b (patch) | |
| tree | 36bc3b7ec91eef3760960283ff0aabe8041523a6 | |
| parent | 459d5d31640334b88cc2d82bb1b2f794d13fcbfd (diff) | |
Eliminate version.asm (resolves #464)
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | constants.asm | 2 | ||||
| -rw-r--r-- | constants/misc_constants.asm | 3 | ||||
| -rw-r--r-- | engine/scripting.asm | 6 | ||||
| -rw-r--r-- | version.asm | 2 |
5 files changed, 8 insertions, 8 deletions
@@ -52,7 +52,8 @@ 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. # As a side effect, they're evaluated immediately instead of when the rule is invoked. diff --git a/constants.asm b/constants.asm index 2f0a436ea..4e52c9e42 100644 --- a/constants.asm +++ b/constants.asm @@ -1,5 +1,3 @@ -INCLUDE "version.asm" - INCLUDE "charmap.asm" INCLUDE "macros.asm" diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 6289b610c..3917ff8f5 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -16,6 +16,9 @@ HP_GREEN EQU 0 HP_YELLOW EQU 1 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_CHECK_VALUE_1 EQU 99 SAVE_CHECK_VALUE_2 EQU 127 diff --git a/engine/scripting.asm b/engine/scripting.asm index 9a89c375a..a64ab2bd8 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1975,12 +1975,12 @@ GetVarAction: Script_checkver: ; script command 0x18 - ld a, [Version] + ld a, [.gs_version] ld [ScriptVar], a ret -Version: - db VERSION +.gs_version: + db GS_VERSION Script_pokenamemem: ; script command 0x40 diff --git a/version.asm b/version.asm deleted file mode 100644 index b42aceaee..000000000 --- a/version.asm +++ /dev/null @@ -1,2 +0,0 @@ -_CRYSTAL EQU 1 -VERSION EQU 0 |