pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

"CryHeader" → "Cry"; "Cry" → "MonCry"

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-16 23:47:45 -05:00
parent bf074f3598
commit 6d20cf3e80
20 changed files with 60 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/engine.asm
View File

@ -2474,7 +2474,7 @@ _PlayMusic:: ; e8b30
; e8b79 ; e8b79
_PlayCryHeader:: ; e8b79 _PlayCry:: ; e8b79
; Play cry de using parameters: ; Play cry de using parameters:
; CryPitch ; CryPitch
; CryLength ; CryLength

4
docs/bugs_and_glitches.md
View File

@ -1002,7 +1002,7 @@ The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActi
call GetCryIndex call GetCryIndex
ld e, c ld e, c
ld d, b ld d, b
call PlayCryHeader call PlayCry
ret ret
``` ```
@ -1011,7 +1011,7 @@ The exact cause is unknown, but a workaround exists for `DexEntryScreen_MenuActi
```asm ```asm
.Cry: ; 40340 .Cry: ; 40340
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayMonCry
ret ret
``` ```

4
engine/battle_anims/anim_commands.asm
View File

@ -1272,7 +1272,7 @@ endr
.done_cry_tracks .done_cry_tracks
push hl push hl
call LoadCryHeader call LoadCry
pop hl pop hl
jr c, .done jr c, .done
@ -1309,7 +1309,7 @@ endr
ld a, 1 ld a, 1
ld [wStereoPanningMask], a ld [wStereoPanningMask], a
callfar _PlayCryHeader callfar _PlayCry
.done .done
pop af pop af

6
engine/billspc.asm
View File

@ -1825,7 +1825,7 @@ DepositPokemon: ; e307c (38:707c)
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox farcall RemoveMonFromPartyOrBox
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayMonCry
hlcoord 0, 0 hlcoord 0, 0
lb bc, 15, 8 lb bc, 15, 8
call ClearBox call ClearBox
@ -1880,7 +1880,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
farcall RemoveMonFromPartyOrBox farcall RemoveMonFromPartyOrBox
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayMonCry
hlcoord 0, 0 hlcoord 0, 0
lb bc, 15, 8 lb bc, 15, 8
call ClearBox call ClearBox
@ -1934,7 +1934,7 @@ ReleasePKMN_ByePKMN: ; e3180 (38:7180)
jr c, .skip_cry jr c, .skip_cry
ld e, c ld e, c
ld d, b ld d, b
call PlayCryHeader call PlayCry
.skip_cry .skip_cry
ld a, [CurPartySpecies] ld a, [CurPartySpecies]

4
engine/breeding.asm
View File

@ -891,7 +891,7 @@ Special_DayCareMon1: ; 17421
ld hl, DayCareMon1Text ld hl, DayCareMon1Text
call PrintText call PrintText
ld a, [wBreedMon1Species] ld a, [wBreedMon1Species]
call PlayCry call PlayMonCry
ld a, [wDayCareLady] ld a, [wDayCareLady]
bit 0, a bit 0, a
jr z, DayCareMonCursor jr z, DayCareMonCursor
@ -904,7 +904,7 @@ Special_DayCareMon2: ; 17440
ld hl, DayCareMon2Text ld hl, DayCareMon2Text
call PrintText call PrintText
ld a, [wBreedMon2Species] ld a, [wBreedMon2Species]
call PlayCry call PlayMonCry
ld a, [wDayCareMan] ld a, [wDayCareMan]
bit 0, a bit 0, a
jr z, DayCareMonCursor jr z, DayCareMonCursor

36
engine/events/daycare.asm
View File

@ -1,3 +1,4 @@
; PrintDayCareText.TextTable indexes
const_def const_def
const DAYCARETEXT_MAN_INTRO const DAYCARETEXT_MAN_INTRO
const DAYCARETEXT_MAN_EGG const DAYCARETEXT_MAN_EGG
@ -13,12 +14,12 @@
const DAYCARETEXT_GENIUSES const DAYCARETEXT_GENIUSES
const DAYCARETEXT_ASK_WITHDRAW const DAYCARETEXT_ASK_WITHDRAW
const DAYCARETEXT_WITHDRAW const DAYCARETEXT_WITHDRAW
const DAYCARETEXT_GOT_BACK
const DAYCARETEXT_TOO_SOON const DAYCARETEXT_TOO_SOON
const DAYCARETEXT_PARTY_FULL const DAYCARETEXT_PARTY_FULL
const DAYCARETEXT_NOT_ENOUGH_MONEY const DAYCARETEXT_NOT_ENOUGH_MONEY
const DAYCARETEXT_OH_FINE const DAYCARETEXT_OH_FINE
const DAYCARETEXT_COME_AGAIN const DAYCARETEXT_COME_AGAIN
const DAYCARETEXT_13
Special_DayCareMan: ; 166d6 Special_DayCareMan: ; 166d6
ld hl, wDayCareMan ld hl, wDayCareMan
@ -44,7 +45,7 @@ Special_DayCareMan: ; 166d6
call DayCare_AskWithdrawBreedMon call DayCare_AskWithdrawBreedMon
jr c, .print_text jr c, .print_text
farcall RetrievePokemonFromDayCareMan farcall RetrievePokemonFromDayCareMan
call DayCare_TakeMoney_PlayCry call DayCare_GetBackMonForMoney
ld hl, wDayCareMan ld hl, wDayCareMan
res 0, [hl] res 0, [hl]
res 5, [hl] res 5, [hl]
@ -54,7 +55,7 @@ Special_DayCareMan: ; 166d6
call PrintDayCareText call PrintDayCareText
.cancel .cancel
ld a, DAYCARETEXT_13 ld a, DAYCARETEXT_COME_AGAIN
call PrintDayCareText call PrintDayCareText
ret ret
; 1672a ; 1672a
@ -83,7 +84,7 @@ Special_DayCareLady: ; 1672a
call DayCare_AskWithdrawBreedMon call DayCare_AskWithdrawBreedMon
jr c, .print_text jr c, .print_text
farcall RetrievePokemonFromDayCareLady farcall RetrievePokemonFromDayCareLady
call DayCare_TakeMoney_PlayCry call DayCare_GetBackMonForMoney
ld hl, wDayCareLady ld hl, wDayCareLady
res 0, [hl] res 0, [hl]
ld hl, wDayCareMan ld hl, wDayCareMan
@ -94,7 +95,7 @@ Special_DayCareLady: ; 1672a
call PrintDayCareText call PrintDayCareText
.cancel .cancel
ld a, DAYCARETEXT_13 ld a, DAYCARETEXT_COME_AGAIN
call PrintDayCareText call PrintDayCareText
ret ret
; 16781 ; 16781
@ -145,7 +146,7 @@ DayCareAskDepositPokemon: ; 16798
ret ret
.Declined: .Declined:
ld a, DAYCARETEXT_COME_AGAIN ld a, DAYCARETEXT_OH_FINE
scf scf
ret ret
@ -180,7 +181,7 @@ DayCare_DepositPokemonText: ; 167f6
ld a, DAYCARETEXT_DEPOSIT ld a, DAYCARETEXT_DEPOSIT
call PrintDayCareText call PrintDayCareText
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayMonCry
ld a, DAYCARETEXT_COME_BACK_LATER ld a, DAYCARETEXT_COME_BACK_LATER
call PrintDayCareText call PrintDayCareText
ret ret
@ -190,7 +191,7 @@ DayCare_AskWithdrawBreedMon: ; 16807
ld a, [StringBuffer2 + 1] ld a, [StringBuffer2 + 1]
and a and a
jr nz, .grew_at_least_one_level jr nz, .grew_at_least_one_level
ld a, DAYCARETEXT_PARTY_FULL ld a, DAYCARETEXT_TOO_SOON
call PrintDayCareText call PrintDayCareText
call YesNoBox call YesNoBox
jr c, .refused jr c, .refused
@ -218,30 +219,30 @@ DayCare_AskWithdrawBreedMon: ; 16807
ret ret
.refused .refused
ld a, DAYCARETEXT_COME_AGAIN
scf
ret
.not_enough_money
ld a, DAYCARETEXT_OH_FINE ld a, DAYCARETEXT_OH_FINE
scf scf
ret ret
.PartyFull: .not_enough_money
ld a, DAYCARETEXT_NOT_ENOUGH_MONEY ld a, DAYCARETEXT_NOT_ENOUGH_MONEY
scf scf
ret ret
.PartyFull:
ld a, DAYCARETEXT_PARTY_FULL
scf
ret
; 16850 ; 16850
DayCare_TakeMoney_PlayCry: ; 16850 DayCare_GetBackMonForMoney: ; 16850
ld bc, StringBuffer2 + 2 ld bc, StringBuffer2 + 2
ld de, Money ld de, Money
farcall TakeMoney farcall TakeMoney
ld a, DAYCARETEXT_WITHDRAW ld a, DAYCARETEXT_WITHDRAW
call PrintDayCareText call PrintDayCareText
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayMonCry
ld a, DAYCARETEXT_TOO_SOON ld a, DAYCARETEXT_GOT_BACK
call PrintDayCareText call PrintDayCareText
ret ret
; 1686d ; 1686d
@ -283,6 +284,7 @@ PrintDayCareText: ; 1689b
; 168aa ; 168aa
.TextTable: ; 168aa .TextTable: ; 168aa
; entries correspond to DAYCARETEXT_* constants
dw .DayCareManIntro ; 00 dw .DayCareManIntro ; 00
dw .DayCareManOddEgg ; 01 dw .DayCareManOddEgg ; 01
dw .DayCareLadyIntro ; 02 dw .DayCareLadyIntro ; 02

4
engine/evolution_animation.asm
View File

@ -80,7 +80,7 @@ EvolutionAnimation: ; 4e5e1
jr c, .skip_cry jr c, .skip_cry
ld a, [wEvolutionOldSpecies] ld a, [wEvolutionOldSpecies]
call PlayCry call PlayMonCry
.skip_cry .skip_cry
ld de, MUSIC_EVOLUTION ld de, MUSIC_EVOLUTION
@ -148,7 +148,7 @@ EvolutionAnimation: ; 4e5e1
ret c ret c
ld a, [PlayerHPPal] ld a, [PlayerHPPal]
call PlayCry call PlayMonCry
ret ret
; 4e703 ; 4e703

2
engine/intro_menu.asm
View File

@ -754,7 +754,7 @@ OakText2: ; 0x604a
text_jump _OakText2 text_jump _OakText2
start_asm start_asm
ld a, WOOPER ld a, WOOPER
call PlayCry call PlayMonCry
call WaitSFX call WaitSFX
ld hl, OakText3 ld hl, OakText3
ret ret

4
engine/pic_animation.asm
View File

@ -249,7 +249,7 @@ PokeAnim_Finish: ; d0171
PokeAnim_Cry: ; d017a PokeAnim_Cry: ; d017a
ld a, [wPokeAnimSpecies] ld a, [wPokeAnimSpecies]
call _PlayCry call _PlayMonCry
ld a, [wPokeAnimSceneIndex] ld a, [wPokeAnimSceneIndex]
inc a inc a
ld [wPokeAnimSceneIndex], a ld [wPokeAnimSceneIndex], a
@ -258,7 +258,7 @@ PokeAnim_Cry: ; d017a
PokeAnim_CryNoWait: ; d0188 PokeAnim_CryNoWait: ; d0188
ld a, [wPokeAnimSpecies] ld a, [wPokeAnimSpecies]
call PlayCry2 call PlayMonCry2
ld a, [wPokeAnimSceneIndex] ld a, [wPokeAnimSceneIndex]
inc a inc a
ld [wPokeAnimSceneIndex], a ld [wPokeAnimSceneIndex], a

8
engine/pokedex.asm
View File

@ -346,7 +346,7 @@ Pokedex_InitDexEntryScreen: ; 40217 (10:4217)
ld a, SCGB_POKEDEX ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout call Pokedex_GetSGBLayout
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayMonCry
call Pokedex_IncrementDexPointer call Pokedex_IncrementDexPointer
ret ret
@ -415,7 +415,7 @@ Pokedex_ReinitDexEntryScreen: ; 402aa (10:42aa)
ld a, SCGB_POKEDEX ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout call Pokedex_GetSGBLayout
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayMonCry
ld hl, wJumptableIndex ld hl, wJumptableIndex
dec [hl] dec [hl]
ret ret
@ -471,7 +471,7 @@ DexEntryScreen_MenuActionJumptable: ; 402f2
call GetCryIndex call GetCryIndex
ld e, c ld e, c
ld d, b ld d, b
call PlayCryHeader call PlayCry
ret ret
.Print: ; 4034f .Print: ; 4034f
@ -2558,7 +2558,7 @@ _NewPokedexEntry: ; 41a7f
ld a, SCGB_POKEDEX ld a, SCGB_POKEDEX
call Pokedex_GetSGBLayout call Pokedex_GetSGBLayout
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry call PlayMonCry
ret ret

4
engine/routines/playslowcry.asm
View File

@ -1,6 +1,6 @@
Special_PlaySlowCry: ; fb841 Special_PlaySlowCry: ; fb841
ld a, [ScriptVar] ld a, [ScriptVar]
call LoadCryHeader call LoadCry
jr c, .done jr c, .done
ld hl, CryPitch ld hl, CryPitch
@ -23,7 +23,7 @@ Special_PlaySlowCry: ; fb841
ld [CryLength], a ld [CryLength], a
ld a, h ld a, h
ld [CryLength + 1], a ld [CryLength + 1], a
farcall _PlayCryHeader farcall _PlayCry
call WaitSFX call WaitSFX
.done .done

2
engine/scripting.asm
View File

@ -938,7 +938,7 @@ Script_cry:
jr nz, .ok jr nz, .ok
ld a, [ScriptVar] ld a, [ScriptVar]
.ok .ok
call PlayCry call PlayMonCry
ret ret
GetScriptObject: GetScriptObject:

2
engine/specials.asm
View File

@ -413,7 +413,7 @@ Special_SnorlaxAwake: ; 0xc43d
Special_PlayCurMonCry: ; c472 Special_PlayCurMonCry: ; c472
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
jp PlayCry jp PlayMonCry
; c478 ; c478

2
engine/stats_screen.asm
View File

@ -829,7 +829,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
call SetPalettes call SetPalettes
call .AnimateMon call .AnimateMon
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call PlayCry2 call PlayMonCry2
ret ret
.AnimateMon: ; 4e253 (13:6253) .AnimateMon: ; 4e253 (13:6253)

2
engine/trade_animation.asm
View File

@ -847,7 +847,7 @@ TradeAnim_ShowGivemonData: ; 2942e
jr c, .skip_cry jr c, .skip_cry
ld e, c ld e, c
ld d, b ld d, b
call PlayCryHeader call PlayCry
.skip_cry .skip_cry
call TradeAnim_AdvanceScriptPointer call TradeAnim_AdvanceScriptPointer

6
home/audio.asm
View File

@ -141,7 +141,7 @@ PlayMusic2:: ; 3bbc
; 3be3 ; 3be3
PlayCryHeader:: ; 3be3 PlayCry:: ; 3be3
; Play cry header de. ; Play cry header de.
push hl push hl
@ -176,11 +176,11 @@ endr
ld a, [hl] ld a, [hl]
ld [CryLength + 1], a ld [CryLength + 1], a
ld a, BANK(_PlayCryHeader) ld a, BANK(_PlayCry)
ld [hROMBank], a ld [hROMBank], a
ld [MBC3RomBank], a ld [MBC3RomBank], a
call _PlayCryHeader call _PlayCry
pop af pop af
ld [hROMBank], a ld [hROMBank], a

18
home/cry.asm
View File

@ -3,7 +3,7 @@ PlayStereoCry:: ; 37b6
ld a, 1 ld a, 1
ld [wStereoPanningMask], a ld [wStereoPanningMask], a
pop af pop af
call _PlayCry call _PlayMonCry
call WaitSFX call WaitSFX
ret ret
; 37c4 ; 37c4
@ -15,27 +15,27 @@ PlayStereoCry2:: ; 37c4
ld a, 1 ld a, 1
ld [wStereoPanningMask], a ld [wStereoPanningMask], a
pop af pop af
jp _PlayCry jp _PlayMonCry
; 37ce ; 37ce
PlayCry:: ; 37ce PlayMonCry:: ; 37ce
call PlayCry2 call PlayMonCry2
call WaitSFX call WaitSFX
ret ret
; 37d5 ; 37d5
PlayCry2:: ; 37d5 PlayMonCry2:: ; 37d5
; Don't wait for the cry to end. ; Don't wait for the cry to end.
push af push af
xor a xor a
ld [wStereoPanningMask], a ld [wStereoPanningMask], a
ld [CryTracks], a ld [CryTracks], a
pop af pop af
call _PlayCry call _PlayMonCry
ret ret
; 37e2 ; 37e2
_PlayCry:: ; 37e2 _PlayMonCry:: ; 37e2
push hl push hl
push de push de
push bc push bc
@ -45,7 +45,7 @@ _PlayCry:: ; 37e2
ld e, c ld e, c
ld d, b ld d, b
call PlayCryHeader call PlayCry
.done .done
pop bc pop bc
@ -54,7 +54,7 @@ _PlayCry:: ; 37e2
ret ret
; 37f3 ; 37f3
LoadCryHeader:: ; 37f3 LoadCry:: ; 37f3
; Load cry header bc. ; Load cry header bc.
call GetCryIndex call GetCryIndex

2
home/text.asm
View File

@ -1019,7 +1019,7 @@ Unreferenced_Function1522:: ; 1522
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
call PlayCry call PlayMonCry
pop de pop de
pop hl pop hl
pop bc pop bc

4
mobile/mobile_42.asm
View File

@ -518,7 +518,7 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e
jr c, .skip_cry jr c, .skip_cry
ld e, c ld e, c
ld d, b ld d, b
call PlayCryHeader call PlayCry
.skip_cry .skip_cry
ld c, 80 ld c, 80
@ -653,7 +653,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
jr c, .skip_cry jr c, .skip_cry
ld e, c ld e, c
ld d, b ld d, b
call PlayCryHeader call PlayCry
.skip_cry .skip_cry
ld c, 80 ld c, 80

2
mobile/mobile_5f.asm
View File

@ -1253,7 +1253,7 @@ Function17d7d3: ; 17d7d3
dec a dec a
ld e, a ld e, a
ld d, $0 ld d, $0
call PlayCryHeader call PlayCry
call WaitSFX call WaitSFX
call HlToCrashCheckPointer call HlToCrashCheckPointer
ret ret