diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-07-19 14:25:28 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-07-19 14:25:28 -0500 |
| commit | bb5ae04ca5654b8c22585bcc094ee05d1ab5e055 (patch) | |
| tree | fc6a371f6f37fb8efe888025f0745eb2109fd909 /battle/anim_commands.asm | |
| parent | 1ba907e3539f51c70c95eed6189c14cea259b71a (diff) | |
| parent | 4757e299be8c7c6981b75b1159bf5e3d28ee544e (diff) | |
Merge pull request #259 from yenatch/cries
Shorten cry defs now that cry parameters are all words.
Diffstat (limited to 'battle/anim_commands.asm')
| -rw-r--r-- | battle/anim_commands.asm | 20 |
1 files changed, 10 insertions, 10 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 |