ref: 23b773d5c254e2dc3d859a8cc28a5e600c4207f7
parent: f1c23f21532b2f194536ceaaba2d9a30c62ce719
author: mid-kid <esteve.varela@gmail.com>
date: Wed Feb 14 06:51:47 EST 2018
Label some daycare-related functions
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
@@ -44,7 +44,7 @@
call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon
jr c, .print_text
- farcall RetrievePokemonFromDayCareMan
+ farcall RetrieveMonFromDayCareMan
call DayCare_GetBackMonForMoney
ld hl, wDayCareMan
res 0, [hl]
@@ -83,7 +83,7 @@
call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon
jr c, .print_text
- farcall RetrievePokemonFromDayCareLady
+ farcall RetrieveMonFromDayCareLady
call DayCare_GetBackMonForMoney
ld hl, wDayCareLady
res 0, [hl]
--- a/engine/move_mon.asm
+++ b/engine/move_mon.asm
@@ -775,7 +775,7 @@
ret
; dd21
-RetrievePokemonFromDayCareMan: ; dd21
+RetrieveMonFromDayCareMan: ; dd21
ld a, [wBreedMon1Species]
ld [wCurPartySpecies], a
ld de, SFX_TRANSACTION
@@ -788,10 +788,10 @@
ld [wCurPartyLevel], a
xor a
ld [wPokemonWithdrawDepositParameter], a
- jp Functiondd64
+ jp RetrieveBreedmon
; dd42
-RetrievePokemonFromDayCareLady: ; dd42
+RetrieveMonFromDayCareLady: ; dd42
ld a, [wBreedMon2Species]
ld [wCurPartySpecies], a
ld de, SFX_TRANSACTION
@@ -804,10 +804,10 @@
ld [wCurPartyLevel], a
ld a, PC_DEPOSIT
ld [wPokemonWithdrawDepositParameter], a
- jp Functiondd64
+ jp RetrieveBreedmon
; dd64
-Functiondd64: ; dd64
+RetrieveBreedmon: ; dd64
ld hl, wPartyCount
ld a, [hl]
cp PARTY_LENGTH
@@ -853,12 +853,12 @@
pop hl
call CopyBytes
push hl
- call Functionde1a
+ call GetLastPartyMon
pop hl
ld bc, BOXMON_STRUCT_LENGTH
call CopyBytes
call GetBaseData
- call Functionde1a
+ call GetLastPartyMon
ld b, d
ld c, e
ld hl, MON_LEVEL
@@ -904,7 +904,7 @@
ret
; de1a
-Functionde1a: ; de1a
+GetLastPartyMon: ; de1a
ld a, [wPartyCount]
dec a
ld hl, wPartyMon1Species