From 76ee2f58c432f3074d2a796e617e510cb2bcadd9 Mon Sep 17 00:00:00 2001 From: Adelaide Walter Date: Wed, 3 Jan 2018 00:40:59 -0500 Subject: [PATCH] WRAM1_Begin -> wd000 --- audio/engine.asm | 8 ++++---- engine/gbc_only.asm | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/audio/engine.asm b/audio/engine.asm index 067e4ff87..feef2fffd 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -40,7 +40,7 @@ _MapSetup_Sound_Off:: ; e8000 ld hl, Channels ; start of channel data ld de, ChannelsEnd - Channels ; length of area to clear (entire sound wram area) -.clearchannels ; clear Channel1-$c2bf +.clearchannels xor a ld [hli], a dec de @@ -2749,7 +2749,7 @@ PlayStereoSFX:: ; e8ca6 add hl, bc ld [hl], a - ld hl, Channel1Field30 - Channel1 ; $c131 - Channel1 + ld hl, Channel1Field30 - Channel1 add hl, bc ld [hl], a @@ -2760,11 +2760,11 @@ PlayStereoSFX:: ; e8ca6 ; ch3-4 ld a, [wSFXDuration] - ld hl, Channel1Field2e - Channel1 ; $c12f - Channel1 + ld hl, Channel1Field2e - Channel1 add hl, bc ld [hl], a - ld hl, Channel1Field2f - Channel1 ; $c130 - Channel1 + ld hl, Channel1Field2f - Channel1 add hl, bc ld [hl], a diff --git a/engine/gbc_only.asm b/engine/gbc_only.asm index ad2785fa9..6e26fad39 100644 --- a/engine/gbc_only.asm +++ b/engine/gbc_only.asm @@ -10,7 +10,7 @@ GBCOnlyScreen: ; 4ea82 call ClearTileMap ld hl, GBCOnlyGFX - ld de, WRAM1_Begin + ld de, wd000 ld a, [rSVBK] push af ld a, 0 @@ -19,7 +19,7 @@ GBCOnlyScreen: ; 4ea82 pop af ld [rSVBK], a - ld de, WRAM1_Begin + ld de, wd000 ld hl, vTiles2 lb bc, BANK(GBCOnlyGFX), $54 call Get2bpp