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-04 00:15:03 -0500 |
| commit | 40902ffe244544d638567642e4e01b9c5801db23 (patch) | |
| tree | 4abf9ac20786fdf66bb298b3ec7935cef2c71d07 /data/radio | |
| parent | 9c17fb14c8068d6662b9ca1cb048ed206b6770ee (diff) | |
Verify data table sizes with table_width and assert_table_length macros
This was discussed in #706
It also uncovered some off-by-one issues with defining some constants.
A few structs now use rsreset/_RS to define their offset constants, as discussed in #739
Diffstat (limited to 'data/radio')
| -rw-r--r-- | data/radio/buenas_passwords.asm | 3 | ||||
| -rw-r--r-- | data/radio/channel_music.asm | 4 | ||||
| -rw-r--r-- | data/radio/oaks_pkmn_talk_routes.asm | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/data/radio/buenas_passwords.asm b/data/radio/buenas_passwords.asm index 85e1b951b..078bcdd4c 100644 --- a/data/radio/buenas_passwords.asm +++ b/data/radio/buenas_passwords.asm @@ -1,5 +1,5 @@ BuenasPasswordTable: -; there are NUM_PASSWORD_CATEGORIES entries + table_width 2, BuenasPasswordTable dw .JohtoStarters dw .Beverages dw .HealingItems @@ -11,6 +11,7 @@ BuenasPasswordTable: dw .Moves dw .XItems dw .RadioStations + assert_table_length NUM_PASSWORD_CATEGORIES ; string type, points, option 1, option 2, option 3 .JohtoStarters: db BUENA_MON, 10, CYNDAQUIL, TOTODILE, CHIKORITA diff --git a/data/radio/channel_music.asm b/data/radio/channel_music.asm index 62504ed11..5a74ea7ad 100644 --- a/data/radio/channel_music.asm +++ b/data/radio/channel_music.asm @@ -1,5 +1,6 @@ RadioChannelSongs: -; entries correspond to radio channel ids +; entries correspond to radio channel ids (see constants/radio_constants.asm) + table_width 2, RadioChannelSongs dw MUSIC_POKEMON_TALK dw MUSIC_POKEMON_CENTER dw MUSIC_TITLE @@ -11,3 +12,4 @@ RadioChannelSongs: dw MUSIC_POKE_FLUTE_CHANNEL dw MUSIC_RUINS_OF_ALPH_RADIO dw MUSIC_LAKE_OF_RAGE_ROCKET_RADIO + assert_table_length NUM_RADIO_CHANNELS diff --git a/data/radio/oaks_pkmn_talk_routes.asm b/data/radio/oaks_pkmn_talk_routes.asm index db2447401..acef4bdd3 100644 --- a/data/radio/oaks_pkmn_talk_routes.asm +++ b/data/radio/oaks_pkmn_talk_routes.asm @@ -1,7 +1,6 @@ ; Oak's Pokémon Talk will list wild Pokémon on these maps. OaksPKMNTalkRoutes: -; there are NUM_OAKS_POKEMON_TALK_ROUTES entries map_id ROUTE_29 map_id ROUTE_46 map_id ROUTE_30 @@ -17,3 +16,4 @@ OaksPKMNTalkRoutes: map_id ROUTE_45 map_id ROUTE_36 map_id ROUTE_31 +.End |