diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 23:47:45 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-16 23:47:45 -0500 |
| commit | 6d20cf3e80780af15ed15acea2f7feac1ffd9705 (patch) | |
| tree | 68890374634d2a62c0256e208e8ceff33c73ffc1 /home | |
| parent | bf074f359886707d2ffb2e0b525b03dc7af0fe29 (diff) | |
"CryHeader" → "Cry"; "Cry" → "MonCry"
Diffstat (limited to 'home')
| -rw-r--r-- | home/audio.asm | 6 | ||||
| -rw-r--r-- | home/cry.asm | 18 | ||||
| -rw-r--r-- | home/text.asm | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/home/audio.asm b/home/audio.asm index 13a8cd440..44786ee29 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -141,7 +141,7 @@ PlayMusic2:: ; 3bbc ; 3be3 -PlayCryHeader:: ; 3be3 +PlayCry:: ; 3be3 ; Play cry header de. push hl @@ -176,11 +176,11 @@ endr ld a, [hl] ld [CryLength + 1], a - ld a, BANK(_PlayCryHeader) + ld a, BANK(_PlayCry) ld [hROMBank], a ld [MBC3RomBank], a - call _PlayCryHeader + call _PlayCry pop af ld [hROMBank], a diff --git a/home/cry.asm b/home/cry.asm index 393534a29..204b02ba4 100644 --- a/home/cry.asm +++ b/home/cry.asm @@ -3,7 +3,7 @@ PlayStereoCry:: ; 37b6 ld a, 1 ld [wStereoPanningMask], a pop af - call _PlayCry + call _PlayMonCry call WaitSFX ret ; 37c4 @@ -15,27 +15,27 @@ PlayStereoCry2:: ; 37c4 ld a, 1 ld [wStereoPanningMask], a pop af - jp _PlayCry + jp _PlayMonCry ; 37ce -PlayCry:: ; 37ce - call PlayCry2 +PlayMonCry:: ; 37ce + call PlayMonCry2 call WaitSFX ret ; 37d5 -PlayCry2:: ; 37d5 +PlayMonCry2:: ; 37d5 ; Don't wait for the cry to end. push af xor a ld [wStereoPanningMask], a ld [CryTracks], a pop af - call _PlayCry + call _PlayMonCry ret ; 37e2 -_PlayCry:: ; 37e2 +_PlayMonCry:: ; 37e2 push hl push de push bc @@ -45,7 +45,7 @@ _PlayCry:: ; 37e2 ld e, c ld d, b - call PlayCryHeader + call PlayCry .done pop bc @@ -54,7 +54,7 @@ _PlayCry:: ; 37e2 ret ; 37f3 -LoadCryHeader:: ; 37f3 +LoadCry:: ; 37f3 ; Load cry header bc. call GetCryIndex diff --git a/home/text.asm b/home/text.asm index a89f39eb2..74799cc1b 100644 --- a/home/text.asm +++ b/home/text.asm @@ -1019,7 +1019,7 @@ Unreferenced_Function1522:: ; 1522 ld e, [hl] inc hl ld d, [hl] - call PlayCry + call PlayMonCry pop de pop hl pop bc |