diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-11 09:25:26 -0400 |
| commit | 4488bbe9e69a8551cb5bb34e70b8ffb9d8e554db (patch) | |
| tree | d9c5a70fd1c4f42dc29f43becd142cc89456f19d /asm/field_effect_helpers.s | |
| parent | c15b50ac686632130512de37d01037bff6e10cd2 (diff) | |
| parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) | |
Merge branch 'master' into contest
Diffstat (limited to 'asm/field_effect_helpers.s')
| -rw-r--r-- | asm/field_effect_helpers.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s index 754a8f7ff..77f8213b3 100644 --- a/asm/field_effect_helpers.s +++ b/asm/field_effect_helpers.s @@ -204,7 +204,7 @@ _0815405A: bl pal_patch_for_npc _0815406A: adds r0, r4, 0 - bl sub_80ABE18 + bl UpdateSpritePaletteWithWeather _08154070: pop {r4} pop {r0} @@ -227,7 +227,7 @@ npc_pal_op_A: @ 8154078 adds r1, r4, 0 bl pal_patch_for_npc adds r0, r4, 0 - bl sub_80ABE18 + bl UpdateSpritePaletteWithWeather _0815409C: pop {r4} pop {r0} |