diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-09-30 03:00:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 03:00:10 -0500 |
| commit | 741c99cded03ceb2d924b52b5c44d68bc5901b17 (patch) | |
| tree | 722c09a5712e65b460268a300b0799eeef6374fc /asm/battle_interface.s | |
| parent | f09a6a653c2691865314a309266d4d6d82152fdc (diff) | |
| parent | 4dad58648fe65b7df90da45972518222853b2e98 (diff) | |
Merge pull request #45 from DizzyEggg/decomp_battle4
Decompile Battle 4
Diffstat (limited to 'asm/battle_interface.s')
| -rwxr-xr-x | asm/battle_interface.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 489366fe8..31ad9a330 100755 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -5476,8 +5476,8 @@ _08075028: bx r1 thumb_func_end sub_8074FE8 - thumb_func_start sub_8075034 -sub_8075034: @ 8075034 + thumb_func_start GetScaledHPFraction +GetScaledHPFraction: @ 8075034 push {r4,lr} lsls r2, 24 lsrs r2, 24 @@ -5499,7 +5499,7 @@ _08075058: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8075034 + thumb_func_end GetScaledHPFraction thumb_func_start sub_8075060 sub_8075060: @ 8075060 @@ -5514,7 +5514,7 @@ sub_8075060: @ 8075060 b _0807508E _08075072: movs r2, 0x30 - bl sub_8075034 + bl GetScaledHPFraction lsls r0, 24 lsrs r1, r0, 24 movs r0, 0x3 |