diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
| commit | 663ecd00145da49fda7d2509d629d737ea633cd8 (patch) | |
| tree | a4cfc7323151501d5603f1cd34e68a73f328434e /asm/field_effect.s | |
| parent | a78b0636f50c012c3618d55a9b83f834319de6e0 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor
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 |