Consistent capitalization for map names, matching their constants

engine/breeding/egg.asm

@@ -888,7 +888,7 @@ Special_DayCareMon1: ; 17421
 	call PrintText
 	ld a, [wBreedMon1Species]
 	call PlayCry
-	ld a, [wDaycareLady]
+	ld a, [wDayCareLady]
 	bit 0, a
 	jr z, DayCareMonCursor
 	call ButtonSound
@@ -901,7 +901,7 @@ Special_DayCareMon2: ; 17440
 	call PrintText
 	ld a, [wBreedMon2Species]
 	call PlayCry
-	ld a, [wDaycareMan]
+	ld a, [wDayCareMan]
 	bit 0, a
 	jr z, DayCareMonCursor
 	call ButtonSound

engine/engine_flags.asm

@@ -97,13 +97,13 @@ ENDM
 	engine_flag wPokegearFlags, 3 ; expn card
 	engine_flag wPokegearFlags, 7 ; on/off
 
-	;   wDaycareMan, 7 ; daycare 1 on
-	engine_flag wDaycareMan, 6 ; egg is ready
-	;   wDaycareMan, 5 ; monster 1 and 2 are compatible
-	engine_flag wDaycareMan, 0 ; monster 1 in daycare
+	;   wDayCareMan, 7 ; day-care 1 on
+	engine_flag wDayCareMan, 6 ; egg is ready
+	;   wDayCareMan, 5 ; monster 1 and 2 are compatible
+	engine_flag wDayCareMan, 0 ; monster 1 in day-care
 
-	;   wDaycareLady, 7 = daycare 2 on
-	engine_flag wDaycareLady, 0 ; monster 2 in daycare
+	;   wDayCareLady, 7 = day-care 2 on
+	engine_flag wDayCareLady, 0 ; monster 2 in day-care
 
 	engine_flag wMomSavingMoney, 0 ; mom saving money ; $8
 	engine_flag wMomSavingMoney, 7 ; dst

engine/events.asm

@@ -964,7 +964,7 @@ CountStep: ; 96b79
 
 .skip_egg
 	; Increase the EXP of (both) DayCare Pokemon by 1.
-	callba DaycareStep
+	callba DayCareStep
 
 	; Every four steps, deal damage to all Poisoned Pokemon
 	ld hl, PoisonStepCount

engine/move_mon.asm

@@ -446,9 +446,9 @@ SentGetPkmnIntoFromBox: ; db3f
 	ld a, [wPokemonWithdrawDepositParameter]
 	and a
 	jr z, .check_IfPartyIsFull
-	cp DAYCARE_WITHDRAW
+	cp DAY_CARE_WITHDRAW
 	jr z, .check_IfPartyIsFull
-	cp DAYCARE_DEPOSIT
+	cp DAY_CARE_DEPOSIT
 	ld hl, wBreedMon1Species
 	jr z, .breedmon
 
@@ -473,7 +473,7 @@ SentGetPkmnIntoFromBox: ; db3f
 	ld b, 0
 	add hl, bc
 	ld a, [wPokemonWithdrawDepositParameter]
-	cp DAYCARE_WITHDRAW
+	cp DAY_CARE_WITHDRAW
 	ld a, [wBreedMon1Species]
 	jr z, .okay1
 	ld a, [CurPartySpecies]
@@ -504,7 +504,7 @@ SentGetPkmnIntoFromBox: ; db3f
 	ld hl, sBoxMon1Species
 	ld bc, BOXMON_STRUCT_LENGTH
 	jr z, .okay3
-	cp DAYCARE_WITHDRAW
+	cp DAY_CARE_WITHDRAW
 	ld hl, wBreedMon1Species
 	jr z, .okay4
 	ld hl, PartyMon1Species
@@ -518,7 +518,7 @@ SentGetPkmnIntoFromBox: ; db3f
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyBytes
 	ld a, [wPokemonWithdrawDepositParameter]
-	cp DAYCARE_DEPOSIT
+	cp DAY_CARE_DEPOSIT
 	ld de, wBreedMon1OT
 	jr z, .okay5
 	dec a
@@ -540,7 +540,7 @@ SentGetPkmnIntoFromBox: ; db3f
 	and a
 	jr z, .okay7
 	ld hl, wBreedMon1OT
-	cp DAYCARE_WITHDRAW
+	cp DAY_CARE_WITHDRAW
 	jr z, .okay8
 	ld hl, PartyMonOT
 
@@ -552,7 +552,7 @@ SentGetPkmnIntoFromBox: ; db3f
 	ld bc, NAME_LENGTH
 	call CopyBytes
 	ld a, [wPokemonWithdrawDepositParameter]
-	cp DAYCARE_DEPOSIT
+	cp DAY_CARE_DEPOSIT
 	ld de, wBreedMon1Nick
 	jr z, .okay9
 	dec a
@@ -574,7 +574,7 @@ SentGetPkmnIntoFromBox: ; db3f
 	and a
 	jr z, .okay11
 	ld hl, wBreedMon1Nick
-	cp DAYCARE_WITHDRAW
+	cp DAY_CARE_WITHDRAW
 	jr z, .okay12
 	ld hl, PartyMonNicknames
 
@@ -590,7 +590,7 @@ SentGetPkmnIntoFromBox: ; db3f
 	ld a, [wPokemonWithdrawDepositParameter]
 	cp PC_DEPOSIT
 	jr z, .took_out_of_box
-	cp DAYCARE_DEPOSIT
+	cp DAY_CARE_DEPOSIT
 	jp z, .CloseSRAM_And_ClearCarryFlag
 
 	push hl
@@ -732,7 +732,7 @@ RestorePPofDepositedPokemon: ; dcb6
 	ret
 ; dd21
 
-RetrievePokemonFromDaycareMan: ; dd21
+RetrievePokemonFromDayCareMan: ; dd21
 	ld a, [wBreedMon1Species]
 	ld [CurPartySpecies], a
 	ld de, SFX_TRANSACTION
@@ -748,7 +748,7 @@ RetrievePokemonFromDaycareMan: ; dd21
 	jp Functiondd64
 ; dd42
 
-RetrievePokemonFromDaycareLady: ; dd42
+RetrievePokemonFromDayCareLady: ; dd42
 	ld a, [wBreedMon2Species]
 	ld [CurPartySpecies], a
 	ld de, SFX_TRANSACTION
@@ -872,7 +872,7 @@ Functionde1a: ; de1a
 	ret
 ; de2a
 
-DepositMonWithDaycareMan: ; de2a
+DepositMonWithDayCareMan: ; de2a
 	ld de, wBreedMon1Nick
 	call DepositBreedmon
 	xor a
@@ -880,7 +880,7 @@ DepositMonWithDaycareMan: ; de2a
 	jp RemoveMonFromPartyOrBox
 ; de37
 
-DepositMonWithDaycareLady: ; de37
+DepositMonWithDayCareLady: ; de37
 	ld de, wBreedMon2Nick
 	call DepositBreedmon
 	xor a

engine/npctrade.asm

@@ -40,7 +40,7 @@ NPCTrade:: ; fcba8
 
 ; Select givemon from party
 	ld b, PARTYMENUACTION_GIVE_MON
-	callba SelectTradeOrDaycareMon
+	callba SelectTradeOrDayCareMon
 	ld a, TRADE_CANCEL
 	jr c, .done
 

engine/overworld.asm

@@ -232,9 +232,9 @@ GetMonSprite: ; 14259
 
 	cp SPRITE_POKEMON
 	jr c, .Normal
-	cp SPRITE_DAYCARE_MON_1
+	cp SPRITE_DAY_CARE_MON_1
 	jr z, .wBreedMon1
-	cp SPRITE_DAYCARE_MON_2
+	cp SPRITE_DAY_CARE_MON_2
 	jr z, .wBreedMon2
 	cp SPRITE_VARS
 	jr nc, .Variable
@@ -1270,11 +1270,11 @@ Group11Sprites: ; 14673
 	db SPRITE_YOUNGSTER
 	db SPRITE_OFFICER
 	db SPRITE_POKEFAN_M
-	db SPRITE_DAYCARE_MON_1
+	db SPRITE_DAY_CARE_MON_1
 	db SPRITE_COOLTRAINER_F
 	db SPRITE_ROCKET
 	db SPRITE_LASS
-	db SPRITE_DAYCARE_MON_2
+	db SPRITE_DAY_CARE_MON_2
 	db SPRITE_FRUIT_TREE
 	db SPRITE_SLOWPOKE
 ; 1468a

engine/party_menu.asm

@@ -13,7 +13,7 @@ SelectMonFromParty: ; 50000
 ; 5001d
 
 
-SelectTradeOrDaycareMon: ; 5001d
+SelectTradeOrDayCareMon: ; 5001d
 	ld a, b
 	ld [PartyMenuActionText], a
 	call DisableSpriteUpdates

engine/std_scripts.asm

@@ -1786,7 +1786,7 @@ ReceiveItemScript: ; 0xbcdb9
 ReceiveTogepiEggScript: ; 0xbcdc3
 	waitsfx
 	farwritetext ReceivedItemText
-	playsound SFX_GET_EGG_FROM_DAYCARE_LADY
+	playsound SFX_GET_EGG_FROM_DAY_CARE_LADY
 	waitsfx
 	end
 ; 0xbcdcd