pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Consistent capitalization for map names, matching their constants

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-10 13:37:15 -05:00
parent 94c7def488
commit 699495bfcb
67 changed files with 494 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
event/daycare.asm
View File

@@ -21,17 +21,17 @@
const DAYCARETEXT_13
Special_DayCareMan: ; 166d6
ld hl, wDaycareMan
ld hl, wDayCareMan
bit 0, [hl]
jr nz, .AskWithdrawMon
ld hl, wDaycareMan
ld hl, wDayCareMan
ld a, DAYCARETEXT_MAN_INTRO
call DayCareManIntroText
jr c, .cancel
call DayCareAskDepositPokemon
jr c, .print_text
callba DepositMonWithDaycareMan
ld hl, wDaycareMan
callba DepositMonWithDayCareMan
ld hl, wDayCareMan
set 0, [hl]
call DayCare_DepositPokemonText
call DayCare_InitBreeding
@@ -43,9 +43,9 @@ Special_DayCareMan: ; 166d6
call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon
jr c, .print_text
callba RetrievePokemonFromDaycareMan
callba RetrievePokemonFromDayCareMan
call DayCare_TakeMoney_PlayCry
ld hl, wDaycareMan
ld hl, wDayCareMan
res 0, [hl]
res 5, [hl]
jr .cancel
@@ -60,17 +60,17 @@ Special_DayCareMan: ; 166d6
; 1672a
Special_DayCareLady: ; 1672a
ld hl, wDaycareLady
ld hl, wDayCareLady
bit 0, [hl]
jr nz, .AskWithdrawMon
ld hl, wDaycareLady
ld hl, wDayCareLady
ld a, DAYCARETEXT_LADY_INTRO
call DayCareLadyIntroText
jr c, .cancel
call DayCareAskDepositPokemon
jr c, .print_text
callba DepositMonWithDaycareLady
ld hl, wDaycareLady
callba DepositMonWithDayCareLady
ld hl, wDayCareLady
set 0, [hl]
call DayCare_DepositPokemonText
call DayCare_InitBreeding
@@ -82,11 +82,11 @@ Special_DayCareLady: ; 1672a
call GetPriceToRetrieveBreedmon
call DayCare_AskWithdrawBreedMon
jr c, .print_text
callba RetrievePokemonFromDaycareLady
callba RetrievePokemonFromDayCareLady
call DayCare_TakeMoney_PlayCry
ld hl, wDaycareLady
ld hl, wDayCareLady
res 0, [hl]
ld hl, wDaycareMan
ld hl, wDayCareMan
res 5, [hl]
jr .cancel
@@ -124,7 +124,7 @@ DayCareAskDepositPokemon: ; 16798
ld a, DAYCARETEXT_WHICH_ONE
call PrintDayCareText
ld b, PARTYMENUACTION_GIVE_MON
callba SelectTradeOrDaycareMon
callba SelectTradeOrDayCareMon
jr c, .Declined
ld a, [CurPartySpecies]
cp EGG
@@ -426,7 +426,7 @@ PrintDayCareText: ; 1689b
; 0x16936
Special_DayCareManOutside: ; 16936
ld hl, wDaycareMan
ld hl, wDayCareMan
bit 6, [hl]
jr nz, .AskGiveEgg
ld hl, .NotYet
@@ -448,12 +448,12 @@ Special_DayCareManOutside: ; 16936
cp PARTY_LENGTH
jr nc, .PartyFull
call DayCare_GiveEgg
ld hl, wDaycareMan
ld hl, wDayCareMan
res 6, [hl]
call DayCare_InitBreeding
ld hl, .GotEggText
call PrintText
ld de, SFX_GET_EGG_FROM_DAYCARE_LADY
ld de, SFX_GET_EGG_FROM_DAY_CARE_LADY
call PlaySFX
ld c, 120
call DelayFrames
@@ -590,10 +590,10 @@ DayCare_GetCurrentPartyMember: ; 16a31
; 16a3b
DayCare_InitBreeding: ; 16a3b
ld a, [wDaycareLady]
ld a, [wDayCareLady]
bit 0, a
ret z
ld a, [wDaycareMan]
ld a, [wDayCareMan]
bit 0, a
ret z
callab CheckBreedmonCompatibility
@@ -602,7 +602,7 @@ DayCare_InitBreeding: ; 16a3b
ret z
inc a
ret z
ld hl, wDaycareMan
ld hl, wDayCareMan
set 5, [hl]
.loop
call Random

22
event/happiness_egg.asm
View File

@@ -158,31 +158,31 @@ StepHappiness:: ; 725a
jr nz, .loop
ret
DaycareStep:: ; 7282
DayCareStep:: ; 7282
ld a, [wDaycareMan]
ld a, [wDayCareMan]
bit 0, a
jr z, .daycare_lady
jr z, .day_care_lady
ld a, [wBreedMon1Level] ; level
cp 100
jr nc, .daycare_lady
jr nc, .day_care_lady
ld hl, wBreedMon1Exp + 2 ; exp
inc [hl]
jr nz, .daycare_lady
jr nz, .day_care_lady
dec hl
inc [hl]
jr nz, .daycare_lady
jr nz, .day_care_lady
dec hl
inc [hl]
ld a, [hl]
cp 5242880 / $10000
jr c, .daycare_lady
jr c, .day_care_lady
ld a, 5242880 / $10000
ld [hl], a
.daycare_lady
ld a, [wDaycareLady]
.day_care_lady
ld a, [wDayCareLady]
bit 0, a
jr z, .check_egg
@@ -204,7 +204,7 @@ DaycareStep:: ; 7282
ld [hl], a
.check_egg
ld hl, wDaycareMan
ld hl, wDayCareMan
bit 5, [hl] ; egg
ret z
ld hl, wStepsToEgg
@@ -232,7 +232,7 @@ DaycareStep:: ; 7282
call Random
cp b
ret nc
ld hl, wDaycareMan
ld hl, wDayCareMan
res 5, [hl]
set 6, [hl]
ret

8
event/unown.asm
View File

@@ -61,10 +61,10 @@ SpecialAerodactylChamber: ; 8ae30
call GetSecondaryMapHeaderPointer
ld a, h
cp RuinsofAlphAerodactylChamber_SecondMapHeader / $100
cp RuinsOfAlphAerodactylChamber_SecondMapHeader / $100
jr nz, .nope
ld a, l
cp RuinsofAlphAerodactylChamber_SecondMapHeader % $100
cp RuinsOfAlphAerodactylChamber_SecondMapHeader % $100
jr nz, .nope
ld de, EVENT_WALL_OPENED_IN_AERODACTYL_CHAMBER
@@ -89,10 +89,10 @@ SpecialKabutoChamber: ; 8ae4e
call GetSecondaryMapHeaderPointer
ld a, h
cp RuinsofAlphKabutoChamber_SecondMapHeader / $100
cp RuinsOfAlphKabutoChamber_SecondMapHeader / $100
jr nz, .done
ld a, l
cp RuinsofAlphKabutoChamber_SecondMapHeader % $100
cp RuinsOfAlphKabutoChamber_SecondMapHeader % $100
jr nz, .done
ld de, EVENT_WALL_OPENED_IN_KABUTO_CHAMBER