diff options
| author | yenatch <yenatch@gmail.com> | 2016-06-20 01:06:46 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-06-20 01:06:46 -0400 |
| commit | c21e746b2dde49532b89d119762f79982b719b7f (patch) | |
| tree | 6273318249aa372df3b2c76fd266b6b3e081a507 /data/field_effect_scripts.s | |
| parent | 13e93ecbb4036a1a19778a235ddb5992de1048ae (diff) | |
| parent | 422215e184c026037080032056b0ac56ba9429f5 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
data/data1.s
data/maps/text/SootopolisCity.s
Diffstat (limited to 'data/field_effect_scripts.s')
| -rw-r--r-- | data/field_effect_scripts.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index d24728e47..11536c4a8 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -52,7 +52,7 @@ gFieldEffectScriptPointers: @ 81D9B34 .4byte gFieldEffectScript_Unknown48 .4byte gFieldEffectScript_PopOutOfAsh .4byte gFieldEffectScript_Unknown50 - .4byte gFieldEffectScript_Unknown51 + .4byte gFieldEffectScript_SweetScent .4byte gFieldEffectScript_Unknown52 .4byte gFieldEffectScript_Bubbles .4byte gFieldEffectScript_Unknown54 @@ -272,7 +272,7 @@ gFieldEffectScript_Unknown50: @ 81D9DCA field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80875D4 field_eff_end -gFieldEffectScript_Unknown51: @ 81D9DD4 +gFieldEffectScript_SweetScent: @ 81D9DD4 field_eff_callnative sub_812BFF0 field_eff_end |