diff options
Diffstat (limited to 'constants')
| -rwxr-xr-x | constants/audio_constants.asm | 8 | ||||
| -rw-r--r-- | constants/sprite_constants.asm | 83 |
2 files changed, 45 insertions, 46 deletions
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index b34ffe67d..bc50e3db2 100755 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -55,9 +55,9 @@ SOUND_VIBRATO_DIR EQU 0 SOUND_PITCH_WHEEL_DIR EQU 1 ; NoteFlags -NOTE_UNKN_0 EQU 0 -NOTE_UNKN_1 EQU 1 +NOTE_DUTY_OVERRIDE EQU 0 +NOTE_FREQ_OVERRIDE EQU 1 NOTE_UNKN_3 EQU 3 -NOTE_UNKN_4 EQU 4 +NOTE_NOISE_SAMPLING EQU 4 NOTE_REST EQU 5 -NOTE_UNKN_6 EQU 6 +NOTE_VIBRATO_OVERRIDE EQU 6 diff --git a/constants/sprite_constants.asm b/constants/sprite_constants.asm index 541934b83..7ac9d10ee 100644 --- a/constants/sprite_constants.asm +++ b/constants/sprite_constants.asm @@ -230,8 +230,7 @@ NUM_SPRITEHEADER_FIELDS EQU const_value const SPRITEMOVEDATA_BOULDERDUST ; 22 const SPRITEMOVEDATA_GRASS ; 23 const SPRITEMOVEDATA_LAPRAS ; 24 - const SPRITEMOVEDATA_25 ; 25 -NUM_SPRITEMOVEDATA EQU const_value +- 1 +NUM_SPRITEMOVEDATA EQU const_value SPRITEMOVEDATA_FIELDS EQU 6 ; sprite movement functions @@ -303,50 +302,50 @@ MAX_OUTDOOR_SPRITES EQU 23 const PERSON_ACTION_SPIN const PERSON_ACTION_SPIN_FLICKER const PERSON_ACTION_FISHING - const PERSON_ACTION_07 + const PERSON_ACTION_SHADOW const PERSON_ACTION_EMOTE - const PERSON_ACTION_09 - const PERSON_ACTION_0A - const PERSON_ACTION_0B - const PERSON_ACTION_0C - const PERSON_ACTION_0D - const PERSON_ACTION_0E - const PERSON_ACTION_0F - const PERSON_ACTION_10 + const PERSON_ACTION_BIG_SNORLAX + const PERSON_ACTION_BOUNCE + const PERSON_ACTION_WEIRD_TREE + const PERSON_ACTION_BIG_LAPRAS + const PERSON_ACTION_BIG_DOLL + const PERSON_ACTION_BOULDER_DUST + const PERSON_ACTION_GRASS_SHAKE + const PERSON_ACTION_SKYFALL const_def - const FACING_00 - const FACING_01 - const FACING_02 - const FACING_03 - const FACING_04 - const FACING_05 - const FACING_06 - const FACING_07 - const FACING_08 - const FACING_09 - const FACING_0A - const FACING_0B - const FACING_0C - const FACING_0D - const FACING_0E - const FACING_0F - const FACING_10 - const FACING_11 - const FACING_12 - const FACING_13 + const FACING_STEP_DOWN_0 + const FACING_STEP_DOWN_1 + const FACING_STEP_DOWN_2 + const FACING_STEP_DOWN_3 + const FACING_STEP_UP_0 + const FACING_STEP_UP_1 + const FACING_STEP_UP_2 + const FACING_STEP_UP_3 + const FACING_STEP_LEFT_0 + const FACING_STEP_LEFT_1 + const FACING_STEP_LEFT_2 + const FACING_STEP_LEFT_3 + const FACING_STEP_RIGHT_0 + const FACING_STEP_RIGHT_1 + const FACING_STEP_RIGHT_2 + const FACING_STEP_RIGHT_3 + const FACING_FISH_DOWN + const FACING_FISH_UP + const FACING_FISH_LEFT + const FACING_FISH_RIGHT const FACING_EMOTE - const FACING_15 - const FACING_16 - const FACING_17 - const FACING_18 - const FACING_19 - const FACING_1A - const FACING_1B - const FACING_1C - const FACING_1D - const FACING_1E - const FACING_1F + const FACING_SHADOW + const FACING_BIG_DOLL_ASYM + const FACING_BIG_DOLL_SYM + const FACING_WEIRD_TREE_0 + const FACING_WEIRD_TREE_1 + const FACING_WEIRD_TREE_2 + const FACING_WEIRD_TREE_3 + const FACING_BOULDER_DUST_1 + const FACING_BOULDER_DUST_2 + const FACING_GRASS_1 + const FACING_GRASS_2 const_def const SPRITEANIMSTRUCT_INDEX ; 0 |