Skip to content

Commit cc6ad18

Browse files
Update sgb.inc to use S_*
1 parent a2b688a commit cc6ad18

File tree

1 file changed

+53
-51
lines changed

1 file changed

+53
-51
lines changed

sgb.inc

Lines changed: 53 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,40 @@ def SGB_INC equ 1
1919
; SGB Command Prefixes
2020
;******************************************************************************
2121

22-
def SGB_PAL01 equ $00 << 3
23-
def SGB_PAL23 equ $01 << 3
24-
def SGB_PAL03 equ $02 << 3
25-
def SGB_PAL12 equ $03 << 3
26-
def SGB_ATTR_BLK equ $04 << 3
27-
def SGB_ATTR_LIN equ $05 << 3
28-
def SGB_ATTR_DIV equ $06 << 3
29-
def SGB_ATTR_CHR equ $07 << 3
30-
def SGB_SOUND equ $08 << 3
31-
def SGB_SOU_TRN equ $09 << 3
32-
def SGB_PAL_SET equ $0A << 3
33-
def SGB_PAL_TRN equ $0B << 3
34-
def SGB_ATRC_EN equ $0C << 3
35-
def SGB_TEST_EN equ $0D << 3
36-
def SGB_ICON_EN equ $0E << 3
37-
def SGB_DATA_SND equ $0F << 3
38-
def SGB_DATA_TRN equ $10 << 3
39-
def SGB_MLT_REQ equ $11 << 3
40-
def SGB_JUMP equ $12 << 3
41-
def SGB_CHR_TRN equ $13 << 3
42-
def SGB_PCT_TRN equ $14 << 3
43-
def SGB_ATTR_TRN equ $15 << 3
44-
def SGB_ATTR_SET equ $16 << 3
45-
def SGB_MASK_EN equ $17 << 3
46-
def SGB_OBJ_TRN equ $18 << 3
47-
def SGB_PAL_PRI equ $19 << 3
48-
def SGB_STUB1 equ $1A << 3
49-
def SGB_STUB2 equ $1B << 3
50-
def SGB_STUB3 equ $1C << 3
51-
def SGB_STUB4 equ $1D << 3
52-
def SGB_STUB5 equ $1E << 3
53-
def SGB_STUB6 equ $1F << 3
22+
def S_SGB_COMMAND equ 3
23+
24+
def SGB_PAL01 equ $00 << S_SGB_COMMAND
25+
def SGB_PAL23 equ $01 << S_SGB_COMMAND
26+
def SGB_PAL03 equ $02 << S_SGB_COMMAND
27+
def SGB_PAL12 equ $03 << S_SGB_COMMAND
28+
def SGB_ATTR_BLK equ $04 << S_SGB_COMMAND
29+
def SGB_ATTR_LIN equ $05 << S_SGB_COMMAND
30+
def SGB_ATTR_DIV equ $06 << S_SGB_COMMAND
31+
def SGB_ATTR_CHR equ $07 << S_SGB_COMMAND
32+
def SGB_SOUND equ $08 << S_SGB_COMMAND
33+
def SGB_SOU_TRN equ $09 << S_SGB_COMMAND
34+
def SGB_PAL_SET equ $0A << S_SGB_COMMAND
35+
def SGB_PAL_TRN equ $0B << S_SGB_COMMAND
36+
def SGB_ATRC_EN equ $0C << S_SGB_COMMAND
37+
def SGB_TEST_EN equ $0D << S_SGB_COMMAND
38+
def SGB_ICON_EN equ $0E << S_SGB_COMMAND
39+
def SGB_DATA_SND equ $0F << S_SGB_COMMAND
40+
def SGB_DATA_TRN equ $10 << S_SGB_COMMAND
41+
def SGB_MLT_REQ equ $11 << S_SGB_COMMAND
42+
def SGB_JUMP equ $12 << S_SGB_COMMAND
43+
def SGB_CHR_TRN equ $13 << S_SGB_COMMAND
44+
def SGB_PCT_TRN equ $14 << S_SGB_COMMAND
45+
def SGB_ATTR_TRN equ $15 << S_SGB_COMMAND
46+
def SGB_ATTR_SET equ $16 << S_SGB_COMMAND
47+
def SGB_MASK_EN equ $17 << S_SGB_COMMAND
48+
def SGB_OBJ_TRN equ $18 << S_SGB_COMMAND
49+
def SGB_PAL_PRI equ $19 << S_SGB_COMMAND
50+
def SGB_STUB1 equ $1A << S_SGB_COMMAND
51+
def SGB_STUB2 equ $1B << S_SGB_COMMAND
52+
def SGB_STUB3 equ $1C << S_SGB_COMMAND
53+
def SGB_STUB4 equ $1D << S_SGB_COMMAND
54+
def SGB_STUB5 equ $1E << S_SGB_COMMAND
55+
def SGB_STUB6 equ $1F << S_SGB_COMMAND
5456

5557

5658
;******************************************************************************
@@ -66,32 +68,32 @@ def SGB_SOUND_FLAGS equ $03
6668
; SGB_SOUND Flags
6769
;******************************************************************************
6870

69-
def B_SGB_SOUND_A_PITCH equ 0
71+
def S_SGB_SOUND_A_PITCH equ 0
7072

71-
def SGB_SOUND_A_PITCH_0 equ 0 << B_SGB_SOUND_A_PITCH
72-
def SGB_SOUND_A_PITCH_1 equ 1 << B_SGB_SOUND_A_PITCH
73-
def SGB_SOUND_A_PITCH_2 equ 2 << B_SGB_SOUND_A_PITCH
74-
def SGB_SOUND_A_PITCH_3 equ 3 << B_SGB_SOUND_A_PITCH
73+
def SGB_SOUND_A_PITCH_0 equ 0 << S_SGB_SOUND_A_PITCH
74+
def SGB_SOUND_A_PITCH_1 equ 1 << S_SGB_SOUND_A_PITCH
75+
def SGB_SOUND_A_PITCH_2 equ 2 << S_SGB_SOUND_A_PITCH
76+
def SGB_SOUND_A_PITCH_3 equ 3 << S_SGB_SOUND_A_PITCH
7577

76-
def B_SGB_SOUND_A_VOLUME equ 2
78+
def S_SGB_SOUND_A_VOLUME equ 2
7779

78-
def SGB_SOUND_A_VOLUME_HIGH equ 0 << B_SGB_SOUND_A_VOLUME
79-
def SGB_SOUND_A_VOLUME_MED equ 1 << B_SGB_SOUND_A_VOLUME
80-
def SGB_SOUND_A_VOLUME_LOW equ 2 << B_SGB_SOUND_A_VOLUME
81-
def SGB_SOUND_A_VOLUME_OFF equ 3 << B_SGB_SOUND_A_VOLUME
80+
def SGB_SOUND_A_VOLUME_HIGH equ 0 << S_SGB_SOUND_A_VOLUME
81+
def SGB_SOUND_A_VOLUME_MED equ 1 << S_SGB_SOUND_A_VOLUME
82+
def SGB_SOUND_A_VOLUME_LOW equ 2 << S_SGB_SOUND_A_VOLUME
83+
def SGB_SOUND_A_VOLUME_OFF equ 3 << S_SGB_SOUND_A_VOLUME
8284

83-
def B_SGB_SOUND_B_PITCH equ 4
85+
def S_SGB_SOUND_B_PITCH equ 4
8486

85-
def SGB_SOUND_B_PITCH_0 equ 0 << B_SGB_SOUND_B_PITCH
86-
def SGB_SOUND_B_PITCH_1 equ 1 << B_SGB_SOUND_B_PITCH
87-
def SGB_SOUND_B_PITCH_2 equ 2 << B_SGB_SOUND_B_PITCH
88-
def SGB_SOUND_B_PITCH_3 equ 3 << B_SGB_SOUND_B_PITCH
87+
def SGB_SOUND_B_PITCH_0 equ 0 << S_SGB_SOUND_B_PITCH
88+
def SGB_SOUND_B_PITCH_1 equ 1 << S_SGB_SOUND_B_PITCH
89+
def SGB_SOUND_B_PITCH_2 equ 2 << S_SGB_SOUND_B_PITCH
90+
def SGB_SOUND_B_PITCH_3 equ 3 << S_SGB_SOUND_B_PITCH
8991

90-
def B_SGB_SOUND_B_VOLUME equ 6
92+
def S_SGB_SOUND_B_VOLUME equ 6
9193

92-
def SGB_SOUND_B_VOLUME_HIGH equ 0 << B_SGB_SOUND_B_VOLUME
93-
def SGB_SOUND_B_VOLUME_MED equ 1 << B_SGB_SOUND_B_VOLUME
94-
def SGB_SOUND_B_VOLUME_LOW equ 2 << B_SGB_SOUND_B_VOLUME
94+
def SGB_SOUND_B_VOLUME_HIGH equ 0 << S_SGB_SOUND_B_VOLUME
95+
def SGB_SOUND_B_VOLUME_MED equ 1 << S_SGB_SOUND_B_VOLUME
96+
def SGB_SOUND_B_VOLUME_LOW equ 2 << S_SGB_SOUND_B_VOLUME
9597

9698

9799
;******************************************************************************

0 commit comments

Comments
 (0)