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/smokescreen.s | |
| parent | 7871a505b39e5452f0a39f96ce2deea810099906 (diff) | |
| parent | f21b113bc6caee136d696aadfe8dc13d6e8f3622 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into pokedex_screen
Diffstat (limited to 'asm/smokescreen.s')
| -rw-r--r-- | asm/smokescreen.s | 6 |
1 files changed, 3 insertions, 3 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 |