Use map names with ToggleData* symbols

This commit is contained in:
Narishma-gb 2026-01-12 18:21:55 +01:00
parent 7e6fdbbda7
commit f050efc507
2 changed files with 3 additions and 2 deletions

View File

@ -3,6 +3,7 @@ DEF ON EQU $15
MACRO toggle_consts_for
DEF TOGGLEMAP{\1} EQU const_value
DEF TOGGLEMAP{\1}_NAME EQUS "\1"
ENDM
; ToggleableObjectStates indexes (see data/maps/toggleable_objects.asm)

View File

@ -5,7 +5,7 @@ ToggleableObjectMapPointers:
table_width 2
FOR n, NUM_MAPS
IF DEF(TOGGLEMAP{n}) ; defined by `toggle_consts_for`
dw ToggleData{n}
dw ToggleData_{TOGGLEMAP{n}_NAME}
ELSE
dw NoToggleData
ENDC
@ -20,7 +20,7 @@ DEF toggles_ok = 1
MACRO? toggleable_objects_for
DEF toggle_map_id = \1 ; map id
ToggleData{toggle_map_id}:
ToggleData_\1:
IF toggles_ok
ASSERT DEF(TOGGLEMAP{toggle_map_id}), \
"`toggleable_objects_for \1` is not defined"