@@ -135,11 +135,11 @@ ENDM |
| 135 |
|
135 |
|
| 136 |
SECTION "Song Data", ROM0 |
136 |
SECTION "Song Data", ROM0 |
| 137 |
;; order_cnt is the number of orders times 2 |
137 |
;; order_cnt is the number of orders times 2 |
| 138 |
order_cnt: db 2 |
138 |
order_cnt: db 4 |
| 139 |
order1: dw tfau_arps, tfau_bass, empty |
139 |
order1: dw tfau_arps, unreal |
| 140 |
order2: dw empty, empty, empty |
140 |
order2: dw silence, unreal_arps |
| 141 |
order3: dw tfau_bass, empty, empty |
141 |
order3: dw tfau_bass, silence |
| 142 |
order4: dw empty, empty, empty |
142 |
order4: dw empty, empty |
| 143 |
|
143 |
|
| 144 |
lunawaves: |
144 |
lunawaves: |
| 145 |
include "lunawaves.inc" |
145 |
include "lunawaves.inc" |
@@ -153,7 +153,11 @@ tfau_bass: |
| 153 |
include "tfau_bass.inc" |
153 |
include "tfau_bass.inc" |
| 154 |
empty: |
154 |
empty: |
| 155 |
rept 64 |
155 |
rept 64 |
| 156 |
dn 90, 0, 0 |
156 |
dn ___, 0, 0 |
|
|
157 |
endr |
|
|
158 |
silence: |
|
|
159 |
rept 64 |
|
|
160 |
dn C_4, 0, $C00 |
| 157 |
endr |
161 |
endr |
| 158 |
testpatt: |
162 |
testpatt: |
| 159 |
rept 16 |
163 |
rept 16 |
@@ -1631,10 +1635,6 @@ _halt: |
| 1631 |
; Do nothing, forever |
1635 |
; Do nothing, forever |
| 1632 |
halt |
1636 |
halt |
| 1633 |
_nop: |
1637 |
_nop: |
| 1634 |
;; This NOP needs to be here due to a gameboy hardware bug |
|
|
| 1635 |
;; where an instruction after a HALT will be skipped. We label |
|
|
| 1636 |
;; it because it's also used in _dosound as a "blank" highmask. |
|
|
| 1637 |
;; Pretty clever, huh? |
|
|
| 1638 |
nop |
1638 |
nop |
| 1639 |
jr _halt |
1639 |
jr _halt |
| 1640 |
|
1640 |
|