thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-15 17:46:40 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add warnings about music/sfx macro usage

Browse source 
These are not game limitations, just restrictions for
the macros to behave properly
This commit is contained in:
dannye 2016-07-27 20:57:46 -05:00
parent 4992ae2233
commit dbe2a3b168
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
audio/headers/sfxheaders1.asm
View file

@ -280,6 +280,7 @@ SFX_Go_Outside_1::
SFX_Save_1:: SFX_Save_1::
sfx SFX_Save_1, CH4_ | CH5_ sfx SFX_Save_1, CH4_ | CH5_
; the Pokeflute sound effect directly hijacks channel 2
SFX_Pokeflute:: SFX_Pokeflute::
db CH2 db CH2
dw SFX_Pokeflute_Ch2 dw SFX_Pokeflute_Ch2

6
macros.asm
View file

@ -415,11 +415,10 @@ CH5_ EQU 1 << CH5
CH6_ EQU 1 << CH6 CH6_ EQU 1 << CH6
CH7_ EQU 1 << CH7 CH7_ EQU 1 << CH7
; channel 0 is not optional
music: MACRO music: MACRO
db ((((\2 & CH0_) >> CH0) + ((\2 & CH1_) >> CH1) + ((\2 & CH2_) >> CH2) + ((\2 & CH3_) >> CH3)) - 1) << 6 | CH0 db ((((\2 & CH0_) >> CH0) + ((\2 & CH1_) >> CH1) + ((\2 & CH2_) >> CH2) + ((\2 & CH3_) >> CH3)) - 1) << 6 | CH0
IF \2 & CH0_ dw \1_Ch0
dw \1_Ch0
ENDC
IF \2 & CH1_ IF \2 & CH1_
db CH1 db CH1
dw \1_Ch1 dw \1_Ch1
@ -434,6 +433,7 @@ music: MACRO
ENDC ENDC
ENDM ENDM
; do not start a sound effect with channel 5 or 6, only channel 4 or 7
sfx: MACRO sfx: MACRO
IF \2 & CH4_ IF \2 & CH4_
db ((((\2 & CH4_) >> CH4) + ((\2 & CH5_) >> CH5) + ((\2 & CH6_) >> CH6) + ((\2 & CH7_) >> CH7)) - 1) << 6 | CH4 db ((((\2 & CH4_) >> CH4) + ((\2 & CH5_) >> CH5) + ((\2 & CH6_) >> CH6) + ((\2 & CH7_) >> CH7)) - 1) << 6 | CH4