diff options
Diffstat (limited to 'battle')
| -rw-r--r-- | battle/anim_commands.asm | 20 | ||||
| -rw-r--r-- | battle/core.asm | 10 |
2 files changed, 15 insertions, 15 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index f8f4a26ce..8f9aecbf1 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -1317,7 +1317,7 @@ BattleAnimCmd_E1: ; cc807 (33:4807) .asm_cc834 push hl - call Function37f3 + call LoadCryHeader pop hl jr c, .done @@ -1327,15 +1327,15 @@ BattleAnimCmd_E1: ; cc807 (33:4807) ld b, a push hl - ld hl, CryPitch ; $c2b0 + ld hl, CryPitch ld a, [hli] ld h, [hl] ld l, a add hl, bc ld a, l - ld [CryPitch], a ; $c2b0 + ld [CryPitch], a ld a, h - ld [CryEcho], a ; $c2b1 + ld [CryPitch + 1], a pop hl ld a, [hli] @@ -1354,7 +1354,7 @@ BattleAnimCmd_E1: ; cc807 (33:4807) ld a, 1 ld [$c2bc], a - callab PlayCry + callab _PlayCryHeader .done pop af @@ -1363,11 +1363,11 @@ BattleAnimCmd_E1: ; cc807 (33:4807) ; cc871 (33:4871) Datacc871: ; cc871 -; +pitch, +echo, +length - db $00, $00, $c0, $00 - db $00, $00, $40, $00 - db $00, $00, $00, $00 - db $00, $00, $00, $00 +; +pitch, +length + dw 0, $c0 + dw 0, $40 + dw 0, $00 + dw 0, $00 ; cc881 diff --git a/battle/core.asm b/battle/core.asm index 0ed4dc703..e550d4480 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -2350,7 +2350,7 @@ Function3cef1: ; 3cef1 ld a, $f0 ld [CryTracks], a ld a, [BattleMonSpecies] - call Function37b6 + call PlayStereoCry call Function3d43b hlcoord 9, 7 lb bc, 5, 11 @@ -3741,7 +3741,7 @@ Function3d7c7: ; 3d7c7 ld a, $f ld [CryTracks], a ld a, [TempEnemyMonSpecies] - call Function37b6 + call PlayStereoCry .asm_3d82c call UpdateEnemyHUD @@ -4235,7 +4235,7 @@ Function3db5f: ; 3db5f ld a, $f0 ld [CryTracks], a ld a, [CurPartySpecies] - call Function37b6 + call PlayStereoCry .asm_3dbd6 call UpdatePlayerHUD @@ -4368,7 +4368,7 @@ Function3dc5b: ; 3dc5b ld a, $f0 ld [CryTracks], a ld a, [BattleMonSpecies] - call Function37b6 + call PlayStereoCry ld a, [$c71a] ld c, a ld hl, $c664 @@ -9490,7 +9490,7 @@ BattleStartMessage: ; 3fc8b ld a, $0f ld [CryTracks], a ld a, [TempEnemyMonSpecies] - call Function37b6 + call PlayStereoCry .asm_3fceb ld a, [BattleType] |