diff options
| author | Evan <eroelke@gmail.com> | 2019-12-03 10:54:47 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-03 10:54:47 -0700 |
| commit | aacb202f812d0b7a54ba40eaafe48e7e21451f8c (patch) | |
| tree | c7199f1c8ad97af33c431bae1c5d1984aa23ca3a /asm | |
| parent | f2eb137154f1afe98ed86f883662a01ba318efa6 (diff) | |
resolve compiler errors
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/smokescreen.s | 6 | ||||
| -rw-r--r-- | asm/water.s | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/asm/smokescreen.s b/asm/smokescreen.s index 2a350c911..e0d137767 100644 --- a/asm/smokescreen.s +++ b/asm/smokescreen.s @@ -5,8 +5,8 @@ .text - thumb_func_start sub_804A76C -sub_804A76C: @ 804A76C + thumb_func_start SmokescreenImpact +SmokescreenImpact: @ 804A76C push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -156,7 +156,7 @@ _0804A8B0: .4byte sub_804A8C0 _0804A8B4: .4byte gSprites _0804A8B8: .4byte gUnknown_82509F4 _0804A8BC: .4byte 0xfff00000 - thumb_func_end sub_804A76C + thumb_func_end SmokescreenImpact thumb_func_start sub_804A8C0 sub_804A8C0: @ 804A8C0 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 |