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

Label some daycare-related functions

Browse Source
This commit is contained in:
mid-kid
2018-02-14 11:51:47 +01:00
parent f1c23f2153
commit 23b773d5c2
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/events/daycare.asm
View File

@@ -44,7 +44,7 @@ Special_DayCareMan: ; 166d6
call GetPriceToRetrieveBreedmon call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon call DayCare_AskWithdrawBreedMon
jr c, .print_text jr c, .print_text
farcall RetrievePokemonFromDayCareMan farcall RetrieveMonFromDayCareMan
call DayCare_GetBackMonForMoney call DayCare_GetBackMonForMoney
ld hl, wDayCareMan ld hl, wDayCareMan
res 0, [hl] res 0, [hl]
@@ -83,7 +83,7 @@ Special_DayCareLady: ; 1672a
call GetPriceToRetrieveBreedmon call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon call DayCare_AskWithdrawBreedMon
jr c, .print_text jr c, .print_text
farcall RetrievePokemonFromDayCareLady farcall RetrieveMonFromDayCareLady
call DayCare_GetBackMonForMoney call DayCare_GetBackMonForMoney
ld hl, wDayCareLady ld hl, wDayCareLady
res 0, [hl] res 0, [hl]

16
engine/move_mon.asm
View File

@@ -775,7 +775,7 @@ RestorePPofDepositedPokemon: ; dcb6
ret ret
; dd21 ; dd21
RetrievePokemonFromDayCareMan: ; dd21 RetrieveMonFromDayCareMan: ; dd21
ld a, [wBreedMon1Species] ld a, [wBreedMon1Species]
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
ld de, SFX_TRANSACTION ld de, SFX_TRANSACTION
@@ -788,10 +788,10 @@ RetrievePokemonFromDayCareMan: ; dd21
ld [wCurPartyLevel], a ld [wCurPartyLevel], a
xor a xor a
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
jp Functiondd64 jp RetrieveBreedmon
; dd42 ; dd42
RetrievePokemonFromDayCareLady: ; dd42 RetrieveMonFromDayCareLady: ; dd42
ld a, [wBreedMon2Species] ld a, [wBreedMon2Species]
ld [wCurPartySpecies], a ld [wCurPartySpecies], a
ld de, SFX_TRANSACTION ld de, SFX_TRANSACTION
@@ -804,10 +804,10 @@ RetrievePokemonFromDayCareLady: ; dd42
ld [wCurPartyLevel], a ld [wCurPartyLevel], a
ld a, PC_DEPOSIT ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a ld [wPokemonWithdrawDepositParameter], a
jp Functiondd64 jp RetrieveBreedmon
; dd64 ; dd64
Functiondd64: ; dd64 RetrieveBreedmon: ; dd64
ld hl, wPartyCount ld hl, wPartyCount
ld a, [hl] ld a, [hl]
cp PARTY_LENGTH cp PARTY_LENGTH
@@ -853,12 +853,12 @@ Functiondd64: ; dd64
pop hl pop hl
call CopyBytes call CopyBytes
push hl push hl
call Functionde1a call GetLastPartyMon
pop hl pop hl
ld bc, BOXMON_STRUCT_LENGTH ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes call CopyBytes
call GetBaseData call GetBaseData
call Functionde1a call GetLastPartyMon
ld b, d ld b, d
ld c, e ld c, e
ld hl, MON_LEVEL ld hl, MON_LEVEL
@@ -904,7 +904,7 @@ Functiondd64: ; dd64
ret ret
; de1a ; de1a
Functionde1a: ; de1a GetLastPartyMon: ; de1a
ld a, [wPartyCount] ld a, [wPartyCount]
dec a dec a
ld hl, wPartyMon1Species ld hl, wPartyMon1Species