diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-16 23:27:57 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-16 23:27:57 -0500 |
| commit | 40ea6a5f757bbbfdb4296e5acf644f6679a03a14 (patch) | |
| tree | 2f7957bfa877ce974ad185684f037ba5b6cdfccd /scripts/daycarem.asm | |
| parent | 4670a1ddae02fd73d8c4826f9d9c9948820636a0 (diff) | |
| parent | 9e77982bc8658c09df187b4598f8cbabb427a271 (diff) | |
Merge branch 'master' of https://github.com/iimarckus/pokered
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 5e80a10f..2196e021 100755 --- a/scripts/daycarem.asm +++ b/scripts/daycarem.asm @@ -35,11 +35,11 @@ DayCareMText1: ; 56254 (15:6254) pop af ld hl, DayCareMText_56437 jp c, DayCareMScript_56409 - callab Func_2171b + callab KnowsHMMove ld hl, DayCareMText_5644a jp c, DayCareMScript_56409 xor a - ld [wcc2b], a + ld [wPartyAndBillsPCSavedMenuItem], a ld a, [wWhichPokemon] ld hl, wPartyMonNicks call GetPartyMonName @@ -62,8 +62,8 @@ DayCareMScript_562e1: ; 562e1 (15:62e1) xor a ld hl, W_DAYCAREMONNAME call GetPartyMonName - ld a, $3 - ld [wcc49], a + ld a, DAYCARE_DATA + ld [wMonDataLocation], a call LoadMonData callab CalcLevelFromExperience ld a, d |