summaryrefslogtreecommitdiff
path: root/constants/map_data_constants.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2021-03-03 22:22:41 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2021-03-05 16:10:25 -0500
commit5454e1e0deefc6b4fc8c4de0e63314052fceebc0 (patch)
tree565805b252fa596aab3f80b3128ebc91b1fae540 /constants/map_data_constants.asm
parentb423e94be700cc6434465cf1dcccf0b677489192 (diff)
Verify data table sizes with table_width and assert_table_length macros
It also uncovered some off-by-one issues with defining some constants. A few structs now use rsreset/_RS to define their offset constants.
Diffstat (limited to 'constants/map_data_constants.asm')
-rw-r--r--constants/map_data_constants.asm6
1 files changed, 4 insertions, 2 deletions
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm
index 1679e6cd..152f795f 100644
--- a/constants/map_data_constants.asm
+++ b/constants/map_data_constants.asm
@@ -50,6 +50,7 @@ NUM_MAP_PALETTES EQU const_value
const FISHGROUP_QWILFISH
const FISHGROUP_REMORAID
const FISHGROUP_QWILFISH_NO_SWARM
+NUM_FISHGROUPS EQU const_value - 1
; connection directions (see data/maps/data.asm)
const_def
@@ -66,8 +67,7 @@ NUM_MAP_PALETTES EQU const_value
shift_const NORTH
; SpawnPoints indexes (see data/maps/spawn_points.asm)
- const_def -1
- const SPAWN_N_A
+ const_def
const SPAWN_HOME
const SPAWN_DEBUG
; kanto
@@ -100,6 +100,8 @@ NUM_MAP_PALETTES EQU const_value
const SPAWN_FAST_SHIP
NUM_SPAWNS EQU const_value
+SPAWN_N_A EQU -1
+
; Flypoints indexes (see data/maps/flypoints.asm)
const_def
; johto