diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-03-07 00:01:23 -0600 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-03-07 00:01:23 -0600 |
| commit | 69b20fa83e6d1f36f57e876b30c51d14277f78ee (patch) | |
| tree | ea60be2758e91255ba30865727f012d22fea82e6 /battle/core.asm | |
| parent | c1f18c79b8bd52d27d4ec2fb056ad9eb3e0012d0 (diff) | |
| parent | 1fe2560a368d4a18de7cf95c536b05dc729c4b23 (diff) | |
Merge pull request #239 from yenatch/incbins
Growth rates and misc incbin labels.
Diffstat (limited to 'battle/core.asm')
| -rw-r--r-- | battle/core.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/battle/core.asm b/battle/core.asm index 98e703472..2477f3f9f 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -3579,7 +3579,7 @@ Function3d6ca: ; 3d6ca ld [CurPartySpecies], a call LoadEnemyMon ld a, [CurPartySpecies] - cp $c9 + cp UNOWN jr nz, .asm_3d708 ld a, [$def4] and a @@ -7168,17 +7168,17 @@ Function3eda6: ; 3eda6 Function3edad: ; 3edad - ld de, $4ac0 + ld de, GFX_f8ac0 ld hl, $96c0 - ld bc, $3e04 + lb bc, BANK(GFX_f8ac0), 4 call Get1bpp - ld de, $4ae0 + ld de, GFX_f8ae0 ld hl, $9730 - ld bc, $3e06 + lb bc, BANK(GFX_f8ae0), 6 call Get1bpp - ld de, $4b10 + ld de, GFX_f8b10 ld hl, $9550 - ld bc, $3e08 + lb bc, BANK(GFX_f8b10), 8 jp Get2bpp ; 3edd1 @@ -7827,7 +7827,7 @@ Function3f136: ; 3f136 .asm_3f1b7 ld a, e - cp $64 + cp MAX_LEVEL jr nc, .asm_3f1ff cp d jr z, .asm_3f1ff |