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 /data/field_effect_scripts.s | |
| parent | 56e55d217aa91f89938a384b6e74f2fd0522703d (diff) | |
| parent | 50f9615dc9021bc811869a27b5fa400aac25aaf0 (diff) | |
Merge remote-tracking branch 'Egg/decompile_battle_transition'
Diffstat (limited to 'data/field_effect_scripts.s')
| -rw-r--r-- | data/field_effect_scripts.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 9457094f9..1a877daa9 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -256,7 +256,7 @@ gFieldEffectScript_Unknown44:: @ 82DBC45 gFieldEffectScript_Unknown45:: @ 82DBC4B field_eff_loadpal gFieldEffectObjectPaletteInfo10 - field_eff_callnative sub_81470D0 + field_eff_callnative FldEff_Pokeball field_eff_end gFieldEffectScript_HeartIcon:: @ 82DBC56 |