diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/init.asm | 4 | ||||
| -rw-r--r-- | home/overworld.asm | 12 | ||||
| -rw-r--r-- | home/text.asm | 16 |
3 files changed, 16 insertions, 16 deletions
diff --git a/home/init.asm b/home/init.asm index 671809a7..168524b8 100644 --- a/home/init.asm +++ b/home/init.asm @@ -5,7 +5,7 @@ SoftReset:: ; 1d08 (0:1d08) call DelayFrames ; fallthrough -Init:: ; 1d10 +Init:: ; 1d10 (0:1d10) ; Program init. rLCDC_DEFAULT EQU %11100011 @@ -99,7 +99,7 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB - ld a, BANK(SFX_1f_67) + ld a, $1f ; BANK(SFX_1f_67) ld [wc0ef], a ld [wc0f0], a ld a, $9c 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 diff --git a/home/text.asm b/home/text.asm index ce2f3aa7..b12f5adb 100644 --- a/home/text.asm +++ b/home/text.asm @@ -631,14 +631,14 @@ TextCommand0B:: ; 1a0a (0:1a0a) jp NextTextCommand ; format: text command ID, sound ID or cry ID -TextCommandSounds:: ; 1c64 (0:1c64) - db $0B,(SFX_02_3a - SFX_Headers_02) / 3 - db $12,(SFX_08_46 - SFX_Headers_08) / 3 - db $0E,(SFX_02_41 - SFX_Headers_02) / 3 - db $0F,(SFX_02_3a - SFX_Headers_02) / 3 - db $10,(SFX_02_3b - SFX_Headers_02) / 3 - db $11,(SFX_02_42 - SFX_Headers_02) / 3 - db $13,(SFX_08_45 - SFX_Headers_08) / 3 +TextCommandSounds:: ; 1a3d (0:1a3d) + db $0B,$86 ; (SFX_02_3a - SFX_Headers_02) / 3 + db $12,$9A ; (SFX_08_46 - SFX_Headers_08) / 3 + db $0E,$91 ; (SFX_02_41 - SFX_Headers_02) / 3 + db $0F,$86 ; (SFX_02_3a - SFX_Headers_02) / 3 + db $10,$89 ; (SFX_02_3b - SFX_Headers_02) / 3 + db $11,$94 ; (SFX_02_42 - SFX_Headers_02) / 3 + db $13,$98 ; (SFX_08_45 - SFX_Headers_08) / 3 db $14,NIDORINA ; used in OakSpeech db $15,PIDGEOT ; used in SaffronCityText12 db $16,DEWGONG ; unused? |