diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-09 08:59:59 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-12-09 08:59:59 -0500 |
| commit | 9d70b8a4d9fc69064b5a0bde6670b4aaca25cf5e (patch) | |
| tree | 4f0f3dc6ac18497b1452a02ab55490fce1f89e74 /asm/water.s | |
| parent | 7871a505b39e5452f0a39f96ce2deea810099906 (diff) | |
| parent | f21b113bc6caee136d696aadfe8dc13d6e8f3622 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen
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 |