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 /home/hm_moves.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'home/hm_moves.asm')
| -rw-r--r-- | home/hm_moves.asm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/home/hm_moves.asm b/home/hm_moves.asm index c4233d094..30a9786a9 100644 --- a/home/hm_moves.asm +++ b/home/hm_moves.asm @@ -1,6 +1,6 @@ ; HM moves can't be forgotten -IsHM:: ; 34df +IsHM:: cp HM01 jr c, .NotHM scf @@ -8,14 +8,13 @@ IsHM:: ; 34df .NotHM: and a ret -; 34e7 -IsHMMove:: ; 34e7 +IsHMMove:: ld hl, .HMMoves ld de, 1 jp IsInArray -.HMMoves: ; 34f0 +.HMMoves: db CUT db FLY db SURF @@ -24,4 +23,3 @@ IsHMMove:: ; 34e7 db WATERFALL db WHIRLPOOL db -1 ; end -; 34f8 |