diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/field_effect.h | 4 | ||||
| -rw-r--r-- | include/field_player_avatar.h | 1 | ||||
| -rw-r--r-- | include/fldeff.h | 7 | ||||
| -rw-r--r-- | include/overworld.h | 4 | ||||
| -rw-r--r-- | include/party_menu.h | 5 |
5 files changed, 19 insertions, 2 deletions
diff --git a/include/field_effect.h b/include/field_effect.h index bb5e0f1d5..979037a8e 100644 --- a/include/field_effect.h +++ b/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 diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index bb78bd0f3..b365a9d92 100644 --- a/include/field_player_avatar.h +++ b/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 diff --git a/include/fldeff.h b/include/fldeff.h new file mode 100644 index 000000000..70bd25313 --- /dev/null +++ b/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
\ No newline at end of file diff --git a/include/overworld.h b/include/overworld.h index 8c32d3e06..234fb7c01 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -96,9 +96,11 @@ void sub_80563F0(void); extern u8 gUnknown_2031DD8; extern u8 gUnknown_2036E28; -extern bool8 (* gUnknown_3005024)(void); +extern bool8 (* gFieldCallback2)(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); #endif //GUARD_ROM4_H diff --git a/include/party_menu.h b/include/party_menu.h index 5f7a3a68e..09b160954 100644 --- a/include/party_menu.h +++ b/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 |