summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/engine.asm2
-rw-r--r--docs/bugs_and_glitches.md4
-rw-r--r--engine/battle_anims/anim_commands.asm4
-rwxr-xr-xengine/billspc.asm6
-rwxr-xr-xengine/breeding.asm4
-rwxr-xr-xengine/events/daycare.asm30
-rwxr-xr-xengine/evolution_animation.asm4
-rwxr-xr-xengine/intro_menu.asm2
-rw-r--r--engine/pic_animation.asm4
-rw-r--r--engine/pokedex.asm8
-rw-r--r--engine/routines/playslowcry.asm4
-rw-r--r--engine/scripting.asm2
-rw-r--r--engine/specials.asm2
-rwxr-xr-xengine/stats_screen.asm2
-rwxr-xr-xengine/trade_animation.asm2
-rw-r--r--home/audio.asm6
-rw-r--r--home/cry.asm18
-rw-r--r--home/text.asm2
-rw-r--r--mobile/mobile_42.asm4
-rw-r--r--mobile/mobile_5f.asm2
20 files changed, 57 insertions, 55 deletions
diff --git a/audio/engine.asm b/audio/engine.asm
index 0a952b358..b097648c2 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -2474,7 +2474,7 @@ _PlayMusic:: ; e8b30
; e8b79
-_PlayCryHeader:: ; e8b79
+_PlayCry:: ; e8b79
; Play cry de using parameters:
; CryPitch
; CryLength
diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md
index 52d788987..ef3855407 100644
--- a/docs/bugs_and_glitches.md
+++ b/docs/bugs_and_glitches.md
@@ -1002,7 +1002,7 @@ The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActi
call GetCryIndex
ld e, c
ld d, b
- call PlayCryHeader
+ call PlayCry
ret
```
@@ -1011,7 +1011,7 @@ The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActi
```asm
.Cry: ; 40340
ld a, [CurPartySpecies]
- call PlayCry
+ call PlayMonCry
ret
```
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index 07ab82d95..0bbedf909 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -1272,7 +1272,7 @@ endr
.done_cry_tracks
push hl
- call LoadCryHeader
+ call LoadCry
pop hl
jr c, .done
@@ -1309,7 +1309,7 @@ endr
ld a, 1
ld [wStereoPanningMask], a
- callfar _PlayCryHeader
+ callfar _PlayCry
.done
pop af
diff --git a/engine/billspc.asm b/engine/billspc.asm
index baf0ee643..458192c3c 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -1825,7 +1825,7 @@ DepositPokemon: ; e307c (38:707c)
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
ld a, [CurPartySpecies]
- call PlayCry
+ call PlayMonCry
hlcoord 0, 0
lb bc, 15, 8
call ClearBox
@@ -1880,7 +1880,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox
ld a, [CurPartySpecies]
- call PlayCry
+ call PlayMonCry
hlcoord 0, 0
lb bc, 15, 8
call ClearBox
@@ -1934,7 +1934,7 @@ ReleasePKMN_ByePKMN: ; e3180 (38:7180)
jr c, .skip_cry
ld e, c
ld d, b
- call PlayCryHeader
+ call PlayCry
.skip_cry
ld a, [CurPartySpecies]
diff --git a/engine/breeding.asm b/engine/breeding.asm
index 9fe0b8986..489154f71 100755
--- a/engine/breeding.asm
+++ b/engine/breeding.asm
@@ -891,7 +891,7 @@ Special_DayCareMon1: ; 17421
ld hl, DayCareMon1Text
call PrintText
ld a, [wBreedMon1Species]
- call PlayCry
+ call PlayMonCry
ld a, [wDayCareLady]
bit 0, a
jr z, DayCareMonCursor
@@ -904,7 +904,7 @@ Special_DayCareMon2: ; 17440
ld hl, DayCareMon2Text
call PrintText
ld a, [wBreedMon2Species]
- call PlayCry
+ call PlayMonCry
ld a, [wDayCareMan]
bit 0, a
jr z, DayCareMonCursor
diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm
index ed6e16e87..a7eb565bb 100755
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -1,3 +1,4 @@
+; PrintDayCareText.TextTable indexes
const_def
const DAYCARETEXT_MAN_INTRO
const DAYCARETEXT_MAN_EGG
@@ -13,12 +14,12 @@
const DAYCARETEXT_GENIUSES
const DAYCARETEXT_ASK_WITHDRAW
const DAYCARETEXT_WITHDRAW
+ const DAYCARETEXT_GOT_BACK
const DAYCARETEXT_TOO_SOON
const DAYCARETEXT_PARTY_FULL
const DAYCARETEXT_NOT_ENOUGH_MONEY
const DAYCARETEXT_OH_FINE
const DAYCARETEXT_COME_AGAIN
- const DAYCARETEXT_13
Special_DayCareMan: ; 166d6
ld hl, wDayCareMan
@@ -44,7 +45,7 @@ Special_DayCareMan: ; 166d6
call DayCare_AskWithdrawBreedMon
jr c, .print_text
farcall RetrievePokemonFromDayCareMan
- call DayCare_TakeMoney_PlayCry
+ call DayCare_GetBackMonForMoney
ld hl, wDayCareMan
res 0, [hl]
res 5, [hl]
@@ -54,7 +55,7 @@ Special_DayCareMan: ; 166d6
call PrintDayCareText
.cancel
- ld a, DAYCARETEXT_13
+ ld a, DAYCARETEXT_COME_AGAIN
call PrintDayCareText
ret
; 1672a
@@ -83,7 +84,7 @@ Special_DayCareLady: ; 1672a
call DayCare_AskWithdrawBreedMon
jr c, .print_text
farcall RetrievePokemonFromDayCareLady
- call DayCare_TakeMoney_PlayCry
+ call DayCare_GetBackMonForMoney
ld hl, wDayCareLady
res 0, [hl]
ld hl, wDayCareMan
@@ -94,7 +95,7 @@ Special_DayCareLady: ; 1672a
call PrintDayCareText
.cancel
- ld a, DAYCARETEXT_13
+ ld a, DAYCARETEXT_COME_AGAIN
call PrintDayCareText
ret
; 16781
@@ -145,7 +146,7 @@ DayCareAskDepositPokemon: ; 16798
ret
.Declined:
- ld a, DAYCARETEXT_COME_AGAIN
+ ld a, DAYCARETEXT_OH_FINE
scf
ret
@@ -180,7 +181,7 @@ DayCare_DepositPokemonText: ; 167f6
ld a, DAYCARETEXT_DEPOSIT
call PrintDayCareText
ld a, [CurPartySpecies]
- call PlayCry
+ call PlayMonCry
ld a, DAYCARETEXT_COME_BACK_LATER
call PrintDayCareText
ret
@@ -190,7 +191,7 @@ DayCare_AskWithdrawBreedMon: ; 16807
ld a, [StringBuffer2 + 1]
and a
jr nz, .grew_at_least_one_level
- ld a, DAYCARETEXT_PARTY_FULL
+ ld a, DAYCARETEXT_TOO_SOON
call PrintDayCareText
call YesNoBox
jr c, .refused
@@ -218,30 +219,30 @@ DayCare_AskWithdrawBreedMon: ; 16807
ret
.refused
- ld a, DAYCARETEXT_COME_AGAIN
+ ld a, DAYCARETEXT_OH_FINE
scf
ret
.not_enough_money
- ld a, DAYCARETEXT_OH_FINE
+ ld a, DAYCARETEXT_NOT_ENOUGH_MONEY
scf
ret
.PartyFull:
- ld a, DAYCARETEXT_NOT_ENOUGH_MONEY
+ ld a, DAYCARETEXT_PARTY_FULL
scf
ret
; 16850
-DayCare_TakeMoney_PlayCry: ; 16850
+DayCare_GetBackMonForMoney: ; 16850
ld bc, StringBuffer2 + 2
ld de, Money
farcall TakeMoney
ld a, DAYCARETEXT_WITHDRAW
call PrintDayCareText
ld a, [CurPartySpecies]
- call PlayCry
- ld a, DAYCARETEXT_TOO_SOON
+ call PlayMonCry
+ ld a, DAYCARETEXT_GOT_BACK
call PrintDayCareText
ret
; 1686d
@@ -283,6 +284,7 @@ PrintDayCareText: ; 1689b
; 168aa
.TextTable: ; 168aa
+; entries correspond to DAYCARETEXT_* constants
dw .DayCareManIntro ; 00
dw .DayCareManOddEgg ; 01
dw .DayCareLadyIntro ; 02
diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm
index 8c3a191bb..2e6e82e25 100755
--- a/engine/evolution_animation.asm
+++ b/engine/evolution_animation.asm
@@ -80,7 +80,7 @@ EvolutionAnimation: ; 4e5e1
jr c, .skip_cry
ld a, [wEvolutionOldSpecies]
- call PlayCry
+ call PlayMonCry
.skip_cry
ld de, MUSIC_EVOLUTION
@@ -148,7 +148,7 @@ EvolutionAnimation: ; 4e5e1
ret c
ld a, [PlayerHPPal]
- call PlayCry
+ call PlayMonCry
ret
; 4e703
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm
index 15c2a4cbb..a26ac1f81 100755
--- a/engine/intro_menu.asm
+++ b/engine/intro_menu.asm
@@ -754,7 +754,7 @@ OakText2: ; 0x604a
text_jump _OakText2
start_asm
ld a, WOOPER
- call PlayCry
+ call PlayMonCry
call WaitSFX
ld hl, OakText3
ret
diff --git a/engine/pic_animation.asm b/engine/pic_animation.asm
index 18c68ded9..4317d96f8 100644
--- a/engine/pic_animation.asm
+++ b/engine/pic_animation.asm
@@ -249,7 +249,7 @@ PokeAnim_Finish: ; d0171
PokeAnim_Cry: ; d017a
ld a, [wPokeAnimSpecies]
- call _PlayCry
+ call _PlayMonCry
ld a, [wPokeAnimSceneIndex]
inc a
ld [wPokeAnimSceneIndex], a
@@ -258,7 +258,7 @@ PokeAnim_Cry: ; d017a
PokeAnim_CryNoWait: ; d0188
ld a, [wPokeAnimSpecies]
- call PlayCry2
+ call PlayMonCry2
ld a, [wPokeAnimSceneIndex]
inc a
ld [wPokeAnimSceneIndex], a
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 4c257e424..4d7096c0e 100644
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -346,7 +346,7 @@ Pokedex_InitDexEntryScreen: ; 40217 (10:4217)
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, [CurPartySpecies]
- call PlayCry
+ call PlayMonCry
call Pokedex_IncrementDexPointer
ret
@@ -415,7 +415,7 @@ Pokedex_ReinitDexEntryScreen: ; 402aa (10:42aa)
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, [CurPartySpecies]
- call PlayCry
+ call PlayMonCry
ld hl, wJumptableIndex
dec [hl]
ret
@@ -471,7 +471,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
call GetCryIndex
ld e, c
ld d, b
- call PlayCryHeader
+ call PlayCry
ret
.Print: ; 4034f
@@ -2558,7 +2558,7 @@ _NewPokedexEntry: ; 41a7f
ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout
ld a, [CurPartySpecies]
- call PlayCry
+ call PlayMonCry
ret
diff --git a/engine/routines/playslowcry.asm b/engine/routines/playslowcry.asm
index 636741bcf..545629e51 100644
--- a/engine/routines/playslowcry.asm
+++ b/engine/routines/playslowcry.asm
@@ -1,6 +1,6 @@
Special_PlaySlowCry: ; fb841
ld a, [ScriptVar]
- call LoadCryHeader
+ call LoadCry
jr c, .done
ld hl, CryPitch
@@ -23,7 +23,7 @@ Special_PlaySlowCry: ; fb841
ld [CryLength], a
ld a, h
ld [CryLength + 1], a
- farcall _PlayCryHeader
+ farcall _PlayCry
call WaitSFX
.done
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 769a8311c..84590f3c0 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -938,7 +938,7 @@ Script_cry:
jr nz, .ok
ld a, [ScriptVar]
.ok
- call PlayCry
+ call PlayMonCry
ret
GetScriptObject:
diff --git a/engine/specials.asm b/engine/specials.asm
index be1c37f88..965e3d58b 100644
--- a/engine/specials.asm
+++ b/engine/specials.asm
@@ -413,7 +413,7 @@ Special_SnorlaxAwake: ; 0xc43d
Special_PlayCurMonCry: ; c472
ld a, [CurPartySpecies]
- jp PlayCry
+ jp PlayMonCry
; c478
diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm
index 1e3fb8a77..f51f57a77 100755
--- a/engine/stats_screen.asm
+++ b/engine/stats_screen.asm
@@ -829,7 +829,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
call SetPalettes
call .AnimateMon
ld a, [CurPartySpecies]
- call PlayCry2
+ call PlayMonCry2
ret
.AnimateMon: ; 4e253 (13:6253)
diff --git a/engine/trade_animation.asm b/engine/trade_animation.asm
index 08b30b132..54faa988f 100755
--- a/engine/trade_animation.asm
+++ b/engine/trade_animation.asm
@@ -847,7 +847,7 @@ TradeAnim_ShowGivemonData: ; 2942e
jr c, .skip_cry
ld e, c
ld d, b
- call PlayCryHeader
+ call PlayCry
.skip_cry
call TradeAnim_AdvanceScriptPointer
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
diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm
index a630242d1..e68721650 100644
--- a/mobile/mobile_42.asm
+++ b/mobile/mobile_42.asm
@@ -518,7 +518,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e
jr c, .skip_cry
ld e, c
ld d, b
- call PlayCryHeader
+ call PlayCry
.skip_cry
ld c, 80
@@ -653,7 +653,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
jr c, .skip_cry
ld e, c
ld d, b
- call PlayCryHeader
+ call PlayCry
.skip_cry
ld c, 80
diff --git a/mobile/mobile_5f.asm b/mobile/mobile_5f.asm
index 2954a4d3e..8086f2ac2 100644
--- a/mobile/mobile_5f.asm
+++ b/mobile/mobile_5f.asm
@@ -1253,7 +1253,7 @@ Function17d7d3: ; 17d7d3
dec a
ld e, a
ld d, $0
- call PlayCryHeader
+ call PlayCry
call WaitSFX
call HlToCrashCheckPointer
ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 09:05:29 +0000