summaryrefslogtreecommitdiff
path: root/data/field_effect_scripts.s
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-05-30 07:48:45 -0500
committerGitHub <noreply@github.com>2018-05-30 07:48:45 -0500
commitd1965e3c751b77243c11d62eadc994422dc682ae (patch)
tree61ee8faf9f1fc7569efa086f2108b7f886e49127 /data/field_effect_scripts.s
parentb8f90052a58d1781ef40e2a4b7decf4ca4ed62b8 (diff)
parent9680b95bdde1226e12485a84e47c6a7c32932048 (diff)
Merge pull request #618 from huderlem/objMovement
Document event object movement
Diffstat (limited to 'data/field_effect_scripts.s')
-rw-r--r--data/field_effect_scripts.s12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 45f8ce648..20d3770f9 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -6,7 +6,7 @@
.align 2
gFieldEffectScriptPointers:: @ 81D9B34
- .4byte gFieldEffectScript_ExclamationMarkIcon1
+ .4byte gFieldEffectScript_ExclamationMarkIcon
.4byte gFieldEffectScript_UseCutOnGrass
.4byte gFieldEffectScript_UseCutOnTree
.4byte gFieldEffectScript_Shadow
@@ -39,7 +39,7 @@ gFieldEffectScriptPointers:: @ 81D9B34
.4byte gFieldEffectScript_NPCFlyOut
.4byte gFieldEffectScript_UseFly
.4byte gFieldEffectScript_FlyIn
- .4byte gFieldEffectScript_ExclamationMarkIcon2
+ .4byte gFieldEffectScript_QuestionMarkIcon
.4byte gFieldEffectScript_FeetInFlowingWater
.4byte gFieldEffectScript_BikeTireTracks
.4byte gFieldEffectScript_SandDisguise
@@ -71,8 +71,8 @@ gFieldEffectScriptPointers:: @ 81D9B34
.4byte gFieldEffectScript_HallOfFameRecord
.4byte gFieldEffectScript_UseTeleport
-gFieldEffectScript_ExclamationMarkIcon1: @ 81D9C34
- callnative FldEff_ExclamationMarkIcon1
+gFieldEffectScript_ExclamationMarkIcon: @ 81D9C34
+ callnative FldEff_ExclamationMarkIcon
end
gFieldEffectScript_UseCutOnGrass: @ 81D9C3A
@@ -204,8 +204,8 @@ gFieldEffectScript_FlyIn: @ 81D9D3D
callnative FldEff_FlyIn
end
-gFieldEffectScript_ExclamationMarkIcon2: @ 81D9D43
- callnative FldEff_ExclamationMarkIcon2
+gFieldEffectScript_QuestionMarkIcon: @ 81D9D43
+ callnative FldEff_QuestionMarkIcon
end
gFieldEffectScript_FeetInFlowingWater: @ 81D9D49