diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 22:24:25 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 22:24:25 -0500 |
| commit | 399d646e3fb24c8b4532267a4ab7aee4d2aaee92 (patch) | |
| tree | 4805fda152bee21eb8bfb96f70f33e5f958c06b2 /data/field_effect_scripts.s | |
| parent | 9e8a841bfa0271a603b5e4895be3067cfa26f8ab (diff) | |
| parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) | |
Merge branch 'master' into main-menu-state-machine
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 93fe33f8a..291d6abec 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -65,7 +65,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_Unknown57 .4byte gFieldEffectScript_Unknown58 .4byte gFieldEffectScript_FieldMoveShowMonInit - .4byte gFieldEffectScript_Unknown60 + .4byte gFieldEffectScript_UsePuzzleEffect .4byte gFieldEffectScript_Unknown61 .4byte gFieldEffectScript_Unknown62 .4byte gFieldEffectScript_Unknown63 @@ -315,7 +315,7 @@ gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC field_eff_callnative FldEff_FieldMoveShowMonInit field_eff_end -gFieldEffectScript_Unknown60:: @ 82DBCD2 +gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2 field_eff_callnative FldEff_UsePuzzleEffect field_eff_end |