diff options
Diffstat (limited to 'src/macros')
| -rw-r--r-- | src/macros/audio.asm | 14 | ||||
| -rw-r--r-- | src/macros/data.asm | 12 | ||||
| -rw-r--r-- | src/macros/wram.asm | 7 |
3 files changed, 26 insertions, 7 deletions
diff --git a/src/macros/audio.asm b/src/macros/audio.asm index 0c13596..4bc6d91 100644 --- a/src/macros/audio.asm +++ b/src/macros/audio.asm @@ -94,8 +94,8 @@ tie: MACRO db $d9 ENDM -musicdc: MACRO - db $dc, \1 +stereo_panning: MACRO + db $dc, (\1 << 4) | \2 ENDM MainLoop: MACRO @@ -129,7 +129,7 @@ music_ret: MACRO db $e3 ENDM -musice4: MACRO +frequency_offset: MACRO db $e4, \1 ENDM @@ -145,11 +145,11 @@ wave: MACRO db $e7, \1 ENDM -musice8: MACRO +cutoff: MACRO db $e8, \1 ENDM -musice9: MACRO +echo: MACRO db $e9, \1 ENDM @@ -162,12 +162,12 @@ vibrato_delay: MACRO ENDM ; unused -;musicec: MACRO +;pitch_offset: MACRO ; db $ec, \1 ;ENDM ; unused -;musiced: MACRO +;adjust_pitch_offset: MACRO ; db $ed, \1 ;ENDM diff --git a/src/macros/data.asm b/src/macros/data.asm index 23de208..519468f 100644 --- a/src/macros/data.asm +++ b/src/macros/data.asm @@ -81,6 +81,18 @@ gfx: MACRO dw ($4000 * (BANK(\1) - BANK(CardGraphics)) + (\1 - $4000)) / 8 ENDM +frame_table: MACRO + db BANK(\1) - BANK(AnimData1) ; maybe use better reference for Bank20? + dw \1 +ENDM + +frame_data: MACRO + db \1 ; frame index + db \2 ; anim count + db \3 ; x translation + db \4 ; y translation +ENDM + tx: MACRO dw \1_ ENDM diff --git a/src/macros/wram.asm b/src/macros/wram.asm index 8545972..7b8456b 100644 --- a/src/macros/wram.asm +++ b/src/macros/wram.asm @@ -76,3 +76,10 @@ loaded_npc_struct: MACRO \1Field0x0a:: ds 1 \1Field0x0b:: ds 1 ENDM + +sprite_vram_struct: MACRO +\1Valid:: ds 1 +\1ID:: ds 1 +\1TileOffset:: ds 1 +\1TileSize:: ds 1 +ENDM |