diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
| commit | d8bb1d15e7941d9689393f1215c82788a793af50 (patch) | |
| tree | 7006f3de7d3cf5a0fce6af66bd182d3d3f985854 /asm/field_effect.s | |
| parent | 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 (diff) | |
| parent | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (diff) | |
Merge branch 'master' into mac_build_and_libc
Diffstat (limited to 'asm/field_effect.s')
| -rw-r--r-- | asm/field_effect.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_effect.s b/asm/field_effect.s index b6b4803d8..770f1932c 100644 --- a/asm/field_effect.s +++ b/asm/field_effect.s @@ -498,8 +498,8 @@ _080B5E68: bx r1 thumb_func_end FieldEffectActiveListContains - thumb_func_start sub_80B5E6C -sub_80B5E6C: @ 80B5E6C + thumb_func_start CreateTrainerSprite +CreateTrainerSprite: @ 80B5E6C push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -566,7 +566,7 @@ sub_80B5E6C: @ 80B5E6C pop {r1} bx r1 .pool - thumb_func_end sub_80B5E6C + thumb_func_end CreateTrainerSprite thumb_func_start sub_80B5F0C sub_80B5F0C: @ 80B5F0C |