diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 15:33:42 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-09 15:33:42 -0400 |
| commit | 2145af4a3ef133e4084015792b7d541f3e653edc (patch) | |
| tree | cd8d917a74a14a6c4a8deaa88fff9adf10664896 /asm/battle_7.s | |
| parent | 96f4b6d118179daa948201871385ba7750830c59 (diff) | |
| parent | 08a5efbd8144d2cb1f4b8da62ba484ffcc9a1f93 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into use_build
Diffstat (limited to 'asm/battle_7.s')
| -rw-r--r-- | asm/battle_7.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_7.s b/asm/battle_7.s index 7f82e790a..7aea39cff 100644 --- a/asm/battle_7.s +++ b/asm/battle_7.s @@ -2541,7 +2541,7 @@ _0805E662: ldr r1, =gSprites adds r1, 0x8 adds r0, r1 - ldr r1, =gUnknown_08309AAC + ldr r1, =gMonAnimationsSpriteAnimsPtrTable mov r3, r8 lsls r2, r3, 2 adds r1, r2 @@ -3365,7 +3365,7 @@ _0805EDE4: adds r4, r1, 0 cmp r0, 0 beq _0805EE06 - ldr r0, =gUnknown_08305DCC + ldr r0, =gEnemyMonElevation ldrh r1, [r3, 0x2] adds r1, r0 ldrb r0, [r1] @@ -3441,7 +3441,7 @@ sub_805EE54: @ 805EE54 beq _0805EE7E adds r5, r0, 0 _0805EE7E: - ldr r0, =gUnknown_08305DCC + ldr r0, =gEnemyMonElevation adds r0, r5, r0 ldrb r0, [r0] cmp r0, 0 |