From f8251866551143e2febe55fe47e92f7c826696b3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 28 Feb 2020 15:55:12 -0500 Subject: Use VS Seeker field effect --- data/field_effect.s | 27 ++++++++++----------------- data/field_effect_scripts.s | 8 ++++---- 2 files changed, 14 insertions(+), 21 deletions(-) (limited to 'data') diff --git a/data/field_effect.s b/data/field_effect.s index c24b7d3f6..63142e981 100644 --- a/data/field_effect.s +++ b/data/field_effect.s @@ -6,23 +6,16 @@ .section .rodata .align 2 - .align 2 -sUnk41EffectFuncs:: @ 83CC168 dataptr - .4byte Unk41Effect_1 - .4byte Unk41Effect_2 - .4byte Unk41Effect_3 - .4byte Unk41Effect_4 - -gUnknown_83CC178:: @ 83CC178 dataptr (incomplete) - .4byte sub_8086E70 - .4byte sub_8086EC8 - .4byte sub_8086F0C - .4byte sub_8086F64 - .4byte sub_8086FA8 - .4byte sub_8086FFC - .4byte sub_808706C - .4byte sub_8087118 - .4byte sub_8087138 +sUseFlyEffectFuncs:: @ 83CC178 dataptr (incomplete) + .4byte UseFlyEffect_1 + .4byte UseFlyEffect_2 + .4byte UseFlyEffect_3 + .4byte UseFlyEffect_4 + .4byte UseFlyEffect_5 + .4byte UseFlyEffect_6 + .4byte UseFlyEffect_7 + .4byte UseFlyEffect_8 + .4byte UseFlyEffect_9 gUnknown_83CC19C:: @ 83CC19C affineanimcmd obj_rot_scal_anim_frame 8, 8, 226, 0 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 0f8295871..3b30c8878 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -67,7 +67,7 @@ gFieldEffectScriptPointers:: @ 81D96AC .4byte gFldEffScript_HallOfFameRecord .4byte gFldEffScript_UseTeleport .4byte gFldEffScript_SmileyFaceIcon - .4byte gFldEffScript_Unk41 + .4byte gFldEffScript_UseVsSeeker .4byte gFldEffScript_DoubleExclMarkIcon .4byte gFldEffScript_Unk43 .4byte gFldEffScript_Unk44 @@ -192,7 +192,7 @@ gFldEffScript_MountainDisguise:: @ 81D98AC end gFldEffScript_NpcflyOut:: @ 81D98B2 - callnative sub_8086D38 + callnative FldEff_NpcFlyOut end gFldEffScript_UseFly:: @ 81D98B8 @@ -325,8 +325,8 @@ gFldEffScript_SmileyFaceIcon:: @ 81D998C callnative FldEff_SmileyFaceIcon end -gFldEffScript_Unk41:: @ 81D9992 - callnative FldEff_Unk41 +gFldEffScript_UseVsSeeker:: @ 81D9992 + callnative FldEff_UseVsSeeker end gFldEffScript_DoubleExclMarkIcon:: @ 81D9998 -- cgit v1.2.3