diff --git a/constants.asm b/constants.asm index 524841fae..ef360ebcd 100644 --- a/constants.asm +++ b/constants.asm @@ -31,6 +31,12 @@ TX_FAR: MACRO db BANK(\1) ENDM +; eventually replace with python macro +note: MACRO + db \1 + ENDM + + BULBASAUR EQU 1 IVYSAUR EQU 2 VENUSAUR EQU 3 @@ -3152,13 +3158,7 @@ _CH6 EQU $05 _CH7 EQU $06 _CH8 EQU $07 -note: MACRO - db \1 - ENDM -; eventually replace with this: -; note: MACRO - ; db NOTE_\1 + NOTE_\2 - ; ENDM + NOTE_RST EQU $00 NOTE_C EQU $10 @@ -3192,162 +3192,6 @@ NOTE_14 EQU $0d NOTE_15 EQU $0e NOTE_16 EQU $0f -octave: MACRO -; $d0-$d7 - db $d8 - \1 - ENDM -notetype: MACRO - db $d8 - db \1 - ENDM -forceoctave: MACRO - db $d9 - db \1 - ENDM -tempo: MACRO - db $da - bigdw \1 - ENDM -dutycycle: MACRO - db $db - db \1 - ENDM -intensity: MACRO - db $dc - db \1 - ENDM -soundinput: MACRO - db $dd - db \1 - ENDM -unknownmusic0xde: MACRO - db $de - db \1 - ENDM -unknownmusic0xdf: MACRO - db $df - ENDM -unknownmusic0xe0: MACRO - db $e0 - db \1 - db \2 - db \3 - ENDM -vibrato: MACRO - db $e1 - db \1 - db \2 - ENDM -unknownmusic0xe2: MACRO - db $e2 - db \1 - ENDM -togglenoise: MACRO - db $e3 - ENDM -panning: MACRO - db $e4 - db \1 - ENDM -volume: MACRO - db $e5 - db \1 - ENDM -tone: MACRO - db $e6 - bigdw \1 - ENDM -unknownmusic0xe7: MACRO - db $e7 - db \1 - ENDM -unknownmusic0xe8: MACRO - db $e8 - db \1 - ENDM -globaltempo : MACRO - db $e9 - bigdw \1 - ENDM -restartchannel: MACRO - db $ea - bigdw \1 - ENDM -newsong: MACRO - db $eb - dw \1 - ENDM -sfxpriorityon: MACRO - db $ec - ENDM -sfxpriorityoff: MACRO - db $ed - ENDM -unknownmusic0xee: MACRO - db $ee - dw \1 - ENDM -stereopanning: MACRO - db $ef - db \1 - ENDM -sfxtogglenoise: MACRO - db $f0 - db \1 - ENDM -music0xf1: MACRO - db $f1 - ENDM -music0xf2: MACRO - db $f2 - ENDM -music0xf3: MACRO - db $f3 - ENDM -music0xf4: MACRO - db $f4 - ENDM -music0xf5: MACRO - db $f5 - ENDM -music0xf6: MACRO - db $f6 - ENDM -music0xf7: MACRO - db $f7 - ENDM -music0xf8: MACRO - db $f8 - ENDM -unknownmusic0xf9: MACRO - db $f9 - ENDM -setcondition: MACRO - db $fa - db \1 - ENDM -jumpif: MACRO - db $fb - db \1 - dw \2 - ENDM -jumpchannel: MACRO - db $fc - dw \1 - ENDM -loopchannel: MACRO - db $fd - db \1 - dw \2 - ENDM -callchannel: MACRO - db $fe - dw \1 - ENDM -endchannel: MACRO - db $ff - ENDM - ; specials