diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-01-12 18:45:02 -0600 |
| commit | 5914540ba780d7936fd6624d6fde2d67a9f7a773 (patch) | |
| tree | a1ce27018f39d98f49d89468df426d0291e18560 /scripts/daycarem.asm | |
| parent | ccf4fe54a8e444aaf966fac7b38bc9452c494222 (diff) | |
| parent | 8a5a7d8e68538b727e0c166488265f395603366e (diff) | |
Merge branch 'master' of https://github.com/pret/pokered into rgbgfxrgbgfx
Diffstat (limited to 'scripts/daycarem.asm')
| -rwxr-xr-x | scripts/daycarem.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/daycarem.asm b/scripts/daycarem.asm index 3eabb0bc..4a46e648 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -7,7 +7,7 @@ DayCareMTextPointers: ; 56252 (15:6252) DayCareMText1: ; 56254 (15:6254) TX_ASM call SaveScreenTilesToBuffer2 - ld a, [W_DAYCARE_IN_USE] + ld a, [wDayCareInUse] and a jp nz, .daycareInUse ld hl, DayCareIntroText @@ -46,7 +46,7 @@ DayCareMText1: ; 56254 (15:6254) ld hl, DayCareWillLookAfterMonText call PrintText ld a, 1 - ld [W_DAYCARE_IN_USE], a + ld [wDayCareInUse], a ld a, PARTY_TO_DAYCARE ld [wMoveMonType], a call MoveMon @@ -60,7 +60,7 @@ DayCareMText1: ; 56254 (15:6254) .daycareInUse xor a - ld hl, W_DAYCAREMONNAME + ld hl, wDayCareMonName call GetPartyMonName ld a, DAYCARE_DATA ld [wMonDataLocation], a @@ -150,7 +150,7 @@ DayCareMText1: ; 56254 (15:6254) .enoughMoney xor a - ld [W_DAYCARE_IN_USE], a + ld [wDayCareInUse], a ld hl, wDayCareNumLevelsGrown ld [hli], a inc hl |