Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate enum: use const instead, with case-by-case parallel const implementations

Browse Source
This commit is contained in:
Rangi
2020-07-08 15:30:23 -04:00
parent 9e4a00af45
commit 6ca82e5c86
24 changed files with 543 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
macros/scripts/audio.asm
View File

@@ -41,17 +41,17 @@ noise_note: MACRO
ENDM
; MusicCommands indexes (see audio/engine.asm)
enum_start $d0, 8
FIRST_MUSIC_CMD EQU __enum__
const_def $d0, 8
FIRST_MUSIC_CMD EQU const_value
enum octave_cmd ; $d0
const octave_cmd ; $d0
octave: MACRO
db octave_cmd | 8 - (\1) ; octave
ENDM
__enumdir__ = 1
const_inc = 1
enum note_type_cmd ; $d8
const note_type_cmd ; $d8
note_type: MACRO
db note_type_cmd
db \1 ; note length
@@ -69,25 +69,25 @@ drum_speed: MACRO
note_type \1 ; note length
ENDM
enum transpose_cmd ; $d9
const transpose_cmd ; $d9
transpose: MACRO
db transpose_cmd
dn \1, \2 ; num octaves, num pitches
ENDM
enum tempo_cmd ; $da
const tempo_cmd ; $da
tempo: MACRO
db tempo_cmd
bigdw \1 ; tempo
ENDM
enum duty_cycle_cmd ; $db
const duty_cycle_cmd ; $db
duty_cycle: MACRO
db duty_cycle_cmd
db \1 ; duty cycle
ENDM
enum volume_envelope_cmd ; $dc
const volume_envelope_cmd ; $dc
volume_envelope: MACRO
db volume_envelope_cmd
IF \2 < 0
@@ -97,7 +97,7 @@ volume_envelope: MACRO
ENDC
ENDM
enum pitch_sweep_cmd ; $dd
const pitch_sweep_cmd ; $dd
pitch_sweep: MACRO
db pitch_sweep_cmd
IF \2 < 0
@@ -107,25 +107,25 @@ pitch_sweep: MACRO
ENDC
ENDM
enum duty_cycle_pattern_cmd ; $de
const duty_cycle_pattern_cmd ; $de
duty_cycle_pattern: MACRO
db duty_cycle_pattern_cmd
db (\1 << 6) | (\2 << 4) | (\3 << 2) | (\4 << 0) ; duty cycle pattern
ENDM
enum toggle_sfx_cmd ; $df
const toggle_sfx_cmd ; $df
toggle_sfx: MACRO
db toggle_sfx_cmd
ENDM
enum pitch_slide_cmd ; $e0
const pitch_slide_cmd ; $e0
pitch_slide: MACRO
db pitch_slide_cmd
db \1 - 1 ; duration
dn 8 - \2, \3 % 12 ; octave, pitch
ENDM
enum vibrato_cmd ; $e1
const vibrato_cmd ; $e1
vibrato: MACRO
db vibrato_cmd
db \1 ; delay
@@ -136,13 +136,13 @@ vibrato: MACRO
ENDC
ENDM
enum unknownmusic0xe2_cmd ; $e2
const unknownmusic0xe2_cmd ; $e2
unknownmusic0xe2: MACRO
db unknownmusic0xe2_cmd
db \1 ; unknown
ENDM
enum toggle_noise_cmd ; $e3
const toggle_noise_cmd ; $e3
toggle_noise: MACRO
db toggle_noise_cmd
IF _NARG > 0
@@ -150,13 +150,13 @@ toggle_noise: MACRO
ENDC
ENDM
enum force_stereo_panning_cmd ; $e4
const force_stereo_panning_cmd ; $e4
force_stereo_panning: MACRO
db force_stereo_panning_cmd
dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable
ENDM
enum volume_cmd ; $e5
const volume_cmd ; $e5
volume: MACRO
db volume_cmd
IF _NARG > 1
@@ -166,65 +166,65 @@ volume: MACRO
ENDC
ENDM
enum pitch_offset_cmd ; $e6
const pitch_offset_cmd ; $e6
pitch_offset: MACRO
db pitch_offset_cmd
bigdw \1 ; pitch offset
ENDM
enum unknownmusic0xe7_cmd ; $e7
const unknownmusic0xe7_cmd ; $e7
unknownmusic0xe7: MACRO
db unknownmusic0xe7_cmd
db \1 ; unknown
ENDM
enum unknownmusic0xe8_cmd ; $e8
const unknownmusic0xe8_cmd ; $e8
unknownmusic0xe8: MACRO
db unknownmusic0xe8_cmd
db \1 ; unknown
ENDM
enum tempo_relative_cmd ; $e9
const tempo_relative_cmd ; $e9
tempo_relative: MACRO
db tempo_relative_cmd
bigdw \1 ; tempo adjustment
ENDM
enum restart_channel_cmd ; $ea
const restart_channel_cmd ; $ea
restart_channel: MACRO
db restart_channel_cmd
dw \1 ; address
ENDM
enum new_song_cmd ; $eb
const new_song_cmd ; $eb
new_song: MACRO
db new_song_cmd
bigdw \1 ; id
ENDM
enum sfx_priority_on_cmd ; $ec
const sfx_priority_on_cmd ; $ec
sfx_priority_on: MACRO
db sfx_priority_on_cmd
ENDM
enum sfx_priority_off_cmd ; $ed
const sfx_priority_off_cmd ; $ed
sfx_priority_off: MACRO
db sfx_priority_off_cmd
ENDM
enum unknownmusic0xee_cmd ; $ee
const unknownmusic0xee_cmd ; $ee
unknownmusic0xee: MACRO
db unknownmusic0xee_cmd
dw \1 ; address
ENDM
enum stereo_panning_cmd ; $ef
const stereo_panning_cmd ; $ef
stereo_panning: MACRO
db stereo_panning_cmd
dn %1111 * (1 && \1), %1111 * (1 && \2) ; left enable, right enable
ENDM
enum sfx_toggle_noise_cmd ; $f0
const sfx_toggle_noise_cmd ; $f0
sfx_toggle_noise: MACRO
db sfx_toggle_noise_cmd
IF _NARG > 0
@@ -232,84 +232,84 @@ sfx_toggle_noise: MACRO
ENDC
ENDM
enum music0xf1_cmd ; $f1
const music0xf1_cmd ; $f1
music0xf1: MACRO
db music0xf1_cmd
ENDM
enum music0xf2_cmd ; $f2
const music0xf2_cmd ; $f2
music0xf2: MACRO
db music0xf2_cmd
ENDM
enum music0xf3_cmd ; $f3
const music0xf3_cmd ; $f3
music0xf3: MACRO
db music0xf3_cmd
ENDM
enum music0xf4_cmd ; $f4
const music0xf4_cmd ; $f4
music0xf4: MACRO
db music0xf4_cmd
ENDM
enum music0xf5_cmd ; $f5
const music0xf5_cmd ; $f5
music0xf5: MACRO
db music0xf5_cmd
ENDM
enum music0xf6_cmd ; $f6
const music0xf6_cmd ; $f6
music0xf6: MACRO
db music0xf6_cmd
ENDM
enum music0xf7_cmd ; $f7
const music0xf7_cmd ; $f7
music0xf7: MACRO
db music0xf7_cmd
ENDM
enum music0xf8_cmd ; $f8
const music0xf8_cmd ; $f8
music0xf8: MACRO
db music0xf8_cmd
ENDM
enum unknownmusic0xf9_cmd ; $f9
const unknownmusic0xf9_cmd ; $f9
unknownmusic0xf9: MACRO
db unknownmusic0xf9_cmd
ENDM
enum set_condition_cmd ; $fa
const set_condition_cmd ; $fa
set_condition: MACRO
db set_condition_cmd
db \1 ; condition
ENDM
enum sound_jump_if_cmd ; $fb
const sound_jump_if_cmd ; $fb
sound_jump_if: MACRO
db sound_jump_if_cmd
db \1 ; condition
dw \2 ; address
ENDM
enum sound_jump_cmd ; $fc
const sound_jump_cmd ; $fc
sound_jump: MACRO
db sound_jump_cmd
dw \1 ; address
ENDM
enum sound_loop_cmd ; $fd
const sound_loop_cmd ; $fd
sound_loop: MACRO
db sound_loop_cmd
db \1 ; count
dw \2 ; address
ENDM
enum sound_call_cmd ; $fe
const sound_call_cmd ; $fe
sound_call: MACRO
db sound_call_cmd
dw \1 ; address
ENDM
enum sound_ret_cmd ; $ff
const sound_ret_cmd ; $ff
sound_ret: MACRO
db sound_ret_cmd
ENDM