diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/events/move_tutor.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/events/move_tutor.asm')
| -rw-r--r-- | engine/events/move_tutor.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/events/move_tutor.asm b/engine/events/move_tutor.asm index be5f37564..df599d3ae 100644 --- a/engine/events/move_tutor.asm +++ b/engine/events/move_tutor.asm @@ -23,18 +23,18 @@ Special_MoveTutor: ; 4925b call CheckCanLearnMoveTutorMove jr nc, .loop xor a ; FALSE - ld [ScriptVar], a + ld [wScriptVar], a jr .quit .cancel ld a, -1 - ld [ScriptVar], a + ld [wScriptVar], a .quit call CloseSubmenu ret .GetMoveTutorMove: ; 492a5 - ld a, [ScriptVar] + ld a, [wScriptVar] cp MOVETUTOR_FLAMETHROWER jr z, .flamethrower cp MOVETUTOR_THUNDERBOLT @@ -58,8 +58,8 @@ CheckCanLearnMoveTutorMove: ; 492b9 predef CanLearnTMHMMove push bc - ld a, [CurPartyMon] - ld hl, PartyMonNicknames + ld a, [wCurPartyMon] + ld hl, wPartyMonNicknames call GetNick pop bc |