diff options
| author | ehw <Knuckles500@gmail.com> | 2018-06-04 01:01:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 01:01:20 -0400 |
| commit | 0866f63f444d58f53cc53624778737a2d48119bc (patch) | |
| tree | d673199eb92b989dc10598ebd4534a8fcd0c4f3b | |
| parent | 77d75a00c5df0bac4cdc7e63cd157d734a6ce79b (diff) | |
Update wram.asm and title.asm for new sound findings
| -rw-r--r-- | engine/title.asm | 8 | ||||
| -rw-r--r-- | wram.asm | 51 |
2 files changed, 28 insertions, 31 deletions
diff --git a/engine/title.asm b/engine/title.asm index e141096..097a585 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -445,14 +445,14 @@ endc ld hl, wJumptableIndex inc [hl] xor a - ld [wNextBGM], a ; C1A7 - ld [wNextBGM + 1], a - ld hl, wSoundFade ; C1A5 + ld [wMusicFadeID], a ; C1A7 + ld [wMusicFadeID + 1], a + ld hl, wMusicFade ; C1A5 ld [hl], 8 ret TitleSeq_FadeMusicOut:: ; 615C - ld a, [wSoundFade] + ld a, [wMusicFade] and a ret nz ld a, 3 @@ -17,46 +17,43 @@ wChannel6:: channel_struct wChannel6 ; c0fa wChannel7:: channel_struct wChannel7 ; c12c wChannel8:: channel_struct wChannel8 ; c15e - ds 8 ; TODO + ds 1 ; c190 -wCurChannel:: ; c198 - db +wCurTrackDuty:: db ; c191 +wCurTrackIntensity:: db ; c192 +wCurTrackFrequency:: dw ; c193 +wc195:: db ; c195 -wVolume:: ; c199 - db + ds 2 ; TODO - ds 2 ; TODO +wCurChannel:: db ; c198 +wVolume:: db ; c199 +wSoundOutput:: db ; c19a -wMusicID:: ; c19c - dw + ds 1 ; TODO + +wMusicID:: dw ; c19c +wMusicBank:: db ; c19e -wMusicBank:: ; c19e - db - ds 6 ; TODO - -wSoundFade:: ; c1a5 - db - - ds 1 -wNextBGM:: ; c1a7 +wMusicFade:: ; c1a5 +; fades volume over x frames +; bit 7: fade in/out +; bit 0-6: number of frames for each volume level +; $00 = none (default) db - - ds 5 - -wMapMusic:: ; c1ad - db +wMusicFadeCount:: db ; c1a6 +wMusicFadeID:: dw ; c1a7 -wCryPitch:: ; c1ae - dw + ds 4 ; TODO -wCryLength:: ; c1b0 - dw +wMapMusic:: db ; c1ad +wCryPitch:: dw ; c1ae +wCryLength:: dw ; c1b0 ds 10 ; TODO - ; either wChannelsEnd or wMusicEnd, unsure wMusicInitEnd:: ; c1bc |