summaryrefslogtreecommitdiff
path: root/scripts/Daycare.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-07 19:48:22 -0400
committerGitHub <noreply@github.com>2020-07-07 19:48:22 -0400
commit9571c550b6a0dcb3a4f54513c881661a87271024 (patch)
treed73507228a57e4f3cece2fb93fe7df3a9439553f /scripts/Daycare.asm
parentc480632d5494d04f7f5f0298a31877a2293b564e (diff)
parentbbf2f51a02b2544f1bef32a5868503b474ae2fef (diff)
Merge pull request #263 from Rangi42/master
Syncing style with pokecrystal
Diffstat (limited to 'scripts/Daycare.asm')
-rwxr-xr-xscripts/Daycare.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm
index 4c9e2a85..481d7e14 100755
--- a/scripts/Daycare.asm
+++ b/scripts/Daycare.asm
@@ -35,7 +35,7 @@ DayCareMText1:
pop af
ld hl, DayCareAllRightThenText
jp c, .done
- callab KnowsHMMove
+ callfar KnowsHMMove
ld hl, DayCareCantAcceptMonWithHMText
jp c, .done
xor a
@@ -65,19 +65,19 @@ DayCareMText1:
ld a, DAYCARE_DATA
ld [wMonDataLocation], a
call LoadMonData
- callab CalcLevelFromExperience
+ callfar CalcLevelFromExperience
ld a, d
cp MAX_LEVEL
jr c, .skipCalcExp
ld d, MAX_LEVEL
- callab CalcExperience
+ callfar CalcExperience
ld hl, wDayCareMonExp
- ld a, [hExperience]
+ ldh a, [hExperience]
ld [hli], a
- ld a, [hExperience + 1]
+ ldh a, [hExperience + 1]
ld [hli], a
- ld a, [hExperience + 2]
+ ldh a, [hExperience + 2]
ld [hl], a
ld d, MAX_LEVEL
@@ -138,11 +138,11 @@ DayCareMText1:
and a
jp nz, .leaveMonInDayCare
ld hl, wDayCareTotalCost
- ld [hMoney], a
+ ldh [hMoney], a
ld a, [hli]
- ld [hMoney + 1], a
+ ldh [hMoney + 1], a
ld a, [hl]
- ld [hMoney + 2], a
+ ldh [hMoney + 2], a
call HasEnoughMoney
jr nc, .enoughMoney
ld hl, DayCareNotEnoughMoneyText