diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 22:57:19 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 23:25:00 -0500 |
| commit | bf074f359886707d2ffb2e0b525b03dc7af0fe29 (patch) | |
| tree | 79ed0eaefcf076aaf7c216338750c934d3cee1b8 /constants | |
| parent | 3d0e1819e919676b90e2a8621149a0c12689dd37 (diff) | |
map_header → map_def; map_header_2 → map_data
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/map_constants.asm | 6 | ||||
| -rw-r--r-- | constants/map_data_constants.asm | 24 | ||||
| -rw-r--r-- | constants/music_constants.asm | 4 |
3 files changed, 17 insertions, 17 deletions
diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 87096ccef..6c7fac3b1 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -15,11 +15,11 @@ ENDM ; map group ids ; `newgroup` indexes are for: -; - MapGroupPointers (see data/maps/map_headers.asm) +; - MapGroupPointers (see data/maps/map_defs.asm) ; - MapGroupRoofs (see data/maps/roofs.asm) ; - OutdoorSprites (see data/maps/outdoor_sprites.asm) ; - RoofPals (see gfx/tilesets/roofs.pal) -; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see data/maps/map_headers.asm) +; `mapgroup` indexes are for the sub-tables of MapGroupPointers (see data/maps/map_defs.asm) const_def newgroup ; 1 @@ -172,7 +172,7 @@ ENDM mapgroup CINNABAR_POKECENTER_1F, 4, 5 ; 1 mapgroup CINNABAR_POKECENTER_2F_BETA, 4, 8 ; 2 - mapgroup ROUTE_19___FUCHSIA_GATE, 4, 5 ; 3 + mapgroup ROUTE_19_FUCHSIA_GATE, 4, 5 ; 3 mapgroup SEAFOAM_GYM, 4, 5 ; 4 mapgroup ROUTE_19, 18, 10 ; 5 mapgroup ROUTE_20, 9, 30 ; 6 diff --git a/constants/map_data_constants.asm b/constants/map_data_constants.asm index 179659865..b25dea04d 100644 --- a/constants/map_data_constants.asm +++ b/constants/map_data_constants.asm @@ -3,18 +3,18 @@ MAP_N_A EQU -1 GROUP_NONE EQU 0 MAP_NONE EQU 0 -; map header struct members (see data/maps/map_headers.asm) +; map header struct members (see data/maps/map_defs.asm) const_def - const MAPHEADER_MAPHEADER2_BANK ; 0 - const MAPHEADER_TILESET ; 1 - const MAPHEADER_ENVIRONMENT ; 2 - const MAPHEADER_MAPHEADER2 ; 3 - const MAPHEADER_MAPHEADER2_HI ; 4 - const MAPHEADER_LOCATION ; 5 - const MAPHEADER_MUSIC ; 6 - const MAPHEADER_PALETTE ; 7 - const MAPHEADER_FISHGROUP ; 8 -NUM_MAPHEADER_ATTRIBUTES EQU const_value + 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 ; map environments (wEnvironment) const_value set 1 @@ -52,7 +52,7 @@ const_value set 1 const FISHGROUP_QWILFISH_NO_SWARM -; connection directions (see data/maps/map_headers_2.asm) +; connection directions (see data/maps/map_data.asm) const_def const EAST_F const WEST_F diff --git a/constants/music_constants.asm b/constants/music_constants.asm index e0d3dcaa3..83085ef0c 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -108,13 +108,13 @@ const MUSIC_BATTLE_TOWER_LOBBY ; 65 const MUSIC_MOBILE_CENTER ; 66 -; GetMapHeaderMusic picks music for this value (see home/map.asm) +; GetMapMusic picks music for this value (see home/map.asm) MUSIC_MAHOGANY_MART EQU $64 ; ExitPokegearRadio_HandleMusic uses these values RESTART_MAP_MUSIC EQU $fe ENTER_MAP_MUSIC EQU $ff -; GetMapHeaderMusic picks music for this bit flag +; GetMapMusic picks music for this bit flag RADIO_TOWER_MUSIC_F EQU 7 RADIO_TOWER_MUSIC EQU 1 << RADIO_TOWER_MUSIC_F |