diff options
| author | dannye <33dannye@gmail.com> | 2022-09-11 23:34:59 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2022-09-12 00:53:37 -0500 |
| commit | ecab35295aefb44227ba38f257dc40c8c10474e3 (patch) | |
| tree | d04160bc19180ee50a941d121f90cc7071e7a672 /home | |
| parent | Replace Hard-Coded Number With Constant (diff) | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 16 | ||||
| -rw-r--r-- | home/delay.asm | 2 | ||||
| -rw-r--r-- | home/overworld.asm | 4 | ||||
| -rw-r--r-- | home/printer.asm | 1 | ||||
| -rw-r--r-- | home/window.asm | 2 |
5 files changed, 12 insertions, 13 deletions
diff --git a/home/audio.asm b/home/audio.asm index 41fb503a..48e00f67 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -140,10 +140,10 @@ PlayMusic:: Func_2223:: xor a - ld [wChannelSoundIDs + Ch5], a - ld [wChannelSoundIDs + Ch6], a - ld [wChannelSoundIDs + Ch7], a - ld [wChannelSoundIDs + Ch8], a + ld [wChannelSoundIDs + CHAN5], a + ld [wChannelSoundIDs + CHAN6], a + ld [wChannelSoundIDs + CHAN7], a + ld [wChannelSoundIDs + CHAN8], a ldh [rNR10], a ret @@ -160,10 +160,10 @@ PlaySound:: and a jr z, .next xor a - ld [wChannelSoundIDs + Ch5], a - ld [wChannelSoundIDs + Ch6], a - ld [wChannelSoundIDs + Ch7], a - ld [wChannelSoundIDs + Ch8], a + ld [wChannelSoundIDs + CHAN5], a + ld [wChannelSoundIDs + CHAN6], a + ld [wChannelSoundIDs + CHAN7], a + ld [wChannelSoundIDs + CHAN8], a .next ld a, [wAudioFadeOutControl] and a ; has a fade-out length been specified? diff --git a/home/delay.asm b/home/delay.asm index eba865c2..edd3a5cd 100644 --- a/home/delay.asm +++ b/home/delay.asm @@ -18,7 +18,7 @@ WaitForSoundToFinish:: ret nz push hl .waitLoop - ld hl, wChannelSoundIDs + Ch5 + ld hl, wChannelSoundIDs + CHAN5 xor a or [hl] inc hl diff --git a/home/overworld.asm b/home/overworld.asm index e9ef2fc0..62d0e3b7 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1257,7 +1257,7 @@ CollisionCheckOnLand:: call CheckTilePassable jr nc, .noCollision .collision - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_COLLISION ; check if collision sound is already playing jr z, .setCarry ld a, SFX_COLLISION @@ -1686,7 +1686,7 @@ CollisionCheckOnWater:: call IsTilePassable jr nc, .stopSurfing .collision - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_COLLISION ; check if collision sound is already playing jr z, .setCarry ld a, SFX_COLLISION diff --git a/home/printer.asm b/home/printer.asm index 6d9f145c..2591567b 100644 --- a/home/printer.asm +++ b/home/printer.asm @@ -1,4 +1,3 @@ - PrinterSerial:: homecall PrinterSerial_ ret diff --git a/home/window.asm b/home/window.asm index a3c313c0..f8cc4589 100644 --- a/home/window.asm +++ b/home/window.asm @@ -70,7 +70,7 @@ HandleMenuInput_:: ld [wCurrentMenuItem], a ; wrap to the bottom of the menu jr .checkOtherKeys .checkIfDownPressed - bit 7, a + bit BIT_D_DOWN, a jr z, .checkOtherKeys .downPressed ld a, [wCurrentMenuItem] |