diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 20:42:47 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-08-01 20:42:47 -0400 |
| commit | dce013880ef1a8171310db173fdb9c45ea170d37 (patch) | |
| tree | eca7a827b7f56fd2caaf441144ed4e9a1fd50cf8 /home/overworld.asm | |
| parent | d42e9f5b72de3d505622b0eb360f5fdfd388e26b (diff) | |
Attempt to make yellow buildable, part 4
Hardcoded pointers, dr (define rom) macro.
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index f0e7f990..42da2240 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -667,10 +667,10 @@ PlayMapChangeSound:: ; 06ef (0:06ef) aCoord 8, 8 ; upper left tile of the 4x4 square the player's sprite is standing on cp a,$0b ; door tile in tileset 0 jr nz,.didNotGoThroughDoor - ld a,(SFX_02_57 - SFX_Headers_02) / 3 + ld a, $ad ; (SFX_02_57 - SFX_Headers_02) / 3 jr .playSound .didNotGoThroughDoor - ld a,(SFX_02_5c - SFX_Headers_02) / 3 + ld a, $b5 ; (SFX_02_5c - SFX_Headers_02) / 3 .playSound call PlaySound ld a,[wMapPalOffset] @@ -1247,9 +1247,9 @@ CollisionCheckOnLand:: ; 0a1c (0:0a1c) jr nc,.noCollision .collision ld a,[wc02a] - cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing + cp $b4 ; (SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing jr z,.setCarry - ld a,(SFX_02_5b - SFX_Headers_02) / 3 + ld a, $b4 ; (SFX_02_5b - SFX_Headers_02) / 3 call PlaySound ; play collision sound (if it's not already playing) .setCarry scf @@ -1707,9 +1707,9 @@ CollisionCheckOnWater:: ; 0cca (0:0cca) jr nc,.stopSurfing .collision ld a,[wc02a] - cp a,(SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing + cp $b4 ; (SFX_02_5b - SFX_Headers_02) / 3 ; check if collision sound is already playing jr z,.setCarry - ld a,(SFX_02_5b - SFX_Headers_02) / 3 + ld a, $b4 ; (SFX_02_5b - SFX_Headers_02) / 3 call PlaySound ; play collision sound (if it's not already playing) .setCarry scf |