Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaning up static HRAM labels; movement stuff, route 38 trainers

Browse Source
This commit is contained in:
PikalaxALT
2015-11-09 23:01:45 -05:00
parent 77d0a8a396
commit f1b2466cc3
20 changed files with 483 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
audio/engine.asm
View File

@@ -26,7 +26,7 @@ _SoundRestart:: ; e8000
.clearsound
; sound channel 1 2 3 4
xor a
ld [hli], a ; rNR10, $ff15, rNR30, $ff1f ; sweep = 0
ld [hli], a ; rNR10, rNR20, rNR30, rNR40 ; sweep = 0
ld [hli], a ; rNR11, rNR21, rNR31, rNR41 ; length/wavepattern = 0
ld a, $08
@@ -345,7 +345,7 @@ UpdateChannels: ; e8125
ld a, [rNR52]
and a, %10001101 ; ch2 off
ld [rNR52], a
ld hl, $ff15
ld hl, rNR20
call ClearChannel
ret
.asm_e8204
@@ -418,39 +418,39 @@ rept 4
endr
ld de, WaveSamples
add hl, de
; load wavepattern into $ff30-$ff3f
; load wavepattern into rWave_0-rWave_f
ld a, [hli]
ld [$ff30], a
ld [rWave_0], a
ld a, [hli]
ld [$ff31], a
ld [rWave_1], a
ld a, [hli]
ld [$ff32], a
ld [rWave_2], a
ld a, [hli]
ld [$ff33], a
ld [rWave_3], a
ld a, [hli]
ld [$ff34], a
ld [rWave_4], a
ld a, [hli]
ld [$ff35], a
ld [rWave_5], a
ld a, [hli]
ld [$ff36], a
ld [rWave_6], a
ld a, [hli]
ld [$ff37], a
ld [rWave_7], a
ld a, [hli]
ld [$ff38], a
ld [rWave_8], a
ld a, [hli]
ld [$ff39], a
ld [rWave_9], a
ld a, [hli]
ld [$ff3a], a
ld [rWave_a], a
ld a, [hli]
ld [$ff3b], a
ld [rWave_b], a
ld a, [hli]
ld [$ff3c], a
ld [rWave_c], a
ld a, [hli]
ld [$ff3d], a
ld [rWave_d], a
ld a, [hli]
ld [$ff3e], a
ld [rWave_e], a
ld a, [hli]
ld [$ff3f], a
ld [rWave_f], a
pop hl
ld a, [wc293]
and a, $f0
@@ -475,7 +475,7 @@ endr
ld a, [rNR52]
and a, %10000111 ; ch4 off
ld [rNR52], a
ld hl, $ff1f
ld hl, rNR40
call ClearChannel
ret
.asm_e82d4
@@ -3179,12 +3179,12 @@ endr
; e8ffe
ClearChannel: ; e8ffe
; input: hl = beginning hw sound register (rNR10, $ff15, rNR30, $ff1f)
; input: hl = beginning hw sound register (rNR10, rNR20, rNR30, rNR40)
; output: 00 00 80 00 80
; sound channel 1 2 3 4
xor a
ld [hli], a ; rNR10, $ff15, rNR30, $ff1f ; sweep = 0
ld [hli], a ; rNR10, rNR20, rNR30, rNR40 ; sweep = 0
ld [hli], a ; rNR11, rNR21, rNR31, rNR41 ; length/wavepattern = 0
ld a, $08