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 /battle/core.asm | |
| parent | 98128cd4d8457948e7136a16e08bacff0bc3529d (diff) | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/battle/core.asm b/battle/core.asm index cd745a957..8c4ab73e4 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3484,8 +3484,8 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618 add hl, bc ld a, [hl] dec a - ld hl, BaseData + 7 ; type - ld bc, BaseData1 - BaseData0 + ld hl, BaseData + BASE_TYPES + ld bc, BASE_DATA_SIZE call AddNTimes ld de, EnemyMonType ld bc, 2 @@ -6676,7 +6676,7 @@ CheckSleepingTreeMon: ; 3eb38 ; Get list for the time of day ld hl, .Morn ld a, [TimeOfDay] - cp DAY + cp DAY_F jr c, .Check ld hl, .Day jr z, .Check |