Merge pull request #95 from SethBarberee/data_move

Move Menu Data to src/data/menus

5 files changed, 51 insertions, 7 deletions

diff --git a/include/ds_menus.h b/include/ds_menus.h
new file mode 100644
index 0000000..4c7d90f
--- /dev/null
+++ b/include/ds_menus.h
@@ -0,0 +1,11 @@
+#ifndef GUARD_DS_MENUS_H
+#define GUARD_DS_MENUS_H
+
+u32 CreateDualSlotMenu(void);
+u32 UpdateDualSlotMenu(void);
+void CleanDualSlotMenu(void);
+u32 CreateWirelessCommsMenu(void);
+u32 UpdateWirelessCommsMenu(void);
+void CleanWirelessCommsMenu(void);
+
+#endif // GUARD_DS_MENUS_H
diff --git a/include/friend_rescue.h b/include/friend_rescue.h
index 62af956..4a25672 100644
--- a/include/friend_rescue.h
+++ b/include/friend_rescue.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_FRIEND_RESCUE_H
 #define GUARD_FRIEND_RESCUE_H
 
+#include "item.h"
+
 struct WonderMailStruct_203B33C
 {
     // size: 0x568
@@ -43,4 +45,9 @@ struct WonderMailStruct_203B33C
     s32 unk564;
 };
 
+u32 CreateFriendRescueMenu(void);
+u32 UpdateFriendRescueMenu(void);
+void CleanFriendRescueMenu(void);
+
+
 #endif
diff --git a/include/load_screen.h b/include/load_screen.h
new file mode 100644
index 0000000..690ed1c
--- /dev/null
+++ b/include/load_screen.h
@@ -0,0 +1,9 @@
+#ifndef GUARD_LOAD_SCREEN_H
+#define GUARD_LOAD_SCREEN_H
+
+void CreateLoadScreen(u32);
+s32 UpdateLoadScreenMenu(void);
+void CleanLoadScreen(void);
+
+#endif // GUARD_LOAD_SCREEN_H
+
diff --git a/include/moves.h b/include/moves.h
index 22f7ba6..a5db8d0 100644
--- a/include/moves.h
+++ b/include/moves.h
@@ -2,18 +2,31 @@
 #define GUARD_MOVES_H
 
 #include "constants/move.h"
+#include "constants/move_id.h"
 
-// 0x92A88
+void LoadWazaParameters(void);
+u8 sub_809287C(struct PokemonMove *move);
 void InitPokemonMove(struct PokemonMove *move, u16 moveID);
-// 0x92AE0
+void sub_8092AA8(struct PokemonMove *move, u16 moveID);
+void InitZeroedPPPokemonMove(struct PokemonMove *move, u16 moveID);
 s16 GetMoveTargetingFlags(struct PokemonMove *move, u32 isAI);
 u8 GetMoveType(struct PokemonMove *move);
-// 0x92B90
 u8 GetMoveWeight(struct PokemonMove *move);
+u8 GetMoveHitCount(struct PokemonMove *move);
 s32 GetMovePower(struct PokemonMove *move);
-// 0x92BF4
+u8 GetMoveAccuracy(struct PokemonMove *move, u32 r1);
 u32 GetMoveMaxPP(struct PokemonMove *move);
-// 0x92C54
-bool8 MoveDealsDirectDamage(struct PokemonMove *move);
+u8 GetMoveUnk12(struct PokemonMove *move);
+u8 GetMoveCriticalHitChance(struct PokemonMove *move);
+u8 GetMoveCannotHitFrozen(struct PokemonMove *move);
+u8 MoveDealsDirectDamage(struct PokemonMove *move);
+u32 GetMoveRangeType(struct PokemonMove *move);
+void sub_8092C84(u8 *buffer, u16 moveID);
+u8 *GetMoveUseText(u16 moveID);
+u8 GetMoveAffectedByMagicCoat(u16 moveID);
+u8 GetMoveTargetsUser(u16 moveID);
+u8 GetMoveAffectedByMuzzled(u16 moveID);
+bool8 IsBlockedBySoundproof(struct PokemonMove *move);
+bool8 DoesMoveCharge(u16 move);
 
-#endif
+#endif // GUARD_MOVES_H
diff --git a/include/rescue_password_menu.h b/include/rescue_password_menu.h
index 8781b1f..66325be 100644
--- a/include/rescue_password_menu.h
+++ b/include/rescue_password_menu.h
@@ -23,4 +23,8 @@ struct RescuePasswordMenu
     u32 unk210;
 };
 
+void CreateRescuePasswordMenu(u32 currMenu);
+s32 UpdateRescuePasswordMenu(void);
+void CleanRescuePasswordMenu(void);
+
 #endif