summaryrefslogtreecommitdiff
path: root/data/field_effect_scripts.s
diff options
context:
space:
mode:
Diffstat (limited to 'data/field_effect_scripts.s')
-rw-r--r--data/field_effect_scripts.s42
1 files changed, 21 insertions, 21 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 1a877daa9..c0c74496f 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -38,7 +38,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_Unknown30
.4byte gFieldEffectScript_UseFly
.4byte gFieldEffectScript_FlyIn
- .4byte gFieldEffectScript_ExclamationMarkIcon2
+ .4byte gFieldEffectScript_QuestionMarkIcon
.4byte gFieldEffectScript_FeetInFlowingWater
.4byte gFieldEffectScript_BikeTireTracks
.4byte gFieldEffectScript_SandDisguisePlaceholder
@@ -74,15 +74,15 @@ gFieldEffectScriptPointers:: @ 82DB9D4
.4byte gFieldEffectScript_Unknown66
gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
- field_eff_callnative FldEff_ExclamationMarkIcon1
+ field_eff_callnative FldEff_ExclamationMarkIcon
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
@@ -98,7 +98,7 @@ gFieldEffectScript_Ripple:: @ 82DBB02
field_eff_end
gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
- field_eff_callnative sub_80B849C
+ field_eff_callnative FldEff_FieldMoveShowMon
field_eff_end
gFieldEffectScript_Ash:: @ 82DBB12
@@ -110,7 +110,7 @@ gFieldEffectScript_SurfBlob:: @ 82DBB1C
field_eff_end
gFieldEffectScript_UseSurf:: @ 82DBB22
- field_eff_callnative sub_80B8D44
+ field_eff_callnative FldEff_UseSurf
field_eff_end
gFieldEffectScript_GroundImpactDust:: @ 82DBB28
@@ -175,7 +175,7 @@ gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
gFieldEffectScript_Unknown25:: @ 82DBBB6
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B61A0
+ field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_PokecenterHeal
field_eff_end
gFieldEffectScript_Unknown26:: @ 82DBBC5
@@ -195,19 +195,19 @@ gFieldEffectScript_MountainDisguise:: @ 82DBBD7
field_eff_end
gFieldEffectScript_Unknown30:: @ 82DBBDD
- field_eff_callnative sub_80B90CC
+ field_eff_callnative FldEff_NPCFlyOut
field_eff_end
gFieldEffectScript_UseFly:: @ 82DBBE3
- field_eff_callnative sub_80B91A4
+ field_eff_callnative FldEff_UseFly
field_eff_end
gFieldEffectScript_FlyIn:: @ 82DBBE9
- field_eff_callnative sub_80B97C0
+ field_eff_callnative FldEff_FlyIn
field_eff_end
-gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF
- field_eff_callnative FldEff_ExclamationMarkIcon2
+gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
+ field_eff_callnative FldEff_QuestionMarkIcon
field_eff_end
gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
@@ -223,7 +223,7 @@ gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09
field_eff_end
gFieldEffectScript_UseRockSmash:: @ 82DBC0F
- field_eff_callnative oei_rocksmash
+ field_eff_callnative FldEff_UseRockSmash
field_eff_end
gFieldEffectScript_Unknown40:: @ 82DBC15
@@ -231,7 +231,7 @@ gFieldEffectScript_Unknown40:: @ 82DBC15
field_eff_end
gFieldEffectScript_Unknown38:: @ 82DBC1B
- field_eff_callnative sub_8135780
+ field_eff_callnative FldEff_UseDig
field_eff_end
gFieldEffectScript_Unknown39:: @ 82DBC21
@@ -247,11 +247,11 @@ gFieldEffectScript_HotSpringsWater:: @ 82DBC35
field_eff_end
gFieldEffectScript_Unknown43:: @ 82DBC3F
- field_eff_callnative oei_waterfall
+ field_eff_callnative FldEff_UseWaterfall
field_eff_end
gFieldEffectScript_Unknown44:: @ 82DBC45
- field_eff_callnative sub_80B74D0
+ field_eff_callnative FldEff_UseDive
field_eff_end
gFieldEffectScript_Unknown45:: @ 82DBC4B
@@ -272,11 +272,11 @@ gFieldEffectScript_Unknown48:: @ 82DBC66
field_eff_end
gFieldEffectScript_JumpOutOfAsh:: @ 82DBC6C
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B7C48
+ field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_PopOutOfAsh
field_eff_end
gFieldEffectScript_Unknown50:: @ 82DBC76
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, sub_80B79F4
+ field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo2, FldEff_LavaridgeGymWarp
field_eff_end
gFieldEffectScript_Unknown51:: @ 82DBC80
@@ -308,11 +308,11 @@ 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
- field_eff_callnative sub_80B84F8
+ field_eff_callnative FldEff_FieldMoveShowMonInit
field_eff_end
gFieldEffectScript_Unknown60:: @ 82DBCD2
@@ -325,7 +325,7 @@ gFieldEffectScript_Unknown61:: @ 82DBCD8
gFieldEffectScript_Unknown62:: @ 82DBCDE
field_eff_loadfadedpal gFieldEffectObjectPaletteInfo4
- field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, sub_80B62F4
+ field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo5, FldEff_HallOfFameRecord
field_eff_end
gFieldEffectScript_Unknown63:: @ 82DBCED