diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-10 20:20:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-10 20:20:24 -0400 |
| commit | 03e47515e153e7c8757bdb28de87f149d5022a82 (patch) | |
| tree | 0ce0660fb0c4d3edc3bc21970357b506ff15dd49 /asm/field_map_obj.s | |
| parent | 19c9e0851a971061b3f9e7b7840cdd59ab538f72 (diff) | |
| parent | 731b5e103a535086ebf99a2c3a032a7b0e30e74f (diff) | |
Merge pull request #62 from jiangzhengwenjz/teachy_tv
teachy_tv
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 77df1274b..1275f7471 100644 --- a/asm/field_map_obj.s +++ b/asm/field_map_obj.s @@ -1550,8 +1550,8 @@ MakeObjectTemplateFromFieldObjectTemplate: @ 805E960 bx r0 thumb_func_end MakeObjectTemplateFromFieldObjectTemplate - thumb_func_start AddPseudoFieldObject -AddPseudoFieldObject: @ 805E978 + thumb_func_start AddPseudoEventObject +AddPseudoEventObject: @ 805E978 push {r4-r6,lr} sub sp, 0x1C ldr r4, [sp, 0x2C] @@ -1612,7 +1612,7 @@ _0805E9E4: .align 2, 0 _0805E9F0: .4byte 0x0000ffff _0805E9F4: .4byte gSprites - thumb_func_end AddPseudoFieldObject + thumb_func_end AddPseudoEventObject thumb_func_start sprite_new sprite_new: @ 805E9F8 |