diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-03 22:22:41 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2021-03-05 16:10:25 -0500 |
| commit | 5454e1e0deefc6b4fc8c4de0e63314052fceebc0 (patch) | |
| tree | 565805b252fa596aab3f80b3128ebc91b1fae540 /constants/script_constants.asm | |
| parent | b423e94be700cc6434465cf1dcccf0b677489192 (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/script_constants.asm')
| -rw-r--r-- | constants/script_constants.asm | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/constants/script_constants.asm b/constants/script_constants.asm index e98a53b2..0b3de75c 100644 --- a/constants/script_constants.asm +++ b/constants/script_constants.asm @@ -171,6 +171,7 @@ MAX_XYCOMPARE_LENGTH EQU 32 const FLOOR_10F const FLOOR_11F const FLOOR_ROOF +NUM_FLOORS EQU const_value ; showemote arguments ; Emotes indexes (see data/sprites/emotes.asm) @@ -187,7 +188,9 @@ MAX_XYCOMPARE_LENGTH EQU 32 const EMOTE_ROD ; 9 const EMOTE_BOULDER_DUST ; 10 const EMOTE_GRASS_RUSTLE ; 11 +NUM_EMOTES EQU const_value EMOTE_FROM_MEM EQU -1 +EMOTE_LENGTH EQU 6 ; fruittree arguments ; FruitTreeItems indexes (see data/items/fruit_trees.asm) @@ -232,6 +235,7 @@ NUM_FRUIT_TREES EQU const_value - 1 const DECODESC_RIGHT_DOLL ; 2 const DECODESC_BIG_DOLL ; 3 const DECODESC_CONSOLE ; 4 +NUM_DECODESCS EQU const_value ; ActivateFishingSwarm setval arguments const_def |