diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/audio_constants.asm | 8 | ||||
| -rw-r--r-- | constants/battle_constants.asm | 2 | ||||
| -rw-r--r-- | constants/gfx_constants.asm | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index 861c35ee0..020fdd176 100755 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -66,23 +66,23 @@ NUM_CHANNELS EQU const_value const NOTE_REST ; 5 const NOTE_VIBRATO_OVERRIDE ; 6 -; Volume: +; wVolume VOLUME_SO1_F EQU 3 VOLUME_SO2_F EQU 7 VOLUME_SO1_LEVEL EQU %00000111 VOLUME_SO2_LEVEL EQU %01110000 MAX_VOLUME EQU $77 -; SoundInput: +; SoundInput SOUND_INPUT_CH1_F EQU 0 SOUND_INPUT_CH2_F EQU 1 SOUND_INPUT_CH3_F EQU 2 SOUND_INPUT_CH4_F EQU 3 SOUND_INPUT_GLOBAL_F EQU 7 -; Danger: +; wLowHealthAlarm DANGER_PITCH_F EQU 4 DANGER_ON_F EQU 7 -; MusicFade: +; MusicFade MUSIC_FADE_IN_F EQU 7 diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index 816625e60..0bd719737 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -214,7 +214,7 @@ SUBSTATUS_CURLED EQU 0 enum SCREENS_UNUSED enum SCREENS_SPIKES -; Weather values +; values in wBattleWeather const_def const WEATHER_NONE const WEATHER_RAIN diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 864a4bd50..6ac7dbba4 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -28,4 +28,4 @@ EXP_BAR_LENGTH_PX EQU EXP_BAR_LENGTH * TILE_WIDTH ; pixels const SPRITEOAMSTRUCT_TILE_ID ; 2 const SPRITEOAMSTRUCT_ATTRIBUTES ; 3 SPRITEOAMSTRUCT_LENGTH EQU const_value -NUM_SPRITE_OAM_STRUCTS EQU 40 ; see Sprites +NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM |