diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 20:12:40 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-11 20:12:40 -0500 |
commit | 590c4b500b9dd37d372a935865aa4df0ab0bf43c (patch) | |
tree | 5572d76c91e106e74e1401076f130fb902f6b67b /data/field_effect_scripts.s | |
parent | bc063b45d05716d1eab283f6d474bcdc601cafde (diff) | |
parent | 14a76793e596d612efd273169c4172922c270f13 (diff) |
Merge branch 'master' into record_mixing
Diffstat (limited to 'data/field_effect_scripts.s')
-rw-r--r-- | data/field_effect_scripts.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index ceb327084..1a877daa9 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_Unknown66 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 - field_eff_callnative oei_exclamation_mark + field_eff_callnative FldEff_ExclamationMarkIcon1 field_eff_end gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6 @@ -207,7 +207,7 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9 field_eff_end gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF - field_eff_callnative sub_80B4658 + field_eff_callnative FldEff_ExclamationMarkIcon2 field_eff_end gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5 @@ -256,11 +256,11 @@ 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 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon field_eff_end gFieldEffectScript_Unknown47:: @ 82DBC60 |