diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-16 14:36:48 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-16 14:36:48 -0500 |
| commit | 9e77982bc8658c09df187b4598f8cbabb427a271 (patch) | |
| tree | d88ff7a45f7b8a80a02f099052da9b4eb2e14d21 /scripts/oakslab.asm | |
| parent | b1cb3788938fa981e65619f022a41f1c1d91ae3b (diff) | |
| parent | bd7d9815936decc5b636f4235c0ee745812dcb48 (diff) | |
Merge pull request #101 from YamaArashi/master
Misc changes
Diffstat (limited to 'scripts/oakslab.asm')
| -rwxr-xr-x | scripts/oakslab.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 1c255103..73ad345d 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -333,14 +333,14 @@ OaksLabScript10: ; 1cd6d (7:4d6d) ld [$ff8c], a call DisplayTextID ld a, $1 - ld [$ff9b], a + ld [hNPCPlayerRelativePosPerspective], a ld a, $1 swap a - ld [$ff95], a + ld [hNPCSpriteOffset], a predef CalcPositionOfPlayerRelativeToNPC - ld a, [$ff95] + ld a, [hNPCPlayerYDistance] dec a - ld [$ff95], a + ld [hNPCPlayerYDistance], a predef FindPathToPlayer ld de, wNPCMovementDirections2 ld a, $1 @@ -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 |