diff options
| author | YamaArashi <shadow962@live.com> | 2015-07-15 20:04:58 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2015-07-15 20:04:58 -0700 |
| commit | bd7d9815936decc5b636f4235c0ee745812dcb48 (patch) | |
| tree | d88ff7a45f7b8a80a02f099052da9b4eb2e14d21 /scripts | |
| parent | ac78dda7d8a4a6cf9af95f601bdac9fc348c65a6 (diff) | |
menu stuff
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/daycarem.asm | 8 | ||||
| -rwxr-xr-x | scripts/oakslab.asm | 6 |
2 files changed, 7 insertions, 7 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 diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index b32647b5..73ad345d 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -898,9 +898,9 @@ OaksLabMonChoiceMenu: ; 1d1b3 (7:51b3) call PrintText ld hl, OaksLabReceivedMonText call PrintText - xor a - ld [wcc49], a - ld a, $5 + xor a ; PLAYER_PARTY_DATA + ld [wMonDataLocation], a + ld a, 5 ld [W_CURENEMYLVL], a ld a, [wcf91] ld [wd11e], a |