summaryrefslogtreecommitdiff
path: root/scripts/daycarem.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/daycarem.asm')
-rwxr-xr-xscripts/daycarem.asm144
1 files changed, 74 insertions, 70 deletions
diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm
index 330f2234..794d681e 100755
--- a/scripts/daycarem.asm
+++ b/scripts/daycarem.asm
@@ -9,19 +9,19 @@ DayCareMText1: ; 56254 (15:6254)
call SaveScreenTilesToBuffer2
ld a, [W_DAYCARE_IN_USE]
and a
- jp nz, DayCareMScript_562e1
- ld hl, DayCareMText_5640f
+ jp nz, .daycareInUse
+ ld hl, DayCareIntroText
call PrintText
call YesNoChoice
ld a, [wCurrentMenuItem]
and a
- ld hl, DayCareMText_5643b
- jp nz, DayCareMScript_56409
+ ld hl, DayCareComeAgainText
+ jp nz, .done
ld a, [wPartyCount]
dec a
- ld hl, DayCareMText_56445
- jp z, DayCareMScript_56409
- ld hl, DayCareMText_56414
+ ld hl, DayCareOnlyHaveOneMonText
+ jp z, .done
+ ld hl, DayCareWhichMonText
call PrintText
xor a
ld [wUpdateSpritesEnabled], a
@@ -33,17 +33,17 @@ DayCareMText1: ; 56254 (15:6254)
call RestoreScreenTilesAndReloadTilePatterns
call LoadGBPal
pop af
- ld hl, DayCareMText_56437
- jp c, DayCareMScript_56409
+ ld hl, DayCareAllRightThenText
+ jp c, .done
callab KnowsHMMove
- ld hl, DayCareMText_5644a
- jp c, DayCareMScript_56409
+ ld hl, DayCareCantAcceptMonWithHMText
+ jp c, .done
xor a
ld [wPartyAndBillsPCSavedMenuItem], a
ld a, [wWhichPokemon]
ld hl, wPartyMonNicks
call GetPartyMonName
- ld hl, DayCareMText_56419
+ ld hl, DayCareWillLookAfterMonText
call PrintText
ld a, 1
ld [W_DAYCARE_IN_USE], a
@@ -55,10 +55,10 @@ DayCareMText1: ; 56254 (15:6254)
call RemovePokemon
ld a, [wcf91]
call PlayCry
- ld hl, DayCareMText_5641e
- jp DayCareMScript_56409
+ ld hl, DayCareComeSeeMeInAWhileText
+ jp .done
-DayCareMScript_562e1: ; 562e1 (15:62e1)
+.daycareInUse
xor a
ld hl, W_DAYCAREMONNAME
call GetPartyMonName
@@ -68,40 +68,41 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
callab CalcLevelFromExperience
ld a, d
cp MAX_LEVEL
- jr c, .asm_56315
+ jr c, .skipCalcExp
+
ld d, MAX_LEVEL
callab CalcExperience
ld hl, wDayCareMonExp
- ld a, [H_NUMTOPRINT]
+ ld a, [hExperience]
ld [hli], a
- ld a, [$ff97]
+ ld a, [hExperience + 1]
ld [hli], a
- ld a, [$ff98]
+ ld a, [hExperience + 2]
ld [hl], a
ld d, MAX_LEVEL
-.asm_56315
+.skipCalcExp
xor a
- ld [wTrainerEngageDistance], a
+ ld [wDayCareNumLevelsGrown], a
ld hl, wDayCareMonBoxLevel
ld a, [hl]
- ld [wTrainerSpriteOffset], a
+ ld [wDayCareStartLevel], a
cp d
ld [hl], d
- ld hl, DayCareMText_56432
- jr z, .asm_56333
- ld a, [wTrainerSpriteOffset]
+ ld hl, DayCareMonNeedsMoreTimeText
+ jr z, .next
+ ld a, [wDayCareStartLevel]
ld b, a
ld a, d
sub b
- ld [wTrainerEngageDistance], a
- ld hl, DayCareMText_56423
+ ld [wDayCareNumLevelsGrown], a
+ ld hl, DayCareMonHasGrownText
-.asm_56333
+.next
call PrintText
ld a, [wPartyCount]
cp PARTY_LENGTH
- ld hl, DayCareMText_56440
+ ld hl, DayCareNoRoomForMonText
jp z, .asm_56403
ld de, wTrainerFacingDirection
xor a
@@ -112,7 +113,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld a, $1
ld [hli], a
ld [hl], $0
- ld a, [wTrainerEngageDistance]
+ ld a, [wDayCareNumLevelsGrown]
inc a
ld b, a
ld c, $2
@@ -126,13 +127,13 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
pop hl
dec b
jr nz, .asm_56357
- ld hl, DayCareMText_56428
+ ld hl, DayCareOweMoneyText
call PrintText
ld a, $13
ld [wTextBoxID], a
call DisplayTextBoxID
call YesNoChoice
- ld hl, DayCareMText_56437
+ ld hl, DayCareAllRightThenText
ld a, [wCurrentMenuItem]
and a
jp nz, .asm_56403
@@ -144,13 +145,13 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld [hMoney + 2], a
call HasEnoughMoney
jr nc, .asm_56396
- ld hl, DayCareMText_56454
+ ld hl, DayCareNotEnoughMoneyText
jp .asm_56403
.asm_56396
xor a
ld [W_DAYCARE_IN_USE], a
- ld hl, wTrainerEngageDistance
+ ld hl, wDayCareNumLevelsGrown
ld [hli], a
inc hl
ld de, wPlayerMoney + 2
@@ -161,7 +162,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld a, MONEY_BOX
ld [wTextBoxID], a
call DisplayTextBoxID
- ld hl, DayCareMText_5644f
+ ld hl, DayCareHeresYourMonText
call PrintText
ld a, DAYCARE_TO_PARTY
ld [wMoveMonType], a
@@ -178,10 +179,12 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld d, h
ld e, l
ld a, 1
- ld [wHPBarMaxHP], a
+ ld [wLearningMovesFromDayCare], a
predef WriteMonMoves
pop bc
pop af
+
+; set mon's HP to max
ld hl, wPartyMon1HP
call AddNTimes
ld d, h
@@ -193,73 +196,74 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
inc de
ld a, [hl]
ld [de], a
+
ld a, [wcf91]
call PlayCry
- ld hl, DayCareMText_5642d
- jr DayCareMScript_56409
+ ld hl, DayCareGotMonBackText
+ jr .done
.asm_56403
- ld a, [wTrainerSpriteOffset]
+ ld a, [wDayCareStartLevel]
ld [wDayCareMonBoxLevel], a
-DayCareMScript_56409: ; 56409 (15:6409)
+.done
call PrintText
jp TextScriptEnd
-DayCareMText_5640f: ; 5640f (15:640f)
- TX_FAR _DayCareMText_5640f
+DayCareIntroText: ; 5640f (15:640f)
+ TX_FAR _DayCareIntroText
db "@"
-DayCareMText_56414: ; 56414 (15:6414)
- TX_FAR _DayCareMText_56414
+DayCareWhichMonText: ; 56414 (15:6414)
+ TX_FAR _DayCareWhichMonText
db "@"
-DayCareMText_56419: ; 56419 (15:6419)
- TX_FAR _DayCareMText_56419
+DayCareWillLookAfterMonText: ; 56419 (15:6419)
+ TX_FAR _DayCareWillLookAfterMonText
db "@"
-DayCareMText_5641e: ; 5641e (15:641e)
- TX_FAR _DayCareMText_5641e
+DayCareComeSeeMeInAWhileText: ; 5641e (15:641e)
+ TX_FAR _DayCareComeSeeMeInAWhileText
db "@"
-DayCareMText_56423: ; 56423 (15:6423)
- TX_FAR _DayCareMText_56423
+DayCareMonHasGrownText: ; 56423 (15:6423)
+ TX_FAR _DayCareMonHasGrownText
db "@"
-DayCareMText_56428: ; 56428 (15:6428)
- TX_FAR _DayCareMText_56428
+DayCareOweMoneyText: ; 56428 (15:6428)
+ TX_FAR _DayCareOweMoneyText
db "@"
-DayCareMText_5642d: ; 5642d (15:642d)
- TX_FAR _DayCareMText_5642d
+DayCareGotMonBackText: ; 5642d (15:642d)
+ TX_FAR _DayCareGotMonBackText
db "@"
-DayCareMText_56432: ; 56432 (15:6432)
- TX_FAR _DayCareMText_56432
+DayCareMonNeedsMoreTimeText: ; 56432 (15:6432)
+ TX_FAR _DayCareMonNeedsMoreTimeText
db "@"
-DayCareMText_56437: ; 56437 (15:6437)
- TX_FAR _DayCareMText_56437
-DayCareMText_5643b: ; 5643b (15:643b)
- TX_FAR _DayCareMText_5643b
+DayCareAllRightThenText: ; 56437 (15:6437)
+ TX_FAR _DayCareAllRightThenText
+DayCareComeAgainText: ; 5643b (15:643b)
+ TX_FAR _DayCareComeAgainText
db "@"
-DayCareMText_56440: ; 56440 (15:6440)
- TX_FAR _DayCareMText_56440
+DayCareNoRoomForMonText: ; 56440 (15:6440)
+ TX_FAR _DayCareNoRoomForMonText
db "@"
-DayCareMText_56445: ; 56445 (15:6445)
- TX_FAR _DayCareMText_56445
+DayCareOnlyHaveOneMonText: ; 56445 (15:6445)
+ TX_FAR _DayCareOnlyHaveOneMonText
db "@"
-DayCareMText_5644a: ; 5644a (15:644a)
- TX_FAR _DayCareMText_5644a
+DayCareCantAcceptMonWithHMText: ; 5644a (15:644a)
+ TX_FAR _DayCareCantAcceptMonWithHMText
db "@"
-DayCareMText_5644f: ; 5644f (15:644f)
- TX_FAR _DayCareMText_5644f
+DayCareHeresYourMonText: ; 5644f (15:644f)
+ TX_FAR _DayCareHeresYourMonText
db "@"
-DayCareMText_56454: ; 56454 (15:6454)
- TX_FAR _DayCareMText_56454
+DayCareNotEnoughMoneyText: ; 56454 (15:6454)
+ TX_FAR _DayCareNotEnoughMoneyText
db "@"