Merge pull request #50 from ultima-soul/fldeff

Port fldeff_teleport and decompile fldeff_berrytree

include/field_effect.h

@@ -74,9 +74,13 @@ enum FieldEffectScriptIdx
 };
 
 extern u32 gFieldEffectArguments[8];
+extern void (*gPostMenuFieldCallback)(void);
+extern bool8 (*gFieldCallback2)(void);
 
 u8 FieldEffectStart(u8);
 bool8 FieldEffectActiveListContains(u8 id);
 void sub_80B69DC(void);
+void CreateTeleportFieldEffectTask(void);
+void FieldEffectActiveListRemove(u8 id);
 
 #endif //GUARD_FIELD_EFFECTS_H

include/field_player_avatar.h

@@ -21,5 +21,6 @@ void SetPlayerAvatarStateMask(u8 mask);
 void sub_805D9C4(struct Sprite *sprite);
 void sub_805D154(u8 direction);
 void sub_805DAE4(u8 direction);
+void SetPlayerAvatarTransitionFlags(u16 a);
 
 #endif //GUARD_FIELD_PLAYER_AVATAR_H

include/fldeff.h

@@ -0,0 +1,7 @@
+#ifndef GUARD_FLDEFF_H
+#define GUARD_FLDEFF_H
+
+// rock smash
+u8 oei_task_add(void);
+
+#endif // GUARD_FLDEFF_H

include/overworld.h

@@ -97,11 +97,13 @@ extern u8 gUnknown_2031DD8;
 extern u8 gUnknown_2036E28;
 
 extern void (*gUnknown_3005020)(void);
+extern bool8 (* gFieldCallback2)(void);
 
-extern bool8 (* gUnknown_3005024)(void);
 void SetLastHealLocationWarp(u8 healLocaionId);
 void sub_8055864(u8 mapGroup, u8 mapNum);
 void CB2_NewGame(void);
+bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
+void Overworld_ResetStateAfterTeleport(void);
 
 void Overworld_FadeOutMapMusic(void);
 void sub_805671C(void);

include/party_menu.h

@@ -1,7 +1,8 @@
 #ifndef GUARD_PARTY_MENU_H
 #define GUARD_PARTY_MENU_H
 
-#include "global.h"
+#include "main.h"
+#include "task.h"
 
 enum {
     AILMENT_NONE,
@@ -14,6 +15,7 @@ enum {
 
 extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func);
 
+bool8 FieldCallback_PrepareFadeInFromMenu(void);
 bool8 MonKnowsMove(struct Pokemon *, u16);
 void sub_81B58A8(void);
 void DoWallyTutorialBagMenu(void);
@@ -23,5 +25,6 @@ void sub_8125B40(u8 taskId, TaskFunc func);
 void sub_8124C8C(void);
 void sub_8126EDC(void);
 void c2_8123744(void);
+u8 GetCursorSelectionMonId(void);
 
 #endif // GUARD_PARTY_MENU_H