diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-18 12:53:45 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-18 12:53:45 -0600 |
commit | 9a65fbd81e03db0a5b473fe95fab2cdab007704c (patch) | |
tree | 3b45f06c30554fc43d3aa4348ab2183bffe3b6ab /asm/field_effect.s | |
parent | b806ee8bedab880066a630a3b68ba9d0c5bdd5c9 (diff) | |
parent | 24e0edee9f428a68715c47051ebba3cda5a3e5a7 (diff) |
Merge remote-tracking branch 'pret/master'
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 |