From b2e109dab17933f3cd8074bf46d0134ea773a6d9 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Dec 2021 15:36:39 -0600 Subject: Move some data to src and add some more headers - Finish moving all data for main menu to src - Move some more data to wonder_mail - Add some headers to clean up some externs --- include/ds_menus.h | 11 +++++++++++ include/load_screen.h | 9 +++++++++ 2 files changed, 20 insertions(+) create mode 100644 include/ds_menus.h create mode 100644 include/load_screen.h (limited to 'include') 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/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 + -- cgit v1.2.3 From ef97af7d030583c60a5c50e54f6fda5c607b2685 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Dec 2021 15:48:55 -0600 Subject: add more funcs to headers and clean externs --- include/friend_rescue.h | 7 +++++++ include/rescue_password_menu.h | 4 ++++ 2 files changed, 11 insertions(+) (limited to 'include') 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/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 -- cgit v1.2.3 From 3de1f79307eda8de1232dfb612097cef261d0431 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Dec 2021 16:08:12 -0600 Subject: add more to moves header --- include/moves.h | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/moves.h b/include/moves.h index 22f7ba6..4507593 100644 --- a/include/moves.h +++ b/include/moves.h @@ -2,18 +2,30 @@ #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 GetMoveDealsDirectDamage(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); -#endif +#endif // GUARD_MOVES_H -- cgit v1.2.3 From ee5fb3584d800ea302720e1676080132f37636b6 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Dec 2021 18:38:49 -0600 Subject: move data from data to wonder_mail --- include/moves.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/moves.h b/include/moves.h index 4507593..ccf4953 100644 --- a/include/moves.h +++ b/include/moves.h @@ -27,5 +27,6 @@ u8 GetMoveAffectedByMagicCoat(u16 moveID); u8 GetMoveTargetsUser(u16 moveID); u8 GetMoveAffectedByMuzzled(u16 moveID); bool8 IsBlockedBySoundproof(struct PokemonMove *move); +bool8 DoesMoveCharge(u16 move); #endif // GUARD_MOVES_H -- cgit v1.2.3 From 8e0ba3615a545c774b691e47b6581f6c7e6c13fb Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 28 Jan 2022 17:37:55 -0600 Subject: few more decomped funcs --- include/moves.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/moves.h b/include/moves.h index ccf4953..a5db8d0 100644 --- a/include/moves.h +++ b/include/moves.h @@ -19,7 +19,7 @@ u32 GetMoveMaxPP(struct PokemonMove *move); u8 GetMoveUnk12(struct PokemonMove *move); u8 GetMoveCriticalHitChance(struct PokemonMove *move); u8 GetMoveCannotHitFrozen(struct PokemonMove *move); -u8 GetMoveDealsDirectDamage(struct PokemonMove *move); +u8 MoveDealsDirectDamage(struct PokemonMove *move); u32 GetMoveRangeType(struct PokemonMove *move); void sub_8092C84(u8 *buffer, u16 moveID); u8 *GetMoveUseText(u16 moveID); -- cgit v1.2.3