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 /data/field_effect_scripts.s | |
| parent | a78b0636f50c012c3618d55a9b83f834319de6e0 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor
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 |