diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-01-16 14:51:00 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-01-16 14:51:00 -0600 |
| commit | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (patch) | |
| tree | 5c5dbd1c57d802d8e338f5847de74898bd5c3ede /asm/field_effect.s | |
| parent | 56e55d217aa91f89938a384b6e74f2fd0522703d (diff) | |
| parent | 50f9615dc9021bc811869a27b5fa400aac25aaf0 (diff) | |
Merge remote-tracking branch 'Egg/decompile_battle_transition'
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 |