diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /asm/fldeff_cut.s | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'asm/fldeff_cut.s')
| -rw-r--r-- | asm/fldeff_cut.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s index ec892e0bb..d56ccd500 100644 --- a/asm/fldeff_cut.s +++ b/asm/fldeff_cut.s @@ -24,8 +24,8 @@ sub_8097874: @ 8097874 bx r1 thumb_func_end sub_8097874 - thumb_func_start sub_8097898 -sub_8097898: @ 8097898 + thumb_func_start SetUpFieldMove_Cut +SetUpFieldMove_Cut: @ 8097898 push {r4-r7,lr} mov r7, r8 push {r7} @@ -138,7 +138,7 @@ _08097970: .align 2, 0 _0809797C: .4byte gPlayerFacingPosition _08097980: .4byte 0x0000ffff - thumb_func_end sub_8097898 + thumb_func_end SetUpFieldMove_Cut thumb_func_start sub_8097984 sub_8097984: @ 8097984 |