From 9e5619529ddf364dc2cd27b2ca5c979ee473ddc3 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 21 Aug 2023 09:06:01 -0700 Subject: [PATCH] finish decomping friend_area_action_menu --- ld_script.txt | 2 -- src/friend_area_action_menu.c | 42 +++++++++++------------ src/friend_area_action_menu_1.c | 59 --------------------------------- 3 files changed, 21 insertions(+), 82 deletions(-) delete mode 100644 src/friend_area_action_menu_1.c diff --git a/ld_script.txt b/ld_script.txt index 453f23870..3dad4f23f 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -116,7 +116,6 @@ SECTIONS { src/friend_list_menu.o(.text); src/party_list_menu.o(.text); src/friend_area_action_menu.o(.text); - src/friend_area_action_menu_1.o(.text); src/wonder_mail.o(.text); src/thank_you_wonder_mail.o(.text); src/wonder_mail_2.o(.text); @@ -393,7 +392,6 @@ SECTIONS { src/friend_list_menu.o(.rodata); src/party_list_menu.o(.rodata); src/friend_area_action_menu.o(.rodata); - src/friend_area_action_menu_1.o(.rodata); src/wonder_mail.o(.rodata); src/thank_you_wonder_mail.o(.rodata); src/wonder_mail_2.o(.rodata); diff --git a/src/friend_area_action_menu.c b/src/friend_area_action_menu.c index 4593d5e29..beb261a4d 100644 --- a/src/friend_area_action_menu.c +++ b/src/friend_area_action_menu.c @@ -14,19 +14,22 @@ #include "code_801EE10_1.h" #include "code_801B3C0.h" #include "event_flag.h" +#include "moves.h" extern struct unkStruct_203B2BC *gUnknown_203B2BC; -extern void sub_8027D40(u32, struct BulkItem *); +extern u8 *gUnknown_80D4920[]; +extern u8 *gUnknown_80D4928[]; +extern u8 *gUnknown_80D4970[]; + extern void sub_8024458(s16, u32); extern void sub_801BEEC(s16); -extern void GetLinkedSequence(u32, struct Move *, u16*); extern void sub_801F808(u16*); -extern void sub_8027794(); extern void sub_801F1B0(u32, u32); -extern void unk_CopyMoves4To8(struct Move *, struct Move *); extern void sub_801EE10(u32, s16, struct Move *, u32, u32, u32); +void sub_8027D40(u32, struct BulkItem *heldItem); +void sub_8027794(void); extern void SetFriendAreaActionMenuState(u32); extern void sub_802719C(); extern void sub_8027274(); @@ -49,6 +52,7 @@ extern u8 sub_8027DCC(struct PokemonStruct *); extern u32 sub_801EF38(u8 r0); extern void sub_801F214(); +extern void SetFriendAreaActionMenuState(u32); extern void PlaySound(u32); extern void nullsub_104(); extern void sub_8099690(u32); @@ -145,6 +149,18 @@ ALIGNED(4) const u8 gUnknown_80DD8A0[] = _( ALIGNED(4) const u8 gUnknown_80DD8D0[] = _( "{CENTER_ALIGN}The {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} was\n{CENTER_ALIGN}sent to storage."); +ALIGNED(4) const u8 gFriendActionStandby[] = "Stand By"; +ALIGNED(4) const u8 gFriendActionMakeLeader[] = "Make Leader"; +ALIGNED(4) const u8 gFriendActionJoinTeam[] = "Join Team"; +ALIGNED(4) const u8 gFriendActionSayFarewell[] = "Say Farewell"; +ALIGNED(4) const u8 gFriendActionGive[] = "Give"; +ALIGNED(4) const u8 gFriendActionTake[] = "Take"; +ALIGNED(4) const u8 gFriendActionSummary[] = "Summary"; +ALIGNED(4) const u8 gFriendActionMoves[] = "Moves"; +ALIGNED(4) const u8 gFriendActionCheckIQ[] = "Check IQ"; + +ALIGNED(4) const u8 gUnknown_80DD958[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} "); +static const u8 filler[] = "pksdir0"; u32 sub_8027074(void) { @@ -326,21 +342,6 @@ void sub_8027274(void) } } -extern u8 gFriendActionStandby[]; -extern u8 gFriendActionMakeLeader[]; -extern u8 gFriendActionJoinTeam[]; -extern u8 gFriendActionSayFarewell[]; -extern u8 gFriendActionGive[]; -extern u8 gFriendActionTake[]; -extern u8 gFriendActionSummary[]; -extern u8 gFriendActionMoves[]; -extern u8 gFriendActionCheckIQ[]; -extern u8 *gUnknown_80D4920[]; -extern u8 *gUnknown_80D4928[]; -extern u8 *gUnknown_80D4970[]; -extern u8 gUnknown_80DD958[]; - - void CreateFriendActionMenu(void) { int index; @@ -413,7 +414,6 @@ void CreateFriendActionMenu(void) gUnknown_203B2BC->menuItems[loopMax].text = 0; gUnknown_203B2BC->menuItems[loopMax].menuAction = FRIEND_AREA_ACTION_MENU_ACTION_NONE; - for(index = 0; index < loopMax; index++) { if(gUnknown_203B2BC->unk16C[index] == 0) @@ -452,7 +452,6 @@ void sub_80276A8(void) gUnknown_203B2BC->menuItems[loopMax].text = 0; gUnknown_203B2BC->menuItems[loopMax].menuAction = FRIEND_AREA_ACTION_MENU_ACTION_NONE; - for(index = 0; index < loopMax; index++) { if(gUnknown_203B2BC->unk16C[index] == 0) @@ -918,3 +917,4 @@ void sub_8027EB8(void) break; } } + diff --git a/src/friend_area_action_menu_1.c b/src/friend_area_action_menu_1.c deleted file mode 100644 index bd7ef4ba0..000000000 --- a/src/friend_area_action_menu_1.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "global.h" -#include "constants/dungeon.h" -#include "memory.h" -#include "text2.h" -#include "item.h" -#include "team_inventory.h" -#include "pokemon.h" -#include "friend_area_action_menu.h" -#include "menu_input.h" -#include "kecleon_bros.h" -#include "code_80130A8.h" -#include "code_801EE10_1.h" -#include "code_801B3C0.h" -#include "code_80118A4.h" -#include "event_flag.h" - -extern struct unkStruct_203B2BC *gUnknown_203B2BC; -extern struct TeamInventory *gTeamInventoryRef; - -extern u32 sub_801EF38(u8 r0); -extern void sub_801F214(); - -extern void SetFriendAreaActionMenuState(u32); -extern void nullsub_104(); -extern void sub_8099690(u32); - -extern void sub_8027EB8(); -extern void sub_808D31C(struct PokemonStruct *); -extern struct PokemonStruct *sub_808D3F8(void); -extern struct PokemonStruct *sub_808D3BC(void); -extern u32 sub_801F890(void); -extern void sub_801F8D0(void); -extern u8 gUnknown_202DE58[]; -extern u32 sub_801F194(void); - -u32 sub_8027E18(struct PokemonStruct *); -u8 sub_8027E4C(struct PokemonStruct *r0); - -extern u32 sub_801BF48(void); -extern void sub_801BF98(void); -extern u32 sub_80244E4(void); -extern void sub_802453C(void); - -extern bool8 sub_808D750(s16 index_); -extern struct PokemonStruct *GetPlayerPokemonStruct(void); -extern void sub_808ED00(); - -ALIGNED(4) const u8 gFriendActionStandby[] = "Stand By"; -ALIGNED(4) const u8 gFriendActionMakeLeader[] = "Make Leader"; -ALIGNED(4) const u8 gFriendActionJoinTeam[] = "Join Team"; -ALIGNED(4) const u8 gFriendActionSayFarewell[] = "Say Farewell"; -ALIGNED(4) const u8 gFriendActionGive[] = "Give"; -ALIGNED(4) const u8 gFriendActionTake[] = "Take"; -ALIGNED(4) const u8 gFriendActionSummary[] = "Summary"; -ALIGNED(4) const u8 gFriendActionMoves[] = "Moves"; -ALIGNED(4) const u8 gFriendActionCheckIQ[] = "Check IQ"; - -ALIGNED(4) const u8 gUnknown_80DD958[] = _("Item: {COLOR_1 GREEN}{ARG_MOVE_ITEM_0}{END_COLOR_TEXT_1} "); -static const u8 filler[] = "pksdir0";