diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/audio_constants.asm | 2 | ||||
| -rw-r--r-- | constants/battle_constants.asm | 6 | ||||
| -rw-r--r-- | constants/gfx_constants.asm | 8 | ||||
| -rw-r--r-- | constants/map_constants.asm | 8 |
4 files changed, 19 insertions, 5 deletions
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index 288caad91..85c5cc577 100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -31,6 +31,8 @@ NUM_NOISE_CHANS EQU const_value const CHAN8 ; 7 NUM_CHANNELS EQU const_value +NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7 + ; Flags1 const_def const SOUND_CHANNEL_ON ; 0 diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index b1f57514a..64e99d1d7 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -157,7 +157,7 @@ SLP EQU %111 ; 0-7 turns const FRZ const PAR -ALL_STATUS EQU (1 << PSN) + (1 << BRN) + (1 << FRZ) + (1 << PAR) + SLP +ALL_STATUS EQU (1 << PSN) | (1 << BRN) | (1 << FRZ) | (1 << PAR) | SLP ; wPlayerSubStatus1 or wEnemySubStatus1 bit flags enum_start 7, -1 @@ -248,3 +248,7 @@ SUBSTATUS_CURLED EQU 0 const WIN const LOSE const DRAW + +BATTLERESULT_CAUGHT_CELEBI EQU 6 +BATTLERESULT_BOX_FULL EQU 7 +BATTLERESULT_BITMASK EQU (1 << BATTLERESULT_CAUGHT_CELEBI) | (1 << BATTLERESULT_BOX_FULL) diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 515045306..0da273f89 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -16,8 +16,12 @@ SCREEN_HEIGHT_PX EQU SCREEN_HEIGHT * TILE_WIDTH ; pixels BG_MAP_WIDTH EQU 32 ; tiles BG_MAP_HEIGHT EQU 32 ; tiles -WMISC_WIDTH EQU 6 * 4 -WMISC_HEIGHT EQU 5 * 4 + +METATILE_WIDTH EQU 4 ; tiles +SCREEN_META_WIDTH EQU 6 ; metatiles +SCREEN_META_HEIGHT EQU 5 ; metatiles +SURROUNDING_WIDTH EQU SCREEN_META_WIDTH * METATILE_WIDTH ; tiles +SURROUNDING_HEIGHT EQU SCREEN_META_HEIGHT * METATILE_WIDTH ; tiles HP_BAR_LENGTH EQU 6 ; tiles diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 0f604b42a..3efc8e30b 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -15,11 +15,15 @@ ENDM ; map group ids ; `newgroup` indexes are for: -; - MapGroupPointers (see data/maps/definitions.asm) +; - MapGroupPointers (see data/maps/maps.asm) ; - MapGroupRoofs (see data/maps/roofs.asm) ; - OutdoorSprites (see data/maps/outdoor_sprites.asm) ; - RoofPals (see gfx/tilesets/roofs.pal) -; `map_const` indexes are for the sub-tables of MapGroupPointers (see data/maps/definitions.asm) +; `map_const` indexes are for the sub-tables of MapGroupPointers (see data/maps/maps.asm) +; Each map also has associated data: +; - attributes (see data/maps/attributes.asm) +; - blocks (see data/maps/blocks.asm) +; - scripts and events (see data/maps/scripts.asm) const_def newgroup ; 1 |