diff options
| author | yenatch <yenatch@gmail.com> | 2014-07-18 10:25:03 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-07-18 10:31:52 -0700 |
| commit | 928cdcfc23e90d2fb6a99aac7a7b7a4184dd77ed (patch) | |
| tree | 76215f6b208af8dc7bfd26d320f1ae810192c980 /main.asm | |
| parent | 251517812f65ab95c886e2cb9afe4b996e463ec7 (diff) | |
Name cry functions in home.asm.
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 48 |
1 files changed, 26 insertions, 22 deletions
@@ -4487,7 +4487,7 @@ OakText2: ; 0x604a TX_FAR _OakText2 start_asm ld a,WOOPER - call Function37ce + call PlayCry call WaitSFX ld hl,OakText3 ret @@ -8443,7 +8443,7 @@ SpecialSnorlaxAwake: ; 0xc43d Functionc472: ; c472 ld a, [CurPartySpecies] - jp Function37ce + jp PlayCry ; c478 SpecialGameboyCheck: ; c478 @@ -28842,7 +28842,7 @@ Function167f6: ; 167f6 ld a, $5 call Function1689b ld a, [CurPartySpecies] - call Function37ce + call PlayCry ld a, $9 call Function1689b ret @@ -28902,7 +28902,7 @@ Function16850: ; 16850 ld a, $d call Function1689b ld a, [CurPartySpecies] - call Function37ce + call PlayCry ld a, $e call Function1689b ret @@ -30624,7 +30624,7 @@ Function17421: ; 17421 ld hl, UnknownText_0x17467 call PrintText ld a, [wBreedMon1Species] - call Function37ce + call PlayCry ld a, [wDaycareLady] bit 0, a jr z, Function1745f @@ -30637,7 +30637,7 @@ Function17440: ; 17440 ld hl, UnknownText_0x17462 call PrintText ld a, [wBreedMon2Species] - call Function37ce + call PlayCry ld a, [wDaycareMan] bit 0, a jr z, Function1745f @@ -39022,14 +39022,15 @@ Function2942e: ; 2942e ld a, $e4 call DmgToCgbBGPals call Function294bb + ld a, [PlayerSDefLevel] - call Function381e + call GetCryIndex jr c, .asm_2945d ld e, c ld d, b call PlayCryHeader - .asm_2945d + call Function29114 ret ; 29461 @@ -44298,7 +44299,7 @@ Function40217: ; 40217 (10:4217) ld a, $4 call Function41423 ld a, [CurPartySpecies] ; $d108 - call Function37ce + call PlayCry call Function40131 ret @@ -44370,7 +44371,7 @@ Function402aa: ; 402aa (10:42aa) ld a, $4 call Function41423 ld a, [CurPartySpecies] ; $d108 - call Function37ce + call PlayCry ld hl, $cf63 dec [hl] ret @@ -44426,7 +44427,7 @@ Function402fa: ; 402fa Function40340: ; 40340 call Function40bb1 ld a, [$d265] - call Function381e + call GetCryIndex ld e, c ld d, b call PlayCryHeader @@ -46626,7 +46627,7 @@ Function41a7f: ; 41a7f ld a, $4 call Function41423 ld a, [CurPartySpecies] - call Function37ce + call PlayCry ret ; 41ad7 @@ -56942,7 +56943,7 @@ Function4e226: ; 4e226 (13:6226) call Function32f9 call Function4e253 ld a, [CurPartySpecies] ; $d108 - call Function37d5 + call PlayCry2 ret ; known jump sources: 4e23f (13:623f), 4e249 (13:6249) @@ -57469,7 +57470,7 @@ _EvolutionAnimation: ; 4e607 jr c, .asm_4e67c ld a, [Buffer1] - call Function37ce + call PlayCry .asm_4e67c ld de, MUSIC_EVOLUTION @@ -57538,7 +57539,7 @@ _EvolutionAnimation: ; 4e607 ret c ld a, [PlayerHPPal] - call Function37ce + call PlayCry ret ; 4e703 @@ -95608,7 +95609,7 @@ Functione307c: ; e307c (38:707c) ld [$d10b], a callba Functione039 ld a, [CurPartySpecies] ; $d108 - call Function37ce + call PlayCry ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld bc, $f08 call ClearBox @@ -95663,7 +95664,7 @@ Functione30fa: ; e30fa (38:70fa) ld [$d10b], a callba Functione039 ld a, [CurPartySpecies] ; $d108 - call Function37ce + call PlayCry ld hl, TileMap ; $c4a0 (aliases: SpritesEnd) ld bc, $f08 call ClearBox @@ -95709,14 +95710,16 @@ Functione3180: ; e3180 (38:7180) hlcoord 0, 15 ld bc, $112 call TextBox + call WaitBGMap ld a, [CurPartySpecies] ; $d108 - call Function381e + call GetCryIndex jr c, .asm_e31ab ld e, c ld d, b call PlayCryHeader .asm_e31ab + ld a, [CurPartySpecies] ; $d108 ld [$d265], a call GetPokemonName @@ -99726,8 +99729,9 @@ INCLUDE "event/name_rater.asm" Functionfb841: ; fb841 ld a, [ScriptVar] - call Function37f3 - jr c, .asm_fb876 + call LoadCryHeader + jr c, .done + ld hl, CryPitch ld a, [hli] ld h, [hl] @@ -99742,7 +99746,7 @@ Functionfb841: ; fb841 ld a, [hli] ld h, [hl] ld l, a - ld bc, $0060 + ld bc, $60 add hl, bc ld a, l ld [CryLength], a @@ -99751,7 +99755,7 @@ Functionfb841: ; fb841 callba _PlayCryHeader call WaitSFX -.asm_fb876 +.done ret ; fb877 |