diff options
author | Evan <eroelke@gmail.com> | 2019-12-03 10:54:47 -0700 |
---|---|---|
committer | Evan <eroelke@gmail.com> | 2019-12-04 14:54:52 -0700 |
commit | 2453b88b9db93cf195c79f001c9c8ba22013fd6a (patch) | |
tree | c7199f1c8ad97af33c431bae1c5d1984aa23ca3a /asm/water.s | |
parent | f1bd7a41cc1e2bcd730a0c2c6c5c4c618044f631 (diff) |
resolve compiler errors
Diffstat (limited to 'asm/water.s')
-rw-r--r-- | asm/water.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/water.s b/asm/water.s index a2918ec33..89fcfa3c8 100644 --- a/asm/water.s +++ b/asm/water.s @@ -3493,8 +3493,8 @@ _080AC6D0: bx r0 thumb_func_end sub_80AC698 - thumb_func_start sub_80AC6D8 -sub_80AC6D8: @ 80AC6D8 + thumb_func_start AnimWaterPulseRing +AnimWaterPulseRing: @ 80AC6D8 push {r4,r5,lr} adds r4, r0, 0 movs r1, 0x1 @@ -3526,7 +3526,7 @@ sub_80AC6D8: @ 80AC6D8 _080AC714: .4byte gBattleAnimTarget _080AC718: .4byte gBattleAnimArgs _080AC71C: .4byte sub_80AC720 - thumb_func_end sub_80AC6D8 + thumb_func_end AnimWaterPulseRing thumb_func_start sub_80AC720 sub_80AC720: @ 80AC720 |