diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
| commit | 096afdcdaca0714612f3670a3c4a670f312c1c3f (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /home.asm | |
| parent | 98128cd4d8457948e7136a16e08bacff0bc3529d (diff) | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 23 |
1 files changed, 8 insertions, 15 deletions
@@ -1036,20 +1036,13 @@ IsHM:: ; 34df ; 34e7 IsHMMove:: ; 34e7 - ld hl, .HMMoves + ld hl, HMMoves ld de, 1 jp IsInArray -.HMMoves: - db CUT - db FLY - db SURF - db STRENGTH - db FLASH - db WATERFALL - db WHIRLPOOL - db -1 -; 34f8 + +INCLUDE "data/hm_moves.asm" + GetMoveName:: ; 34f8 push hl @@ -1711,11 +1704,11 @@ GetBaseData:: ; 3856 ; Get BaseData dec a - ld bc, BaseData1 - BaseData0 + ld bc, BASE_DATA_SIZE ld hl, BaseData call AddNTimes ld de, CurBaseData - ld bc, BaseData1 - BaseData0 + ld bc, BASE_DATA_SIZE call CopyBytes jr .end @@ -1888,8 +1881,8 @@ Function392d:: ; 392d dec a ld b, 0 add hl, bc - ld hl, BaseData + 0 - ld bc, BaseData1 - BaseData0 + ld hl, BaseData + BASE_DEX_NO + ld bc, BASE_DATA_SIZE call AddNTimes ld a, BANK(BaseData) call GetFarHalfword |