diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/items/tmhm2.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/items/tmhm2.asm')
| -rw-r--r-- | engine/items/tmhm2.asm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/engine/items/tmhm2.asm b/engine/items/tmhm2.asm index 9db3dc291..10206d36b 100644 --- a/engine/items/tmhm2.asm +++ b/engine/items/tmhm2.asm @@ -1,4 +1,4 @@ -CanLearnTMHMMove: ; 11639 +CanLearnTMHMMove: ld a, [wCurPartySpecies] ld [wCurSpecies], a call GetBaseData @@ -31,9 +31,8 @@ CanLearnTMHMMove: ; 11639 pop hl ld c, 0 ret -; 1166a -GetTMHMMove: ; 1166a +GetTMHMMove: ld a, [wd265] dec a ld hl, TMHMMoves @@ -43,7 +42,5 @@ GetTMHMMove: ; 1166a ld a, [hl] ld [wd265], a ret -; 1167a - INCLUDE "data/moves/tmhm_moves.asm" |