Merge branch 'master' of https://github.com/pret/pokered

1 files changed, 49 insertions, 48 deletions

diff --git a/scripts/Daycare.asm b/scripts/Daycare.asm
index 164664b4..26f4342a 100644
--- a/scripts/Daycare.asm
+++ b/scripts/Daycare.asm
@@ -2,26 +2,27 @@ Daycare_Script:
 	jp EnableAutoTextBoxDrawing
 
 Daycare_TextPointers:
-	dw DayCareMText1
+	def_text_pointers
+	dw_const DaycareGentlemanText, TEXT_DAYCARE_GENTLEMAN
 
-DayCareMText1:
+DaycareGentlemanText:
 	text_asm
 	call SaveScreenTilesToBuffer2
 	ld a, [wDayCareInUse]
 	and a
 	jp nz, .daycareInUse
-	ld hl, DayCareIntroText
+	ld hl, .IntroText
 	call PrintText
 	call YesNoChoice
 	ld a, [wCurrentMenuItem]
 	and a
-	ld hl, DayCareComeAgainText
+	ld hl, .ComeAgainText
 	jp nz, .done
 	ld a, [wPartyCount]
 	dec a
-	ld hl, DayCareOnlyHaveOneMonText
+	ld hl, .OnlyHaveOneMonText
 	jp z, .done
-	ld hl, DayCareWhichMonText
+	ld hl, .WhichMonText
 	call PrintText
 	xor a
 	ld [wUpdateSpritesEnabled], a
@@ -33,17 +34,17 @@ DayCareMText1:
 	call RestoreScreenTilesAndReloadTilePatterns
 	call LoadGBPal
 	pop af
-	ld hl, DayCareAllRightThenText
+	ld hl, .AllRightThenText
 	jp c, .done
 	callfar KnowsHMMove
-	ld hl, DayCareCantAcceptMonWithHMText
+	ld hl, .CantAcceptMonWithHMText
 	jp c, .done
 	xor a
 	ld [wPartyAndBillsPCSavedMenuItem], a
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMonNicks
 	call GetPartyMonName
-	ld hl, DayCareWillLookAfterMonText
+	ld hl, .WillLookAfterMonText
 	call PrintText
 	ld a, 1
 	ld [wDayCareInUse], a
@@ -65,7 +66,7 @@ DayCareMText1:
 	ldpikacry e, PikachuCry28
 	callfar PlayPikachuSoundClip
 .asm_562e3
-	ld hl, DayCareComeSeeMeInAWhileText
+	ld hl, .ComeSeeMeInAWhileText
 	jp .done
 
 .daycareInUse
@@ -99,20 +100,20 @@ DayCareMText1:
 	ld [wDayCareStartLevel], a
 	cp d
 	ld [hl], d
-	ld hl, DayCareMonNeedsMoreTimeText
+	ld hl, .MonNeedsMoreTimeText
 	jr z, .next
 	ld a, [wDayCareStartLevel]
 	ld b, a
 	ld a, d
 	sub b
 	ld [wDayCareNumLevelsGrown], a
-	ld hl, DayCareMonHasGrownText
+	ld hl, .MonHasGrownText
 
 .next
 	call PrintText
 	ld a, [wPartyCount]
 	cp PARTY_LENGTH
-	ld hl, DayCareNoRoomForMonText
+	ld hl, .NoRoomForMonText
 	jp z, .leaveMonInDayCare
 	ld de, wDayCareTotalCost
 	xor a
@@ -137,13 +138,13 @@ DayCareMText1:
 	pop hl
 	dec b
 	jr nz, .calcPriceLoop
-	ld hl, DayCareOweMoneyText
+	ld hl, .OweMoneyText
 	call PrintText
 	ld a, MONEY_BOX
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
 	call YesNoChoice
-	ld hl, DayCareAllRightThenText
+	ld hl, .AllRightThenText
 	ld a, [wCurrentMenuItem]
 	and a
 	jp nz, .leaveMonInDayCare
@@ -155,7 +156,7 @@ DayCareMText1:
 	ldh [hMoney + 2], a
 	call HasEnoughMoney
 	jr nc, .enoughMoney
-	ld hl, DayCareNotEnoughMoneyText
+	ld hl, .NotEnoughMoneyText
 	jp .leaveMonInDayCare
 
 .enoughMoney
@@ -172,7 +173,7 @@ DayCareMText1:
 	ld a, MONEY_BOX
 	ld [wTextBoxID], a
 	call DisplayTextBoxID
-	ld hl, DayCareHeresYourMonText
+	ld hl, .HeresYourMonText
 	call PrintText
 	ld a, DAYCARE_TO_PARTY
 	ld [wMoveMonType], a
@@ -228,7 +229,7 @@ DayCareMText1:
 	ldpikacry e, PikachuCry35
 	callfar PlayPikachuSoundClip
 .asm_56430
-	ld hl, DayCareGotMonBackText
+	ld hl, .GotMonBackText
 	jr .done
 
 .leaveMonInDayCare
@@ -239,60 +240,60 @@ DayCareMText1:
 	call PrintText
 	jp TextScriptEnd
 
-DayCareIntroText:
-	text_far _DayCareIntroText
+.IntroText:
+	text_far _DaycareGentlemanIntroText
 	text_end
 
-DayCareWhichMonText:
-	text_far _DayCareWhichMonText
+.WhichMonText:
+	text_far _DaycareGentlemanWhichMonText
 	text_end
 
-DayCareWillLookAfterMonText:
-	text_far _DayCareWillLookAfterMonText
+.WillLookAfterMonText:
+	text_far _DaycareGentlemanWillLookAfterMonText
 	text_end
 
-DayCareComeSeeMeInAWhileText:
-	text_far _DayCareComeSeeMeInAWhileText
+.ComeSeeMeInAWhileText:
+	text_far _DaycareGentlemanComeSeeMeInAWhileText
 	text_end
 
-DayCareMonHasGrownText:
-	text_far _DayCareMonHasGrownText
+.MonHasGrownText:
+	text_far _DaycareGentlemanMonHasGrownText
 	text_end
 
-DayCareOweMoneyText:
-	text_far _DayCareOweMoneyText
+.OweMoneyText:
+	text_far _DaycareGentlemanOweMoneyText
 	text_end
 
-DayCareGotMonBackText:
-	text_far _DayCareGotMonBackText
+.GotMonBackText:
+	text_far _DaycareGentlemanGotMonBackText
 	text_end
 
-DayCareMonNeedsMoreTimeText:
-	text_far _DayCareMonNeedsMoreTimeText
+.MonNeedsMoreTimeText:
+	text_far _DaycareGentlemanMonNeedsMoreTimeText
 	text_end
 
-DayCareAllRightThenText:
-	text_far _DayCareAllRightThenText
-DayCareComeAgainText:
-	text_far _DayCareComeAgainText
+.AllRightThenText:
+	text_far _DaycareGentlemanAllRightThenText
+.ComeAgainText:
+	text_far _DaycareGentlemanComeAgainText
 	text_end
 
-DayCareNoRoomForMonText:
-	text_far _DayCareNoRoomForMonText
+.NoRoomForMonText:
+	text_far _DaycareGentlemanNoRoomForMonText
 	text_end
 
-DayCareOnlyHaveOneMonText:
-	text_far _DayCareOnlyHaveOneMonText
+.OnlyHaveOneMonText:
+	text_far _DaycareGentlemanOnlyHaveOneMonText
 	text_end
 
-DayCareCantAcceptMonWithHMText:
-	text_far _DayCareCantAcceptMonWithHMText
+.CantAcceptMonWithHMText:
+	text_far _DaycareGentlemanCantAcceptMonWithHMText
 	text_end
 
-DayCareHeresYourMonText:
-	text_far _DayCareHeresYourMonText
+.HeresYourMonText:
+	text_far _DaycareGentlemanHeresYourMonText
 	text_end
 
-DayCareNotEnoughMoneyText:
-	text_far _DayCareNotEnoughMoneyText
+.NotEnoughMoneyText:
+	text_far _DaycareGentlemanNotEnoughMoneyText
 	text_end