diff options
Diffstat (limited to 'data')
| -rwxr-xr-x | data/sgb/sgb_packets.asm | 26 | ||||
| -rw-r--r-- | data/text_predef_pointers.asm | 3 |
2 files changed, 20 insertions, 9 deletions
diff --git a/data/sgb/sgb_packets.asm b/data/sgb/sgb_packets.asm index 0d52c479..0b6219e1 100755 --- a/data/sgb/sgb_packets.asm +++ b/data/sgb/sgb_packets.asm @@ -4,6 +4,7 @@ ATTR_BLK: MACRO db ($4 << 3) + ((\1 * 6) / 16 + 1) db \1 ENDM + ATTR_BLK_DATA: MACRO db \1 ; which regions are affected db \2 + (\3 << 2) + (\4 << 4) ; palette for each region @@ -51,6 +52,7 @@ DATA_SND: MACRO db \3 ; length (1-11) ENDM + BlkPacket_WholeScreen: ATTR_BLK 1 ATTR_BLK_DATA %011, 0,0,0, 00,00, 19,17 @@ -239,13 +241,15 @@ MaskEnCancelPacket: MASK_EN 0 ; This set of packets is found in several Japanese SGB-compatible titles. ; It appears to be part of NCL's SGB devkit. -DataSnd_72548: DATA_SND $85d, $0, 11 +DataSnd_72548: + DATA_SND $85d, $0, 11 db $8C ; cpx #$8c (2) db $D0, $F4 ; bne -$0c db $60 ; rts ds 7, 0 -DataSnd_72558: DATA_SND $852, $0, 11 +DataSnd_72558: + DATA_SND $852, $0, 11 db $A9, $E7 ; lda #$e7 db $9F, $01, $C0, $7E ; sta $7ec001, x db $E8 ; inx @@ -254,7 +258,8 @@ DataSnd_72558: DATA_SND $852, $0, 11 db $E8 ; inx db $E0 ; cpx #$8c (1) -DataSnd_72568: DATA_SND $847, $0, 11 +DataSnd_72568: + DATA_SND $847, $0, 11 db $C4 ; cmp #$c4 (2) db $D0, $16 ; bne +$16 db $A5 ; lda dp @@ -263,7 +268,8 @@ DataSnd_72568: DATA_SND $847, $0, 11 db $D0, $10 ; bne +$10 db $A2, $28 ; ldx #$28 -DataSnd_72578: DATA_SND $83c, $0, 11 +DataSnd_72578: + DATA_SND $83c, $0, 11 db $F0, $12 ; beq +$12 db $A5 ; lda dp db $C9, $C9 ; cmp #$c9 @@ -273,7 +279,8 @@ DataSnd_72578: DATA_SND $83c, $0, 11 db $CA ; dex db $C9 ; cmp #$c4 (1) -DataSnd_72588: DATA_SND $831, $0, 11 +DataSnd_72588: + DATA_SND $831, $0, 11 dbw $0C, $CAA5 ; tsb $caa5 db $C9, $7E ; cmp #$7e db $D0, $06 ; bne +$06 @@ -281,7 +288,8 @@ DataSnd_72588: DATA_SND $831, $0, 11 db $CB ; wai db $C9, $7E ; cmp #$7e -DataSnd_72598: DATA_SND $826, $0, 11 +DataSnd_72598: + DATA_SND $826, $0, 11 db $39 ; bne +$39 (2) dbw $CD, $C48 ; cmp $c48 db $D0, $34 ; bne +$34 @@ -289,7 +297,8 @@ DataSnd_72598: DATA_SND $826, $0, 11 db $C9, $C9 ; cmp #$c9 db $80, $D0 ; bra -$30 -DataSnd_725a8: DATA_SND $81b, $0, 11 +DataSnd_725a8: + DATA_SND $81b, $0, 11 db $EA ; nop db $EA ; nop db $EA ; nop @@ -300,7 +309,8 @@ DataSnd_725a8: DATA_SND $81b, $0, 11 dbw $CD,$C4F ; cmp $c4f db $D0 ; bne +$39 (1) -DataSnd_725b8: DATA_SND $810, $0, 11 +DataSnd_725b8: + DATA_SND $810, $0, 11 dbw $4C, $820 ; jmp $820 db $EA ; nop db $EA ; nop diff --git a/data/text_predef_pointers.asm b/data/text_predef_pointers.asm index bbe9c8d8..8c125fa0 100644 --- a/data/text_predef_pointers.asm +++ b/data/text_predef_pointers.asm @@ -1,5 +1,6 @@ add_tx_pre: MACRO -\1_id:: dw \1 +\1_id:: + dw \1 ENDM TextPredefs:: |