Doc field move scripts completely, use fldeff constants for dofieldeffect

Fix labels

Fix labels again

Delete extra boulder scripts

Now it should build fine
This commit is contained in:
Fontbane
2019-04-04 23:26:53 -04:00
committed by huderlem
parent 621e5d2263
commit 4a09a5da33
46 changed files with 284 additions and 316 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -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)

View File

@@ -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);
}
}