diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:56:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:56:50 -0400 |
| commit | 1d4234bd7e295c553485b7d676d42c838e4762c4 (patch) | |
| tree | 67ac4179d9978baf4e989ef55245e4be0d777c04 /asm/normal.s | |
| parent | 7f6d86a8bf2afe349135d502debc2237bafafff5 (diff) | |
| parent | 931bf4ce4b4fd7ea63d00f36adfd2bf720831a80 (diff) | |
Merge branch 'master' into PIE2
Diffstat (limited to 'asm/normal.s')
| -rw-r--r-- | asm/normal.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/normal.s b/asm/normal.s index 165fa150f..75c4dcf6e 100644 --- a/asm/normal.s +++ b/asm/normal.s @@ -1185,7 +1185,7 @@ _080BA1D0: cmp r0, 0 beq _080BA200 ldr r2, _080BA274 @ =gSprites - ldr r0, _080BA278 @ =gUnknown_3004FF0 + ldr r0, _080BA278 @ =gHealthboxSpriteIds add r0, r9 ldrb r1, [r0] lsls r0, r1, 4 @@ -1258,7 +1258,7 @@ _080BA268: .4byte gBattleAnimAttacker _080BA26C: .4byte gBattleAnimTarget _080BA270: .4byte 0x0000ffff _080BA274: .4byte gSprites -_080BA278: .4byte gUnknown_3004FF0 +_080BA278: .4byte gHealthboxSpriteIds thumb_func_end sub_80BA16C thumb_func_start sub_80BA27C @@ -1733,7 +1733,7 @@ sub_80BA5F8: @ 80BA5F8 lsls r0, 24 cmp r0, 0 beq _080BA61C - bl sub_8073788 + bl IsContest lsls r0, 24 cmp r0, 0 bne _080BA61C |