diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-07 14:11:04 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-07 14:11:04 +0200 |
| commit | 98922986456010f6c81ff4450aa2914a33ad50dc (patch) | |
| tree | 9de563091b3b98934f0072ec7bbc6505a7231d9b /data/field_effect_scripts.s | |
| parent | e6d67c7c2299a0c6fa7ec79fa1427c4a1277a6f7 (diff) | |
| parent | 6313f360d5006527549b142253e22374624129e9 (diff) | |
Merge branch 'master' into final_battle_files_touches
Diffstat (limited to 'data/field_effect_scripts.s')
| -rw-r--r-- | data/field_effect_scripts.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 581b72e43..c0c74496f 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -78,11 +78,11 @@ gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 field_eff_end gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6 - field_eff_callnative sub_80D3A6C + field_eff_callnative FldEff_UseCutOnGrass field_eff_end gFieldEffectScript_UseCutOnTree:: @ 82DBAEC - field_eff_callnative sub_80D3ABC + field_eff_callnative FldEff_UseCutOnTree field_eff_end gFieldEffectScript_Shadow:: @ 82DBAF2 @@ -308,7 +308,7 @@ gFieldEffectScript_Unknown57:: @ 82DBCB8 field_eff_end gFieldEffectScript_Unknown58:: @ 82DBCC2 - field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, sub_80D3B00 + field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo6, FldEff_CutGrass field_eff_end gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC |