diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_data_constants.asm | 21 | ||||
| -rw-r--r-- | constants/map_setup_constants.asm | 4 |
2 files changed, 12 insertions, 13 deletions
diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 0f59f8fd5..ed0e2fbc6 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -4,18 +4,17 @@ GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map_def struct members (see data/maps/definitions.asm) +; map struct members (see data/maps/maps.asm) const_def - const MAPDEF_MAPDATA_BANK ; 0 - const MAPDEF_TILESET ; 1 - const MAPDEF_ENVIRONMENT ; 2 - const MAPDEF_MAPDATA ; 3 - const MAPDEF_MAPDATA_HI ; 4 - const MAPDEF_LOCATION ; 5 - const MAPDEF_MUSIC ; 6 - const MAPDEF_PALETTE ; 7 - const MAPDEF_FISHGROUP ; 8 -NUM_MAPDEF_ATTRIBUTES EQU const_value + const MAP_MAPATTRIBUTES_BANK ; 0 + const MAP_TILESET ; 1 + const MAP_ENVIRONMENT ; 2 + const MAP_MAPATTRIBUTES ; 3 + const MAP_MAPATTRIBUTES_HI ; 4 + const MAP_LOCATION ; 5 + const MAP_MUSIC ; 6 + const MAP_PALETTE ; 7 + const MAP_FISHGROUP ; 8 ; map environments (wEnvironment) const_def 1 diff --git a/constants/map_setup_constants.asm b/constants/map_setup_constants.asm index a281c8813..9c6164169 100644 --- a/constants/map_setup_constants.asm +++ b/constants/map_setup_constants.asm @@ -44,8 +44,8 @@ const map_load_spawn ; 17 const map_load_connection ; 18 const map_load_warp ; 19 - const map_attributes ; 1a - const map_attributes_2 ; 1b + const map_load_attributes ; 1a + const map_load_attributes_2 ; 1b const map_clear_bg_palettes ; 1c const map_fade_out_palettes ; 1d const map_fade_in_palettes ; 1e |