From d09d78dca303386dd5d7fae0ec8e3f6c59d227bc Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 29 Jun 2019 03:30:48 +0800 Subject: finished fldeff_strength + lots of clean up --- include/event_scripts.h | 2 ++ include/fldeff.h | 21 ++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/event_scripts.h b/include/event_scripts.h index d5ee57d56..b1b65da11 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -1144,4 +1144,6 @@ extern const u8 gUnknown_81BB084[]; extern const u8 gUnknown_81BB0DF[]; extern const u8 gUnknown_81BB156[]; +extern const u8 EventScript_FldEffStrength[]; + #endif //GUARD_EVENT_SCRIPTS_H diff --git a/include/fldeff.h b/include/fldeff.h index 3120833e2..749b09da7 100644 --- a/include/fldeff.h +++ b/include/fldeff.h @@ -1,11 +1,30 @@ #ifndef GUARD_FLDEFF_H #define GUARD_FLDEFF_H -// rock smash +bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId); u8 oei_task_add(void); +// rock smash + +// berrytree +void nullsub_56(void); + // poison void FldEffPoison_Start(void); bool32 FldEffPoison_IsActive(void); +// strength +bool8 SetUpFieldMove_Strength(void); +bool8 sub_80D0860(void); + +// teleport +bool8 SetUpFieldMove_Teleport(void); +bool8 FldEff_UseTeleport(void); + +// softboiled +bool8 hm_prepare_dive_probably(void); +void sub_80E56DC(u8 taskId); +void sub_80E5724(u8 taskId); + + #endif // GUARD_FLDEFF_H -- cgit v1.2.3