WIP messing with stuff · hUGETracker

Modifieddriver.z80 +48−44

 ;; Stack starts at $FFFE
 PATTERN_LENGTH EQU 64
-TICKS EQU 4
+TICKS EQU 7
 ; $0000 - $003F: RST handlers.
 SECTION "Song Data", ROM0
 ;; order_cnt is the number of orders times 2
 order_cnt: db 2
-order1: dw tfau_bass ;; unreal ;; unreal;, lunawaves, lunawaves, unreal
+order1: dw unreal ;; unreal ;; unreal;, lunawaves, lunawaves, unreal
-order2: dw empty ;; empty, unreal, unreal, lunawaves
+order2: dw unreal_arps ;; empty, unreal, unreal, lunawaves
 order3: dw empty
 order4: dw empty
     jp set_channel_volume
 fx_set_volume:
-    ret
     ret nz ;; Return if we're not on tick zero.
     ;; B: channel
     ;; Arguments to this effect will be massaged to correct form for the channel
     ;; in the editor so we don't have to AND and SWAP and stuff.
-    ld d, 6
-    call setup_channel_pointer
 set_channel_volume:
     ;; Call with:
     ;; Correct volume value in D
     ld a, d
     ld [rAUD3LEVEL], a
-    ; ld a, [temp_note_value]
-    ; ld h, a
-    ; ld a, [temp_note_value+1]
-    ; ld l, a
-    ; call playnote3
     ret
 set_chn_2_vol:
-    ld a, d
+    ; ld a, d
-    and %00001111
+    ; and %00001111
-    or c
+    ; or c
+    ld a, c
     ld [rAUD2ENV], a
-    ld a, [temp_note_value]
-    ld h, a
-    ld a, [temp_note_value+1]
-    ld l, a
-    call _playnote2
     ret
 set_chn_1_vol:
     ld a, d
     or c
     ld [rAUD1ENV], a
-    ld a, [temp_note_value]
+    ret
-    ld h, a
-    ld a, [temp_note_value+1]
-    ld l, a
-    call _playnote1
-    ;; Don't call _playnote. This is done by grabbing the return
-    ;; address and manually skipping the next call instruction.
-    pop hl
-    ld a, 3
-    add_a_to_hl
-    jp hl
 fx_vibrato:
     return_if_tick_zero
     jp _update_channel
+;; TODO: Figure out why this is not toneporta-ing as much as it used to. so bizarre...
 fx_toneporta:
-    jp nz, .do_toneporta
+    jr nz, .do_toneporta
     ;; We're on tick zero, so just move the temp note value into the toneporta target.
     ld d, 4
     ;; If the note is nonexistent, then just return
     ld a, [hl-]
     cp LAST_NOTE
-    ret nc
+    jr nc, .return_skip
     ld a, [temp_note_value+1]
     ld c, a
     ;; Don't call _playnote. This is done by grabbing the return
     ;; address and manually skipping the next call instruction.
+.return_skip:
     pop hl
     pop af
     ld a, 14
     ;; free registers: A, D, E, H, L
-    ;; TOOD: Optimize. This usage of the stack isn't great but IMO it's
+    ;; TODO: Optimize. This usage of the stack isn't great but IMO it's
     ;; better than using the stack hack which forces all effects to screw with
     ;; pushing and popping. Most effects won't need to do this.
     ld d, 0
     call _playnote1 ; 3 bytes
 .after_note1:
+    ;; remove this
+    ld a, %11110000
+    ld [rAUD2ENV], a
+    loadShort pattern2, b, c
+    call _lookup_note
+    ld a, h
+    ld [temp_note_value], a
+    ld a, l
+    ld [temp_note_value+1], a
+    push af
+    ld e, 1
+    call _doeffect
+    pop af
+    jr nc, .after_note2
+    ld a, [temp_note_value]
+    ld h, a
+    ld a, [temp_note_value+1]
+    ld l, a
+    call _playnote2 ; 3 bytes
     ; loadShort pattern2, b, c
     ; call _lookup_note
     ; jr nc, .after_note2
     call _doeffect
 .after_effect1:
-    ; loadShort pattern2, b, c
+    loadShort pattern2, b, c
-    ; call _lookup_note
+    call _lookup_note
-    ; ld a, c
+    ld a, c
-    ; cp 0
+    cp 0
-    ; jr z, .after_effect2
+    jr z, .after_effect2
-    ; ld e, 1
+    ld e, 1
-    ; call _doeffect
+    call _doeffect
 .after_effect2:
     ; loadShort pattern3, b, c

Commit `a0c1f62`

Go to file

Commit a0c1f62

Commit `a0c1f62`