summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFontbane <fontbane@gmail.com>2019-04-04 23:26:53 -0400
committerhuderlem <huderlem@gmail.com>2019-04-06 12:48:50 -0500
commit4a09a5da330cfb855989ed5390efaef219d73ecc (patch)
tree79e0d681267098117292c32853696dbfbeb3ed33 /src
parent621e5d22639a3228c4522de342afd8010ab71689 (diff)
Doc field move scripts completely, use fldeff constants for dofieldeffect
Fix labels Fix labels again Delete extra boulder scripts Now it should build fine
Diffstat (limited to 'src')
-rw-r--r--src/fldeff_cut.c4
-rw-r--r--src/fldeff_rocksmash.c2
-rw-r--r--src/fldeff_strength.c2
-rw-r--r--src/fldeff_sweetscent.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 3da1a9217..be655b86a 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -23,7 +23,7 @@
extern struct MapPosition gPlayerFacingPosition;
-extern const u8 Route103_EventScript_290705[];
+extern const u8 EventScript_FldEffCut[];
extern const u8 FarawayIsland_Interior_EventScript_267EDB[];
extern const u8 gFieldEffectPic_CutGrass[];
@@ -327,7 +327,7 @@ bool8 FldEff_UseCutOnGrass(void)
static void FieldCallback_CutTree(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(Route103_EventScript_290705);
+ ScriptContext1_SetupScript(EventScript_FldEffCut);
}
bool8 FldEff_UseCutOnTree(void)
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index a9077f2ff..18cebdf11 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -140,7 +140,7 @@ bool8 SetUpFieldMove_RockSmash(void)
static void sub_81356C4(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(Route111_EventScript_2907F0);
+ ScriptContext1_SetupScript(EventScript_FldEffRockSmash);
}
bool8 FldEff_UseRockSmash(void)
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index c57ab8cdc..47fc7061c 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -30,7 +30,7 @@ bool8 SetUpFieldMove_Strength(void)
static void FldEff_UseStrength(void)
{
gFieldEffectArguments[0] = GetCursorSelectionMonId();
- ScriptContext1_SetupScript(FieryPath_EventScript_2908FD);
+ ScriptContext1_SetupScript(EventScript_FldEffStrength);
}
bool8 sub_8145E2C(void)
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index a187353ff..788310b5d 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -93,7 +93,7 @@ static void FailSweetScentEncounter(u8 taskId)
{
CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
sub_80AC3E4();
- ScriptContext1_SetupScript(EventScript_290CAE);
+ ScriptContext1_SetupScript(EventScript_FailSweetScent);
DestroyTask(taskId);
}
}