diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-01-06 16:19:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 16:19:18 -0500 |
| commit | e70a084aa964a0df94c609ebfa9717089dd67639 (patch) | |
| tree | 996dc1a413c8818d6efb746ecf15c3fae28b983e /asm/field_map_obj.s | |
| parent | 103789770b635610ee1c04ed923fdcc7298f878e (diff) | |
| parent | 1581631e6286e0ec8178630433e8c15cd7076ead (diff) | |
Merge pull request #38 from PikalaxALT/scrcmd
scrcmd
Diffstat (limited to 'asm/field_map_obj.s')
| -rw-r--r-- | asm/field_map_obj.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_map_obj.s b/asm/field_map_obj.s index 308421098..14951c20c 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -1614,8 +1614,8 @@ _0805E9F0: .4byte 0x0000ffff _0805E9F4: .4byte gSprites thumb_func_end AddPseudoFieldObject - thumb_func_start sub_805E9F8 -sub_805E9F8: @ 805E9F8 + thumb_func_start sprite_new +sprite_new: @ 805E9F8 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -1772,7 +1772,7 @@ _0805EB24: _0805EB38: .4byte sub_8068FA8 _0805EB3C: .4byte 0x0000ffff _0805EB40: .4byte gSprites - thumb_func_end sub_805E9F8 + thumb_func_end sprite_new thumb_func_start sub_805EB44 sub_805EB44: @ 805EB44 |