diff options
| author | ultima-soul <akshayjhanji@hotmail.com> | 2019-12-04 11:44:52 -0800 |
|---|---|---|
| committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-12-04 11:44:52 -0800 |
| commit | 58cf3313403a056104b561d40051216eb46fa7bc (patch) | |
| tree | 46651b81c533950407d61ea147b6bb6c9af6af85 /asm/battle_interface.s | |
| parent | b116608e12940141e7c1167d0a2868abc72829fc (diff) | |
| parent | 67f48e5f28b1773d3570630540a082e99f7cab4e (diff) | |
Merge branch 'master' into data_dump
Diffstat (limited to 'asm/battle_interface.s')
| -rw-r--r-- | asm/battle_interface.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 7a0e37966..753b1696b 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -709,11 +709,11 @@ _080480A4: .4byte sub_8048128 GetHealthboxElementGfxPtr: @ 80480A8 lsls r0, 24 lsrs r0, 19 - ldr r1, _080480B4 @ =gUnknown_8D11BC4 + ldr r1, _080480B4 @ =gHealthboxElementsGfxTable adds r0, r1 bx lr .align 2, 0 -_080480B4: .4byte gUnknown_8D11BC4 +_080480B4: .4byte gHealthboxElementsGfxTable thumb_func_end GetHealthboxElementGfxPtr thumb_func_start sub_80480B8 |