diff options
Diffstat (limited to 'data/field_effect_scripts.s')
| -rw-r--r-- | data/field_effect_scripts.s | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 98685da05..43698653d 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -1,8 +1,8 @@ .include "asm/macros/field_effect_script.inc" .section script_data, "aw", %progbits .align 2 -gUnknown_81D96AC:: @ 81D96AC - .4byte gFldEffScript_ExclamationMarkIcon1 +gFieldEffectScriptPointers:: @ 81D96AC + .4byte gFldEffScript_ExclamationMarkIcon .4byte gFldEffScript_UseCutOnGrass .4byte gFldEffScript_UseCutOnTree .4byte gFldEffScript_Shadow @@ -35,7 +35,7 @@ gUnknown_81D96AC:: @ 81D96AC .4byte gFldEffScript_NpcflyOut .4byte gFldEffScript_UseFly .4byte gFldEffScript_FlyIn - .4byte gFldEffScript_ExclamationMarkIcon2 + .4byte gFldEffScript_QuestionMarkIcon .4byte gFldEffScript_FeetInFlowingWater .4byte gFldEffScript_BikeTireTracks .4byte gFldEffScript_SandDisguise @@ -66,35 +66,35 @@ gUnknown_81D96AC:: @ 81D96AC .4byte gFldEffScript_PcturnOn .4byte gFldEffScript_HallOfFameRecord .4byte gFldEffScript_UseTeleport - .4byte gFldEffScript_Unk40 - .4byte gFldEffScript_Unk41 - .4byte gFldEffScript_Unk42 - .4byte gFldEffScript_Unk43 + .4byte gFldEffScript_SmileyFaceIcon + .4byte gFldEffScript_UseVsSeeker + .4byte gFldEffScript_DoubleExclMarkIcon + .4byte gFldEffScript_MoveDeoxysRock .4byte gFldEffScript_Unk44 .4byte gFldEffScript_Unk45 -gFldEffScript_ExclamationMarkIcon1:: @ 81D97C4 +gFldEffScript_ExclamationMarkIcon:: @ 81D97C4 callnative FldEff_ExclamationMarkIcon1 end gFldEffScript_UseCutOnGrass:: @ 81D97CA - callnative sub_80979A0 + callnative FldEff_UseCutOnGrass end gFldEffScript_UseCutOnTree:: @ 81D97D0 - callnative sub_80979F0 + callnative FldEff_UseCutOnTree end gFldEffScript_Shadow:: @ 81D97D6 - callnative oei_shadow + callnative FldEff_Shadow end gFldEffScript_TallGrass:: @ 81D97DC - loadfadedpal_callnative gUnknown_83A5348, oei_grass_normal + loadfadedpal_callnative gUnknown_83A5348, FldEff_TallGrass end gFldEffScript_Ripple:: @ 81D97E6 - loadfadedpal_callnative gUnknown_83A5348, oei_ripples + loadfadedpal_callnative gUnknown_83A5348, FldEff_Ripple end gFldEffScript_FieldMoveShowMon:: @ 81D97F0 @@ -102,15 +102,15 @@ gFldEffScript_FieldMoveShowMon:: @ 81D97F0 end gFldEffScript_Ash:: @ 81D97F6 - loadfadedpal_callnative gUnknown_83A5348, oei_ash + loadfadedpal_callnative gUnknown_83A5348, FldEff_Ash end gFldEffScript_SurfBlob:: @ 81D9800 - callnative sub_80DC3D0 + callnative FldEff_SurfBlob end gFldEffScript_UseSurf:: @ 81D9806 - callnative sub_8086944 + callnative FldEff_UseSurf end gFldEffScript_Dust:: @ 81D980C @@ -129,7 +129,7 @@ gFldEffScript_SandFootprints:: @ 81D9821 end gFldEffScript_JumpBigSplash:: @ 81D982B - loadfadedpal_callnative gUnknown_83A5340, oei_water_drop_tall + loadfadedpal_callnative gUnknown_83A5340, FldEff_JumpBigSplash end gFldEffScript_Splash:: @ 81D9835 @@ -165,7 +165,7 @@ gFldEffScript_Unknown22:: @ 81D987B end gFldEffScript_BerryTreeGrowthSparkle:: @ 81D9885 - callnative sub_80DC9DC + callnative FldEff_BerryTreeGrowthSparkle end gFldEffScript_DeepSandFootprints:: @ 81D988B @@ -174,7 +174,7 @@ gFldEffScript_DeepSandFootprints:: @ 81D988B gFldEffScript_PokecenterHeal:: @ 81D9895 loadfadedpal gUnknown_83CBE9C - loadfadedpal_callnative gUnknown_83A5340, sub_8083B8C + loadfadedpal_callnative gUnknown_83A5340, FldEff_PokecenterHeal end gFldEffScript_UseSecretPowerTree:: @ 81D98A4 @@ -192,7 +192,7 @@ gFldEffScript_MountainDisguise:: @ 81D98AC end gFldEffScript_NpcflyOut:: @ 81D98B2 - callnative sub_8086D38 + callnative FldEff_NpcFlyOut end gFldEffScript_UseFly:: @ 81D98B8 @@ -203,8 +203,8 @@ gFldEffScript_FlyIn:: @ 81D98BE callnative FldEff_FlyIn end -gFldEffScript_ExclamationMarkIcon2:: @ 81D98C4 - callnative sub_8082624 +gFldEffScript_QuestionMarkIcon:: @ 81D98C4 + callnative FldEff_QuestionMarkIcon end gFldEffScript_FeetInFlowingWater:: @ 81D98CA @@ -224,7 +224,7 @@ gFldEffScript_UseRockSmash:: @ 81D98E4 end gFldEffScript_UseStrength:: @ 81D98EA - callnative sub_80D0860 + callnative FldEff_UseStrength end gFldEffScript_UseDig:: @ 81D98F0 @@ -236,15 +236,15 @@ gFldEffScript_SandPile:: @ 81D98F6 end gFldEffScript_ShortGrass:: @ 81D9900 - loadfadedpal_callnative gUnknown_83A5348, sub_80DB808 + loadfadedpal_callnative gUnknown_83A5348, FldEff_ShortGrass end gFldEffScript_HotSpringsWater:: @ 81D990A - loadfadedpal_callnative gUnknown_83A5348, sub_80DBF50 + loadfadedpal_callnative gUnknown_83A5348, FldEff_HotSpringsWater end gFldEffScript_UseWaterfall:: @ 81D9914 - callnative oei_waterfall + callnative FldEff_UseWaterfall end gFldEffScript_UseDive:: @ 81D991A @@ -257,7 +257,7 @@ gFldEffScript_Pokeball:: @ 81D9920 end gFldEffScript_HeartIcon:: @ 81D992B - callnative sub_80825B4 + callnative FldEff_XIcon end gFldEffScript_Nop47:: @ 81D9931 @@ -299,7 +299,7 @@ gFldEffScript_SecretPowerShrub:: @ 81D9964 end gFldEffScript_CutGrass:: @ 81D9965 - loadfadedpal_callnative gUnknown_83D4144, sub_8097A48 + loadfadedpal_callnative gFldEffPalette_CutGrass, FldEff_CutGrass end gFldEffScript_FieldMoveShowMonInit:: @ 81D996F @@ -314,33 +314,33 @@ gFldEffScript_PcturnOn:: @ 81D9976 gFldEffScript_HallOfFameRecord:: @ 81D9977 loadfadedpal gUnknown_83CBE9C - loadfadedpal_callnative gUnknown_83CBEA4, sub_8083CE0 + loadfadedpal_callnative gUnknown_83CBEA4, FldEff_HallOfFameRecord end gFldEffScript_UseTeleport:: @ 81D9986 callnative FldEff_UseTeleport end -gFldEffScript_Unk40:: @ 81D998C - callnative sub_80825EC +gFldEffScript_SmileyFaceIcon:: @ 81D998C + callnative FldEff_SmileyFaceIcon end -gFldEffScript_Unk41:: @ 81D9992 - callnative sub_8086BA8 +gFldEffScript_UseVsSeeker:: @ 81D9992 + callnative FldEff_UseVsSeeker end -gFldEffScript_Unk42:: @ 81D9998 - callnative sub_808257C +gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 + callnative FldEff_DoubleExclMarkIcon end -gFldEffScript_Unk43:: @ 81D999E - callnative sub_8087924 +gFldEffScript_MoveDeoxysRock:: @ 81D999E + callnative FldEff_MoveDeoxysRock end gFldEffScript_Unk44:: @ 81D99A4 - callnative sub_8087AB4 + callnative FldEff_Unk44 end gFldEffScript_Unk45:: @ 81D99AA - callnative sub_8087E28 + callnative FldEff_Unk45 end |