From ab018a5094c37688d9f111cd89ed2514fb38b0be Mon Sep 17 00:00:00 2001 From: yenatch Date: Fri, 18 Jul 2014 09:50:31 -0700 Subject: [PATCH] Cry "echo" is actually the upper byte of pitch (now a word). --- audio/cry_headers.asm | 765 +++++++++++++-------------------------- audio/engine.asm | 7 +- battle/anim_commands.asm | 16 +- home.asm | 2 +- home/audio.asm | 2 +- main.asm | 6 +- wram.asm | 7 +- 7 files changed, 273 insertions(+), 532 deletions(-) diff --git a/audio/cry_headers.asm b/audio/cry_headers.asm index 1a80e1434..c7188cc43 100644 --- a/audio/cry_headers.asm +++ b/audio/cry_headers.asm @@ -1,1530 +1,1275 @@ BulbasaurCryHeader: ; 0xf2787 dw $0f ; cry id - db $80 ; pitch - db $00 ; echo + dw $080 ; pitch dw $081 ; length IvysaurCryHeader: ; 0xf278d dw $0f ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $100 ; length VenusaurCryHeader: ; 0xf2793 dw $0f ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $140 ; length CharmanderCryHeader: ; 0xf2799 dw $04 ; cry id - db $60 ; pitch - db $00 ; echo + dw $060 ; pitch dw $0c0 ; length CharmeleonCryHeader: ; 0xf279f dw $04 ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $0c0 ; length CharizardCryHeader: ; 0xf27a5 dw $04 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length SquirtleCryHeader: ; 0xf27ab dw $1d ; cry id - db $60 ; pitch - db $00 ; echo + dw $060 ; pitch dw $0c0 ; length WartortleCryHeader: ; 0xf27b1 dw $1d ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $0c0 ; length BlastoiseCryHeader: ; 0xf27b7 dw $13 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length CaterpieCryHeader: ; 0xf27bd dw $16 ; cry id - db $80 ; pitch - db $00 ; echo + dw $080 ; pitch dw $0a0 ; length MetapodCryHeader: ; 0xf27c3 dw $1c ; cry id - db $cc ; pitch - db $00 ; echo + dw $0cc ; pitch dw $081 ; length ButterfreeCryHeader: ; 0xf27c9 dw $16 ; cry id - db $77 ; pitch - db $00 ; echo + dw $077 ; pitch dw $0c0 ; length WeedleCryHeader: ; 0xf27cf dw $15 ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $081 ; length KakunaCryHeader: ; 0xf27d5 dw $13 ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $081 ; length BeedrillCryHeader: ; 0xf27db dw $13 ; cry id - db $60 ; pitch - db $00 ; echo + dw $060 ; pitch dw $100 ; length PidgeyCryHeader: ; 0xf27e1 dw $0e ; cry id - db $df ; pitch - db $00 ; echo + dw $0df ; pitch dw $084 ; length PidgeottoCryHeader: ; 0xf27e7 dw $14 ; cry id - db $28 ; pitch - db $00 ; echo + dw $028 ; pitch dw $140 ; length PidgeotCryHeader: ; 0xf27ed dw $14 ; cry id - db $11 ; pitch - db $00 ; echo + dw $011 ; pitch dw $17f ; length RattataCryHeader: ; 0xf27f3 dw $22 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length RaticateCryHeader: ; 0xf27f9 dw $22 ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $17f ; length SpearowCryHeader: ; 0xf27ff dw $10 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length FearowCryHeader: ; 0xf2805 dw $18 ; cry id - db $40 ; pitch - db $00 ; echo + dw $040 ; pitch dw $120 ; length EkansCryHeader: ; 0xf280b dw $17 ; cry id - db $12 ; pitch - db $00 ; echo + dw $012 ; pitch dw $0c0 ; length ArbokCryHeader: ; 0xf2811 dw $17 ; cry id - db $e0 ; pitch - db $00 ; echo + dw $0e0 ; pitch dw $090 ; length PikachuCryHeader: ; 0xf2817 dw $0f ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $081 ; length RaichuCryHeader: ; 0xf281d dw $09 ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $088 ; length SandshrewCryHeader: ; 0xf2823 dw $00 ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $0c0 ; length SandslashCryHeader: ; 0xf2829 dw $00 ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $17f ; length NidoranFCryHeader: ; 0xf282f dw $01 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length NidorinaCryHeader: ; 0xf2835 dw $01 ; cry id - db $2c ; pitch - db $00 ; echo + dw $02c ; pitch dw $160 ; length NidoqueenCryHeader: ; 0xf283b dw $0a ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length NidoranMCryHeader: ; 0xf2841 dw $00 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length NidorinoCryHeader: ; 0xf2847 dw $00 ; cry id - db $2c ; pitch - db $00 ; echo + dw $02c ; pitch dw $140 ; length NidokingCryHeader: ; 0xf284d dw $09 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length ClefairyCryHeader: ; 0xf2853 dw $19 ; cry id - db $cc ; pitch - db $00 ; echo + dw $0cc ; pitch dw $081 ; length ClefableCryHeader: ; 0xf2859 dw $19 ; cry id - db $aa ; pitch - db $00 ; echo + dw $0aa ; pitch dw $0a0 ; length VulpixCryHeader: ; 0xf285f dw $24 ; cry id - db $4f ; pitch - db $00 ; echo + dw $04f ; pitch dw $090 ; length NinetalesCryHeader: ; 0xf2865 dw $24 ; cry id - db $88 ; pitch - db $00 ; echo + dw $088 ; pitch dw $0e0 ; length JigglypuffCryHeader: ; 0xf286b dw $0e ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $0b5 ; length WigglytuffCryHeader: ; 0xf2871 dw $0e ; cry id - db $68 ; pitch - db $00 ; echo + dw $068 ; pitch dw $0e0 ; length ZubatCryHeader: ; 0xf2877 dw $1d ; cry id - db $e0 ; pitch - db $00 ; echo + dw $0e0 ; pitch dw $100 ; length GolbatCryHeader: ; 0xf287d dw $1d ; cry id - db $fa ; pitch - db $00 ; echo + dw $0fa ; pitch dw $100 ; length OddishCryHeader: ; 0xf2883 dw $08 ; cry id - db $dd ; pitch - db $00 ; echo + dw $0dd ; pitch dw $081 ; length GloomCryHeader: ; 0xf2889 dw $08 ; cry id - db $aa ; pitch - db $00 ; echo + dw $0aa ; pitch dw $0c0 ; length VileplumeCryHeader: ; 0xf288f dw $23 ; cry id - db $22 ; pitch - db $00 ; echo + dw $022 ; pitch dw $17f ; length ParasCryHeader: ; 0xf2895 dw $1e ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $160 ; length ParasectCryHeader: ; 0xf289b dw $1e ; cry id - db $42 ; pitch - db $00 ; echo + dw $042 ; pitch dw $17f ; length VenonatCryHeader: ; 0xf28a1 dw $1a ; cry id - db $44 ; pitch - db $00 ; echo + dw $044 ; pitch dw $0c0 ; length VenomothCryHeader: ; 0xf28a7 dw $1a ; cry id - db $29 ; pitch - db $00 ; echo + dw $029 ; pitch dw $100 ; length DiglettCryHeader: ; 0xf28ad dw $0b ; cry id - db $aa ; pitch - db $00 ; echo + dw $0aa ; pitch dw $081 ; length DugtrioCryHeader: ; 0xf28b3 dw $0b ; cry id - db $2a ; pitch - db $00 ; echo + dw $02a ; pitch dw $090 ; length MeowthCryHeader: ; 0xf28b9 dw $19 ; cry id - db $77 ; pitch - db $00 ; echo + dw $077 ; pitch dw $090 ; length PersianCryHeader: ; 0xf28bf dw $19 ; cry id - db $99 ; pitch - db $00 ; echo + dw $099 ; pitch dw $17f ; length PsyduckCryHeader: ; 0xf28c5 dw $21 ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $0e0 ; length GolduckCryHeader: ; 0xf28cb dw $21 ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $0c0 ; length MankeyCryHeader: ; 0xf28d1 dw $0a ; cry id - db $dd ; pitch - db $00 ; echo + dw $0dd ; pitch dw $0e0 ; length PrimeapeCryHeader: ; 0xf28d7 dw $0a ; cry id - db $af ; pitch - db $00 ; echo + dw $0af ; pitch dw $0c0 ; length GrowlitheCryHeader: ; 0xf28dd dw $1f ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $0c0 ; length ArcanineCryHeader: ; 0xf28e3 dw $15 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length PoliwagCryHeader: ; 0xf28e9 dw $0e ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $17f ; length PoliwhirlCryHeader: ; 0xf28ef dw $0e ; cry id - db $77 ; pitch - db $00 ; echo + dw $077 ; pitch dw $0e0 ; length PoliwrathCryHeader: ; 0xf28f5 dw $0e ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $17f ; length AbraCryHeader: ; 0xf28fb dw $1c ; cry id - db $c0 ; pitch - db $00 ; echo + dw $0c0 ; pitch dw $081 ; length KadabraCryHeader: ; 0xf2901 dw $1c ; cry id - db $a8 ; pitch - db $00 ; echo + dw $0a8 ; pitch dw $140 ; length AlakazamCryHeader: ; 0xf2907 dw $1c ; cry id - db $98 ; pitch - db $00 ; echo + dw $098 ; pitch dw $17f ; length MachopCryHeader: ; 0xf290d dw $1f ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $081 ; length MachokeCryHeader: ; 0xf2913 dw $1f ; cry id - db $48 ; pitch - db $00 ; echo + dw $048 ; pitch dw $0e0 ; length MachampCryHeader: ; 0xf2919 dw $1f ; cry id - db $08 ; pitch - db $00 ; echo + dw $008 ; pitch dw $140 ; length BellsproutCryHeader: ; 0xf291f dw $21 ; cry id - db $55 ; pitch - db $00 ; echo + dw $055 ; pitch dw $081 ; length WeepinbellCryHeader: ; 0xf2925 dw $25 ; cry id - db $44 ; pitch - db $00 ; echo + dw $044 ; pitch dw $0a0 ; length VictreebelCryHeader: ; 0xf292b dw $25 ; cry id - db $66 ; pitch - db $00 ; echo + dw $066 ; pitch dw $14c ; length TentacoolCryHeader: ; 0xf2931 dw $1a ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length TentacruelCryHeader: ; 0xf2937 dw $1a ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $17f ; length GeodudeCryHeader: ; 0xf293d dw $24 ; cry id - db $f0 ; pitch - db $00 ; echo + dw $0f0 ; pitch dw $090 ; length GravelerCryHeader: ; 0xf2943 dw $24 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length GolemCryHeader: ; 0xf2949 dw $12 ; cry id - db $e0 ; pitch - db $00 ; echo + dw $0e0 ; pitch dw $0c0 ; length PonytaCryHeader: ; 0xf294f dw $25 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length RapidashCryHeader: ; 0xf2955 dw $25 ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $140 ; length SlowpokeCryHeader: ; 0xf295b dw $02 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length SlowbroCryHeader: ; 0xf2961 dw $1f ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length MagnemiteCryHeader: ; 0xf2967 dw $1c ; cry id - db $80 ; pitch - db $00 ; echo + dw $080 ; pitch dw $0e0 ; length MagnetonCryHeader: ; 0xf296d dw $1c ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $140 ; length FarfetchDCryHeader: ; 0xf2973 dw $10 ; cry id - db $dd ; pitch - db $00 ; echo + dw $0dd ; pitch dw $081 ; length DoduoCryHeader: ; 0xf2979 dw $0b ; cry id - db $bb ; pitch - db $00 ; echo + dw $0bb ; pitch dw $081 ; length DodrioCryHeader: ; 0xf297f dw $0b ; cry id - db $99 ; pitch - db $00 ; echo + dw $099 ; pitch dw $0a0 ; length SeelCryHeader: ; 0xf2985 dw $0c ; cry id - db $88 ; pitch - db $00 ; echo + dw $088 ; pitch dw $140 ; length DewgongCryHeader: ; 0xf298b dw $0c ; cry id - db $23 ; pitch - db $00 ; echo + dw $023 ; pitch dw $17f ; length GrimerCryHeader: ; 0xf2991 dw $05 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length MukCryHeader: ; 0xf2997 dw $07 ; cry id - db $ef ; pitch - db $00 ; echo + dw $0ef ; pitch dw $17f ; length ShellderCryHeader: ; 0xf299d dw $18 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length CloysterCryHeader: ; 0xf29a3 dw $18 ; cry id - db $6f ; pitch - db $00 ; echo + dw $06f ; pitch dw $160 ; length GastlyCryHeader: ; 0xf29a9 dw $1c ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length HaunterCryHeader: ; 0xf29af dw $1c ; cry id - db $30 ; pitch - db $00 ; echo + dw $030 ; pitch dw $0c0 ; length GengarCryHeader: ; 0xf29b5 dw $07 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $17f ; length OnixCryHeader: ; 0xf29bb dw $17 ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $140 ; length DrowzeeCryHeader: ; 0xf29c1 dw $0d ; cry id - db $88 ; pitch - db $00 ; echo + dw $088 ; pitch dw $0a0 ; length HypnoCryHeader: ; 0xf29c7 dw $0d ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $0c0 ; length KrabbyCryHeader: ; 0xf29cd dw $20 ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $160 ; length KinglerCryHeader: ; 0xf29d3 dw $20 ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $160 ; length VoltorbCryHeader: ; 0xf29d9 dw $06 ; cry id - db $ed ; pitch - db $00 ; echo + dw $0ed ; pitch dw $100 ; length ElectrodeCryHeader: ; 0xf29df dw $06 ; cry id - db $a8 ; pitch - db $00 ; echo + dw $0a8 ; pitch dw $110 ; length ExeggcuteCryHeader: ; 0xf29e5 dw $0b ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length ExeggutorCryHeader: ; 0xf29eb dw $0d ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length CuboneCryHeader: ; 0xf29f1 dw $19 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length MarowakCryHeader: ; 0xf29f7 dw $08 ; cry id - db $4f ; pitch - db $00 ; echo + dw $04f ; pitch dw $0e0 ; length HitmonleeCryHeader: ; 0xf29fd dw $12 ; cry id - db $80 ; pitch - db $00 ; echo + dw $080 ; pitch dw $140 ; length HitmonchanCryHeader: ; 0xf2a03 dw $0c ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $140 ; length LickitungCryHeader: ; 0xf2a09 dw $0c ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length KoffingCryHeader: ; 0xf2a0f dw $12 ; cry id - db $e6 ; pitch - db $00 ; echo + dw $0e6 ; pitch dw $15d ; length WeezingCryHeader: ; 0xf2a15 dw $12 ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $17f ; length RhyhornCryHeader: ; 0xf2a1b dw $04 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length RhydonCryHeader: ; 0xf2a21 dw $11 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length ChanseyCryHeader: ; 0xf2a27 dw $14 ; cry id - db $0a ; pitch - db $00 ; echo + dw $00a ; pitch dw $140 ; length TangelaCryHeader: ; 0xf2a2d dw $12 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length KangaskhanCryHeader: ; 0xf2a33 dw $03 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length HorseaCryHeader: ; 0xf2a39 dw $19 ; cry id - db $99 ; pitch - db $00 ; echo + dw $099 ; pitch dw $090 ; length SeadraCryHeader: ; 0xf2a3f dw $19 ; cry id - db $3c ; pitch - db $00 ; echo + dw $03c ; pitch dw $081 ; length GoldeenCryHeader: ; 0xf2a45 dw $16 ; cry id - db $80 ; pitch - db $00 ; echo + dw $080 ; pitch dw $0c0 ; length SeakingCryHeader: ; 0xf2a4b dw $16 ; cry id - db $10 ; pitch - db $00 ; echo + dw $010 ; pitch dw $17f ; length StaryuCryHeader: ; 0xf2a51 dw $1e ; cry id - db $02 ; pitch - db $00 ; echo + dw $002 ; pitch dw $0a0 ; length StarmieCryHeader: ; 0xf2a57 dw $1e ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length MrMimeCryHeader: ; 0xf2a5d dw $20 ; cry id - db $08 ; pitch - db $00 ; echo + dw $008 ; pitch dw $0c0 ; length ScytherCryHeader: ; 0xf2a63 dw $16 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length JynxCryHeader: ; 0xf2a69 dw $0d ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $17f ; length ElectabuzzCryHeader: ; 0xf2a6f dw $06 ; cry id - db $8f ; pitch - db $00 ; echo + dw $08f ; pitch dw $17f ; length MagmarCryHeader: ; 0xf2a75 dw $04 ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $0b0 ; length PinsirCryHeader: ; 0xf2a7b dw $14 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length TaurosCryHeader: ; 0xf2a81 dw $1d ; cry id - db $11 ; pitch - db $00 ; echo + dw $011 ; pitch dw $0c0 ; length MagikarpCryHeader: ; 0xf2a87 dw $17 ; cry id - db $80 ; pitch - db $00 ; echo + dw $080 ; pitch dw $080 ; length GyaradosCryHeader: ; 0xf2a8d dw $17 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length LaprasCryHeader: ; 0xf2a93 dw $1b ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length DittoCryHeader: ; 0xf2a99 dw $0e ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $17f ; length EeveeCryHeader: ; 0xf2a9f dw $1a ; cry id - db $88 ; pitch - db $00 ; echo + dw $088 ; pitch dw $0e0 ; length VaporeonCryHeader: ; 0xf2aa5 dw $1a ; cry id - db $aa ; pitch - db $00 ; echo + dw $0aa ; pitch dw $17f ; length JolteonCryHeader: ; 0xf2aab dw $1a ; cry id - db $3d ; pitch - db $00 ; echo + dw $03d ; pitch dw $100 ; length FlareonCryHeader: ; 0xf2ab1 dw $1a ; cry id - db $10 ; pitch - db $00 ; echo + dw $010 ; pitch dw $0a0 ; length PorygonCryHeader: ; 0xf2ab7 dw $25 ; cry id - db $aa ; pitch - db $00 ; echo + dw $0aa ; pitch dw $17f ; length OmanyteCryHeader: ; 0xf2abd dw $1f ; cry id - db $f0 ; pitch - db $00 ; echo + dw $0f0 ; pitch dw $081 ; length OmastarCryHeader: ; 0xf2ac3 dw $1f ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $0c0 ; length KabutoCryHeader: ; 0xf2ac9 dw $16 ; cry id - db $bb ; pitch - db $00 ; echo + dw $0bb ; pitch dw $0c0 ; length KabutopsCryHeader: ; 0xf2acf dw $18 ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $081 ; length AerodactylCryHeader: ; 0xf2ad5 dw $23 ; cry id - db $20 ; pitch - db $00 ; echo + dw $020 ; pitch dw $170 ; length SnorlaxCryHeader: ; 0xf2adb dw $05 ; cry id - db $55 ; pitch - db $00 ; echo + dw $055 ; pitch dw $081 ; length ArticunoCryHeader: ; 0xf2ae1 dw $09 ; cry id - db $80 ; pitch - db $00 ; echo + dw $080 ; pitch dw $0c0 ; length ZapdosCryHeader: ; 0xf2ae7 dw $18 ; cry id - db $ff ; pitch - db $00 ; echo + dw $0ff ; pitch dw $100 ; length MoltresCryHeader: ; 0xf2aed dw $09 ; cry id - db $f8 ; pitch - db $00 ; echo + dw $0f8 ; pitch dw $0c0 ; length DratiniCryHeader: ; 0xf2af3 dw $0f ; cry id - db $60 ; pitch - db $00 ; echo + dw $060 ; pitch dw $0c0 ; length DragonairCryHeader: ; 0xf2af9 dw $0f ; cry id - db $40 ; pitch - db $00 ; echo + dw $040 ; pitch dw $100 ; length DragoniteCryHeader: ; 0xf2aff dw $0f ; cry id - db $3c ; pitch - db $00 ; echo + dw $03c ; pitch dw $140 ; length MewtwoCryHeader: ; 0xf2b05 dw $1e ; cry id - db $99 ; pitch - db $00 ; echo + dw $099 ; pitch dw $17f ; length MewCryHeader: ; 0xf2b0b dw $1e ; cry id - db $ee ; pitch - db $00 ; echo + dw $0ee ; pitch dw $17f ; length ChikoritaCryHeader: ; 0xf2b11 dw $31 ; cry id - db $f0 ; pitch - db $ff ; echo + dw -$10 ; pitch dw $0b0 ; length BayleefCryHeader: ; 0xf2b17 dw $31 ; cry id - db $de ; pitch - db $ff ; echo + dw -$22 ; pitch dw $120 ; length MeganiumCryHeader: ; 0xf2b1d dw $31 ; cry id - db $49 ; pitch - db $ff ; echo + dw -$b7 ; pitch dw $200 ; length CyndaquilCryHeader: ; 0xf2b23 dw $30 ; cry id - db $47 ; pitch - db $03 ; echo + dw $347 ; pitch dw $080 ; length QuilavaCryHeader: ; 0xf2b29 dw $30 ; cry id - db $21 ; pitch - db $03 ; echo + dw $321 ; pitch dw $120 ; length TyphlosionCryHeader: ; 0xf2b2f dw $3a ; cry id - db $00 ; pitch - db $0f ; echo + dw $f00 ; pitch dw $0d4 ; length TotodileCryHeader: ; 0xf2b35 dw $32 ; cry id - db $6c ; pitch - db $04 ; echo + dw $46c ; pitch dw $0e8 ; length CroconawCryHeader: ; 0xf2b3b dw $32 ; cry id - db $40 ; pitch - db $04 ; echo + dw $440 ; pitch dw $110 ; length FeraligatrCryHeader: ; 0xf2b41 dw $32 ; cry id - db $fc ; pitch - db $03 ; echo + dw $3fc ; pitch dw $180 ; length SentretCryHeader: ; 0xf2b47 dw $2e ; cry id - db $8a ; pitch - db $00 ; echo + dw $08a ; pitch dw $0b8 ; length FurretCryHeader: ; 0xf2b4d dw $2e ; cry id - db $6b ; pitch - db $00 ; echo + dw $06b ; pitch dw $102 ; length HoothootCryHeader: ; 0xf2b53 dw $2d ; cry id - db $91 ; pitch - db $00 ; echo + dw $091 ; pitch dw $0d8 ; length NoctowlCryHeader: ; 0xf2b59 dw $2d ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $1a0 ; length LedybaCryHeader: ; 0xf2b5f dw $36 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $0de ; length LedianCryHeader: ; 0xf2b65 dw $36 ; cry id - db $6a ; pitch - db $ff ; echo + dw -$96 ; pitch dw $138 ; length SpinarakCryHeader: ; 0xf2b6b dw $27 ; cry id - db $11 ; pitch - db $00 ; echo + dw $011 ; pitch dw $200 ; length AriadosCryHeader: ; 0xf2b71 dw $27 ; cry id - db $52 ; pitch - db $ff ; echo + dw -$ae ; pitch dw $1e2 ; length CrobatCryHeader: ; 0xf2b77 dw $1d ; cry id - db $f0 ; pitch - db $ff ; echo + dw -$10 ; pitch dw $140 ; length ChinchouCryHeader: ; 0xf2b7d dw $30 ; cry id - db $c9 ; pitch - db $03 ; echo + dw $3c9 ; pitch dw $140 ; length LanturnCryHeader: ; 0xf2b83 dw $30 ; cry id - db $d0 ; pitch - db $02 ; echo + dw $2d0 ; pitch dw $110 ; length PichuCryHeader: ; 0xf2b89 dw $40 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $140 ; length CleffaCryHeader: ; 0xf2b8f dw $34 ; cry id - db $61 ; pitch - db $00 ; echo + dw $061 ; pitch dw $091 ; length IgglybuffCryHeader: ; 0xf2b95 dw $31 ; cry id - db $e8 ; pitch - db $00 ; echo + dw $0e8 ; pitch dw $0e8 ; length TogepiCryHeader: ; 0xf2b9b dw $28 ; cry id - db $10 ; pitch - db $00 ; echo + dw $010 ; pitch dw $100 ; length TogeticCryHeader: ; 0xf2ba1 dw $2c ; cry id - db $3b ; pitch - db $00 ; echo + dw $03b ; pitch dw $038 ; length NatuCryHeader: ; 0xf2ba7 dw $3b ; cry id - db $99 ; pitch - db $ff ; echo + dw -$67 ; pitch dw $100 ; length XatuCryHeader: ; 0xf2bad dw $3b ; cry id - db $59 ; pitch - db $ff ; echo + dw -$a7 ; pitch dw $168 ; length MareepCryHeader: ; 0xf2bb3 dw $2b ; cry id - db $22 ; pitch - db $00 ; echo + dw $022 ; pitch dw $0d8 ; length FlaaffyCryHeader: ; 0xf2bb9 dw $2b ; cry id - db $f9 ; pitch - db $ff ; echo + dw -$07 ; pitch dw $180 ; length AmpharosCryHeader: ; 0xf2bbf dw $3e ; cry id - db $84 ; pitch - db $ff ; echo + dw -$7c ; pitch dw $0e8 ; length BellossomCryHeader: ; 0xf2bc5 dw $34 ; cry id - db $84 ; pitch - db $00 ; echo + dw $084 ; pitch dw $150 ; length MarillCryHeader: ; 0xf2bcb dw $26 ; cry id - db $1b ; pitch - db $01 ; echo + dw $11b ; pitch dw $120 ; length AzumarillCryHeader: ; 0xf2bd1 dw $26 ; cry id - db $b6 ; pitch - db $00 ; echo + dw $0b6 ; pitch dw $180 ; length SudowoodoCryHeader: ; 0xf2bd7 dw $34 ; cry id - db $40 ; pitch - db $0f ; echo + dw $f40 ; pitch dw $180 ; length PolitoedCryHeader: ; 0xf2bdd dw $34 ; cry id - db $5d ; pitch - db $fd ; echo + dw -$2a3 ; pitch dw $1c8 ; length HoppipCryHeader: ; 0xf2be3 dw $34 ; cry id - db $3b ; pitch - db $00 ; echo + dw $03b ; pitch dw $0c8 ; length SkiploomCryHeader: ; 0xf2be9 dw $34 ; cry id - db $27 ; pitch - db $00 ; echo + dw $027 ; pitch dw $138 ; length JumpluffCryHeader: ; 0xf2bef dw $34 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $180 ; length AipomCryHeader: ; 0xf2bf5 dw $41 ; cry id - db $af ; pitch - db $ff ; echo + dw -$51 ; pitch dw $0e8 ; length SunkernCryHeader: ; 0xf2bfb dw $26 ; cry id - db $2b ; pitch - db $01 ; echo + dw $12b ; pitch dw $0b8 ; length SunfloraCryHeader: ; 0xf2c01 dw $3d ; cry id - db $e0 ; pitch - db $ff ; echo + dw -$20 ; pitch dw $180 ; length YanmaCryHeader: ; 0xf2c07 dw $32 ; cry id - db $31 ; pitch - db $00 ; echo + dw $031 ; pitch dw $0c8 ; length WooperCryHeader: ; 0xf2c0d dw $38 ; cry id - db $93 ; pitch - db $00 ; echo + dw $093 ; pitch dw $0af ; length QuagsireCryHeader: ; 0xf2c13 dw $38 ; cry id - db $3a ; pitch - db $ff ; echo + dw -$c6 ; pitch dw $140 ; length EspeonCryHeader: ; 0xf2c19 dw $41 ; cry id - db $a2 ; pitch - db $00 ; echo + dw $0a2 ; pitch dw $140 ; length UmbreonCryHeader: ; 0xf2c1f dw $1a ; cry id - db $17 ; pitch - db $ff ; echo + dw -$e9 ; pitch dw $0f0 ; length MurkrowCryHeader: ; 0xf2c25 dw $26 ; cry id - db $e1 ; pitch - db $ff ; echo + dw -$1f ; pitch dw $180 ; length SlowkingCryHeader: ; 0xf2c2b dw $2f ; cry id - db $04 ; pitch - db $01 ; echo + dw $104 ; pitch dw $200 ; length MisdreavusCryHeader: ; 0xf2c31 dw $2d ; cry id - db $30 ; pitch - db $01 ; echo + dw $130 ; pitch dw $0e8 ; length UnownCryHeader: ; 0xf2c37 dw $2d ; cry id - db $62 ; pitch - db $01 ; echo + dw $162 ; pitch dw $100 ; length WobbuffetCryHeader: ; 0xf2c3d dw $3e ; cry id - db $7b ; pitch - db $02 ; echo + dw $27b ; pitch dw $144 ; length GirafarigCryHeader: ; 0xf2c43 dw $29 ; cry id - db $41 ; pitch - db $00 ; echo + dw $041 ; pitch dw $200 ; length PinecoCryHeader: ; 0xf2c49 dw $2f ; cry id - db $80 ; pitch - db $00 ; echo + dw $080 ; pitch dw $100 ; length ForretressCryHeader: ; 0xf2c4f dw $2f ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $180 ; length DunsparceCryHeader: ; 0xf2c55 dw $42 ; cry id - db $c4 ; pitch - db $01 ; echo + dw $1c4 ; pitch dw $100 ; length GligarCryHeader: ; 0xf2c5b dw $33 ; cry id - db $fe ; pitch - db $fe ; echo + dw -$102 ; pitch dw $100 ; length SteelixCryHeader: ; 0xf2c61 dw $3a ; cry id - db $ef ; pitch - db $00 ; echo + dw $0ef ; pitch dw $0f7 ; length SnubbullCryHeader: ; 0xf2c67 dw $42 ; cry id - db $12 ; pitch - db $01 ; echo + dw $112 ; pitch dw $0e8 ; length GranbullCryHeader: ; 0xf2c6d dw $42 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $180 ; length QwilfishCryHeader: ; 0xf2c73 dw $2f ; cry id - db $60 ; pitch - db $01 ; echo + dw $160 ; pitch dw $0e0 ; length ScizorCryHeader: ; 0xf2c79 dw $3e ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $160 ; length ShuckleCryHeader: ; 0xf2c7f dw $42 ; cry id - db $90 ; pitch - db $02 ; echo + dw $290 ; pitch dw $0a8 ; length HeracrossCryHeader: ; 0xf2c85 dw $3e ; cry id - db $35 ; pitch - db $00 ; echo + dw $035 ; pitch dw $0e0 ; length SneaselCryHeader: ; 0xf2c8b dw $38 ; cry id - db $53 ; pitch - db $00 ; echo + dw $053 ; pitch dw $0af ; length TeddiursaCryHeader: ; 0xf2c91 dw $3c ; cry id - db $a2 ; pitch - db $07 ; echo + dw $7a2 ; pitch dw $06e ; length UrsaringCryHeader: ; 0xf2c97 dw $3c ; cry id - db $40 ; pitch - db $06 ; echo + dw $640 ; pitch dw $0d8 ; length SlugmaCryHeader: ; 0xf2c9d dw $35 ; cry id - db $28 ; pitch - db $fe ; echo + dw -$1d8 ; pitch dw $140 ; length MagcargoCryHeader: ; 0xf2ca3 dw $3f ; cry id - db $f3 ; pitch - db $fd ; echo + dw -$20d ; pitch dw $1c0 ; length SwinubCryHeader: ; 0xf2ca9 dw $30 ; cry id - db $fe ; pitch - db $01 ; echo + dw $1fe ; pitch dw $140 ; length PiloswineCryHeader: ; 0xf2caf dw $3f ; cry id - db $f7 ; pitch - db $fe ; echo + dw -$109 ; pitch dw $100 ; length CorsolaCryHeader: ; 0xf2cb5 dw $3f ; cry id - db $a1 ; pitch - db $00 ; echo + dw $0a1 ; pitch dw $0e8 ; length RemoraidCryHeader: ; 0xf2cbb dw $3d ; cry id - db $0d ; pitch - db $00 ; echo + dw $00d ; pitch dw $100 ; length OctilleryCryHeader: ; 0xf2cc1 dw $32 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $180 ; length DelibirdCryHeader: ; 0xf2cc7 dw $3c ; cry id - db $02 ; pitch - db $00 ; echo + dw $002 ; pitch dw $06a ; length MantineCryHeader: ; 0xf2ccd dw $39 ; cry id - db $42 ; pitch - db $ff ; echo + dw -$be ; pitch dw $0f0 ; length SkarmoryCryHeader: ; 0xf2cd3 dw $3e ; cry id - db $a9 ; pitch - db $08 ; echo + dw $8a9 ; pitch dw $180 ; length HoundourCryHeader: ; 0xf2cd9 dw $30 ; cry id - db $39 ; pitch - db $00 ; echo + dw $039 ; pitch dw $140 ; length HoundoomCryHeader: ; 0xf2cdf dw $32 ; cry id - db $f6 ; pitch - db $fe ; echo + dw -$10a ; pitch dw $100 ; length KingdraCryHeader: ; 0xf2ce5 dw $35 ; cry id - db $fb ; pitch - db $02 ; echo + dw $2fb ; pitch dw $100 ; length PhanpyCryHeader: ; 0xf2ceb dw $2e ; cry id - db $48 ; pitch - db $00 ; echo + dw $048 ; pitch dw $230 ; length DonphanCryHeader: ; 0xf2cf1 dw $43 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $1a0 ; length Porygon2CryHeader: ; 0xf2cf7 dw $29 ; cry id - db $73 ; pitch - db $00 ; echo + dw $073 ; pitch dw $240 ; length StantlerCryHeader: ; 0xf2cfd dw $41 ; cry id - db $a0 ; pitch - db $fe ; echo + dw -$160 ; pitch dw $180 ; length SmeargleCryHeader: ; 0xf2d03 dw $40 ; cry id - db $e6 ; pitch - db $fd ; echo + dw -$21a ; pitch dw $1f0 ; length TyrogueCryHeader: ; 0xf2d09 dw $41 ; cry id - db $2c ; pitch - db $00 ; echo + dw $02c ; pitch dw $108 ; length HitmontopCryHeader: ; 0xf2d0f dw $35 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length SmoochumCryHeader: ; 0xf2d15 dw $26 ; cry id - db $68 ; pitch - db $00 ; echo + dw $068 ; pitch dw $100 ; length ElekidCryHeader: ; 0xf2d1b dw $3d ; cry id - db $28 ; pitch - db $fd ; echo + dw -$2d8 ; pitch dw $0b4 ; length MagbyCryHeader: ; 0xf2d21 dw $3c ; cry id - db $76 ; pitch - db $01 ; echo + dw $176 ; pitch dw $03a ; length MiltankCryHeader: ; 0xf2d27 dw $33 ; cry id - db $33 ; pitch - db $fe ; echo + dw -$1cd ; pitch dw $1a0 ; length BlisseyCryHeader: ; 0xf2d2d dw $2f ; cry id - db $93 ; pitch - db $02 ; echo + dw $293 ; pitch dw $140 ; length RaikouCryHeader: ; 0xf2d33 dw $2a ; cry id - db $2e ; pitch - db $02 ; echo + dw $22e ; pitch dw $120 ; length EnteiCryHeader: ; 0xf2d39 dw $37 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $1a0 ; length SuicuneCryHeader: ; 0xf2d3f dw $3f ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $180 ; length LarvitarCryHeader: ; 0xf2d45 dw $2a ; cry id - db $5f ; pitch - db $00 ; echo + dw $05f ; pitch dw $0d0 ; length PupitarCryHeader: ; 0xf2d4b dw $27 ; cry id - db $25 ; pitch - db $fe ; echo + dw -$1db ; pitch dw $150 ; length TyranitarCryHeader: ; 0xf2d51 dw $2a ; cry id - db $00 ; pitch - db $ff ; echo + dw -$100 ; pitch dw $180 ; length LugiaCryHeader: ; 0xf2d57 dw $3a ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $100 ; length HoOhCryHeader: ; 0xf2d5d dw $41 ; cry id - db $00 ; pitch - db $00 ; echo + dw $000 ; pitch dw $180 ; length CelebiCryHeader: ; 0xf2d63 dw $37 ; cry id - db $4a ; pitch - db $01 ; echo + dw $14a ; pitch dw $111 ; length CryHeader252: ; 0xf2d69 dw 0 ; cry id - db 0 ; pitch - db 0 ; echo + dw 0 ; pitch dw 0 ; length CryHeader253: ; 0xf2d6f dw 0 ; cry id - db 0 ; pitch - db 0 ; echo + dw 0 ; pitch dw 0 ; length CryHeader254: ; 0xf2d75 dw 0 ; cry id - db 0 ; pitch - db 0 ; echo + dw 0 ; pitch dw 0 ; length CryHeader255: ; 0xf2d7b dw 0 ; cry id - db 0 ; pitch - db 0 ; echo + dw 0 ; pitch dw 0 ; length diff --git a/audio/engine.asm b/audio/engine.asm index 499adcadb..569aa6a73 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -828,7 +828,7 @@ Functione8466: ; e8466 add hl, bc bit 4, [hl] jr z, .vibrato - ld hl, $0027 + ld hl, Channel1CryPitch - Channel1 add hl, bc ld e, [hl] inc hl @@ -1758,7 +1758,7 @@ MusicE6: ; e88e4 ld hl, Channel1Flags2 - Channel1 add hl, bc set 4, [hl] - ld hl, $0028 + ld hl, Channel1CryPitch + 1 - Channel1 add hl, bc call GetMusicByte ld [hld], a @@ -2367,7 +2367,6 @@ _PlayMusic:: ; e8b30 PlayCry:: ; e8b79 ; Play cry de using parameters: ; CryPitch -; CryEcho ; CryLength call MusicOff @@ -2416,7 +2415,7 @@ PlayCry:: ; e8b79 add hl, bc ld a, [CryPitch] ld [hli], a - ld a, [CryEcho] + ld a, [CryPitch + 1] ld [hl], a ; No tempo for channel 4 diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index f8f4a26ce..c7c890703 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -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] @@ -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/home.asm b/home.asm index 872f14406..577bfe8f9 100644 --- a/home.asm +++ b/home.asm @@ -1793,7 +1793,7 @@ Function37f3:: ; 37f3 ld a, [hli] ld [CryPitch], a ld a, [hli] - ld [CryEcho], a + ld [CryPitch + 1], a ld a, [hli] ld [CryLength], a ld a, [hl] diff --git a/home/audio.asm b/home/audio.asm index 348da52c6..64c1ba08b 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -173,7 +173,7 @@ PlayCryHeader:: ; 3be3 ld a, [hli] ld [CryPitch], a ld a, [hli] - ld [CryEcho], a + ld [CryPitch + 1], a ld a, [hli] ld [CryLength], a ld a, [hl] diff --git a/main.asm b/main.asm index 3da652c54..8d58227a4 100644 --- a/main.asm +++ b/main.asm @@ -99732,12 +99732,12 @@ Functionfb841: ; fb841 ld a, [hli] ld h, [hl] ld l, a - ld bc, $fec0 + ld bc, -$140 add hl, bc ld a, l ld [CryPitch], a ld a, h - ld [CryEcho], a + ld [CryPitch + 1], a ld hl, CryLength ld a, [hli] ld h, [hl] @@ -99747,7 +99747,7 @@ Functionfb841: ; fb841 ld a, l ld [CryLength], a ld a, h - ld [$c2b3], a + ld [CryLength + 1], a callba PlayCry call WaitSFX diff --git a/wram.asm b/wram.asm index 07aa3b542..c29fd3f87 100644 --- a/wram.asm +++ b/wram.asm @@ -107,8 +107,7 @@ channel_struct: MACRO ds 1 ; c125 ds 1 ; c126 ds 1 ; c127 -\1CryPitch:: db -\1CryEcho:: db +\1CryPitch:: dw ds 4 \1NoteLength:: db ; frames per 16th note ds 1 ; c12f @@ -227,9 +226,7 @@ MusicFadeIDHi:: ; c2aa ds 1 ds 5 CryPitch:: ; c2b0 - ds 1 -CryEcho:: ; c2b1 - ds 1 + ds 2 CryLength:: ; c2b2 ds 2 LastVolume:: ; c2b4