From 429aad67981783173b0d9203594ad9f729936838 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 14 Dec 2023 17:03:28 +0100 Subject: [PATCH] Don't overlap GO_* and BRANCH_DIRECTION_* constants [bug fix] (#28) --- constants/space_constants.asm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) mode change 100755 => 100644 constants/space_constants.asm diff --git a/constants/space_constants.asm b/constants/space_constants.asm old mode 100755 new mode 100644 index 6849ae7f2..293c5cb5e --- a/constants/space_constants.asm +++ b/constants/space_constants.asm @@ -3,14 +3,15 @@ DEF FIRST_SPACE_METATILE EQU $80 DEF FIRST_GREY_SPACE_METATILE EQU $e0 DEF UNIQUE_SPACE_METATILES_MASK EQU %11111 -; reserved next space values that signal movement towards anchor point rather than towards space - const_def -1, -1 - const GO_DOWN ; 255 - const GO_UP ; 254 - const GO_LEFT ; 253 - const GO_RIGHT ; 252 -DEF NEXT_SPACE_IS_ANCHOR_POINT EQU const_value + 1 - ; Branch Space special direction values -DEF BRANCH_DIRECTION_INVALID EQU -1 -DEF BRANCH_DIRECTION_UNAVAILABLE EQU -2 + const_def -1, -1 + const BRANCH_DIRECTION_INVALID ; -1 + const BRANCH_DIRECTION_UNAVAILABLE ; -2 + +; reserved next space values that signal movement towards anchor point rather than towards space. +; must not overlap with BRANCH_DIRECTION_* constants in order to support GO_* values as next spaces of a branch direction. + const GO_DOWN ; 253 + const GO_UP ; 252 + const GO_LEFT ; 251 + const GO_RIGHT ; 250 +DEF NEXT_SPACE_IS_ANCHOR_POINT EQU const_value + 1