diff options
| -rw-r--r-- | constants/toggle_constants.asm | 3 | ||||
| -rw-r--r-- | data/maps/toggleable_objects.asm | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/constants/toggle_constants.asm b/constants/toggle_constants.asm index 701bc2b4..64712306 100644 --- a/constants/toggle_constants.asm +++ b/constants/toggle_constants.asm @@ -2,7 +2,8 @@ DEF OFF EQU $11 DEF ON EQU $15 MACRO toggle_consts_for - DEF TOGGLEMAP{\1} EQU const_value + DEF TOGGLEMAP{\1}_ID EQU const_value + DEF TOGGLEMAP{\1}_NAME EQUS "\1" ENDM ; ToggleableObjectStates indexes (see data/maps/toggleable_objects.asm) diff --git a/data/maps/toggleable_objects.asm b/data/maps/toggleable_objects.asm index d94002d9..90f9e689 100644 --- a/data/maps/toggleable_objects.asm +++ b/data/maps/toggleable_objects.asm @@ -4,8 +4,8 @@ ToggleableObjectMapPointers: ; entries correspond to map ids table_width 2 FOR n, NUM_MAPS - IF DEF(TOGGLEMAP{n}) ; defined by `toggle_consts_for` - dw ToggleData{n} + IF DEF(TOGGLEMAP{n}_NAME) ; defined by `toggle_consts_for` + dw ToggleData_{TOGGLEMAP{n}_NAME} ELSE dw NoToggleData ENDC @@ -20,14 +20,14 @@ 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}), \ + ASSERT DEF(TOGGLEMAP{toggle_map_id}_ID), \ "`toggleable_objects_for \1` is not defined" - DEF toggles_ok &= DEF(TOGGLEMAP{toggle_map_id}) + DEF toggles_ok &= DEF(TOGGLEMAP{toggle_map_id}_ID) IF toggles_ok - assert_table_length TOGGLEMAP{toggle_map_id} - DEF toggles_ok &= TOGGLEMAP{toggle_map_id} * 3 == @ - ToggleableObjectStates + assert_table_length TOGGLEMAP{toggle_map_id}_ID + DEF toggles_ok &= TOGGLEMAP{toggle_map_id}_ID * 3 == @ - ToggleableObjectStates ENDC ENDC ENDM |