diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-12 21:19:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-12 21:19:22 -0400 |
| commit | 094b29edb50be48ee65dab0e8866ac65bba4e225 (patch) | |
| tree | b3bca0cb89455a779eb8eb39bba3466e1c7e51a1 /asm | |
| parent | 807e03c25d6acd9e5c2bf5337a078b2dfb90f4d9 (diff) | |
| parent | 7c08a10359f404b30ee460460e780f1f66ad5d1f (diff) | |
Merge pull request #117 from jiangzhengwenjz/battle
#107 review commit
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_2.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index 775cb1033..bb696b4ab 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -4151,7 +4151,7 @@ _08011F46: .align 2, 0 _08011F4C: .4byte gMonFrontPicCoords _08011F50: - ldr r0, _08011F68 @ =0x00000181 + ldr r0, _08011F68 @ =0x00000181 @ SPECIES_CASTFORM cmp r4, r0 bne _08011F74 ldr r0, _08011F6C @ =gCastformFrontSpriteCoords |