diff options
| author | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
|---|---|---|
| committer | itskobold <itskobold@users.noreply.github.com> | 2017-11-20 18:27:23 +0000 |
| commit | caf952e02eb29f56a0c8b8571a6c5c4f8d0d2ef2 (patch) | |
| tree | f0592fc84aeb433b0fb59d9ceabd025b5589f83b /asm/rom6.s | |
| parent | 625be4bf04c9f14c4e1ee2e1ab74e7a5a7964a33 (diff) | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
Diffstat (limited to 'asm/rom6.s')
| -rw-r--r-- | asm/rom6.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/rom6.s b/asm/rom6.s index f07689a86..ebff777ea 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -2779,7 +2779,7 @@ sub_8136C8C: @ 8136C8C adds r2, r6 ldr r1, [r5] adds r1, r2 - bl sub_8136FE4 + bl PokeblockGetGain adds r4, r0, 0 lsls r4, 16 lsrs r4, 16 @@ -3177,8 +3177,8 @@ _08136FDE: bx r1 thumb_func_end sub_8136F9C - thumb_func_start sub_8136FE4 -sub_8136FE4: @ 8136FE4 + thumb_func_start PokeblockGetGain +PokeblockGetGain: @ 8136FE4 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -3227,7 +3227,7 @@ _0813702A: pop {r1} bx r1 .pool - thumb_func_end sub_8136FE4 + thumb_func_end PokeblockGetGain thumb_func_start sub_8137044 sub_8137044: @ 8137044 @@ -3261,7 +3261,7 @@ _08137074: ldr r0, =gUnknown_085B2720 adds r1, r0 adds r0, r5, 0 - bl sub_8136FE4 + bl PokeblockGetGain lsls r0, 16 cmp r0, 0 ble _081370A0 |