Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-04-24 15:07:09 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean kecleon_bros function signatures

Browse Source
This commit is contained in:
Kermalis 2023-08-05 11:32:30 -04:00
parent 5919f5c74d
commit 7cf567e51b
14 changed files with 68 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/code_8098BDC.s
View File

@ -5658,7 +5658,7 @@ _0809BCE8:
beq _0809BCF0
movs r0, 0x3
_0809BCF0:
bl DisplayKeckleonDialogueSprite
bl KecleonShop_New
lsls r0, 24
cmp r0, 0
beq _0809BD10

2
include/felicity_bank.h
View File

@ -42,4 +42,6 @@ extern struct FelicityBankWork *gFelicityBankWork;
#define FELICITY_BANK_ACTION_WITHDRAW 0
#define FELICITY_BANK_ACTION_DEPOSIT 1
void DrawTeamMoneyBox(u32 param_1);
#endif

13
include/kecleon_bros.h
View File

@ -82,6 +82,17 @@ enum KecleonStoreStates
};
// mode corresponds to the enum: KecleonShopMode
u32 DisplayKeckleonDialogueSprite(u32 mode);
u32 KecleonShop_New(u32 mode);
bool32 sub_801A5D8(u32, s32, struct UnkTextStruct2_sub *, u32);
s32 sub_801A8AC(void);
void sub_801A8D0(u8);
void sub_801A928(void);
void sub_801A9E0(void);
void sub_801AD34(u32);
bool8 sub_801ADA0(s32);
void sub_801AE84(void);
s32 sub_801AED0(s32);
s32 sub_801AEA8(void);
#endif // GUARD_KECLEON_BROS_H

7
src/code_801B3C0.c
View File

@ -9,6 +9,7 @@
#include "team_inventory.h"
#include "menu_input.h"
#include "subStruct_203B240.h"
#include "kecleon_bros.h"
// based off of 203B240..
struct unkStruct_203B230
@ -73,11 +74,8 @@ extern u8 *gUnknown_80D4928[];
extern s32 sub_80144A4(s32 *);
extern u32 sub_801A6E8(bool8);
extern u32 sub_801A8AC();
extern void sub_8099690(u32);
extern void sub_801A928(void);
extern bool8 sub_801ADA0(s32);
extern struct UnkTextStruct2 gUnknown_80DBA58;
extern struct UnkTextStruct2 gUnknown_80DBA88;
extern struct UnkTextStruct2 gUnknown_80DBA70;
@ -94,10 +92,7 @@ extern void sub_8013F84(void);
extern s32 sub_80913E0(struct Item *, u32, struct subStruct_203B240 **);
extern void sub_80141B4(u8 *, u32, u32 *, u32);
extern void sub_801BB20(void);
extern void sub_801A8D0(u32);
extern void sub_801A9E0(void);
extern void sub_801BC24(void);
extern void sub_801A5D8(u32, u32, u32, u32);
extern void sub_8014248(const char *, u32, u32, struct MenuItem *, u32, u32, u32, u32, u32);
extern void sub_80140B4(struct UnkTextStruct2 *);
extern void sub_801B46C(u32);

3
src/code_8023144.c
View File

@ -14,6 +14,7 @@
#include "code_8023144.h"
#include "code_800D090.h"
#include "friend_area.h"
#include "kecleon_bros.h"
struct unkStruct_3001B5C
{
@ -70,9 +71,7 @@ void GetGummiItemStatBoost(struct PokemonStruct* pokemon, u8 id, bool8 checkBoos
extern u32 sub_801A6E8(bool8);
extern void sub_8099690(u32);
extern void sub_801A928(void);
s32 GetNumAvailableIQSkills(u8 *iqSkillBuffer, s32 pokeIQ);
extern u32 sub_801A8AC(void);
void sub_8022D2C(void) {
s32 index;

4
src/friend_area_action_menu.c
View File

@ -8,6 +8,7 @@
#include "team_inventory.h"
#include "friend_area_action_menu.h"
#include "menu_input.h"
#include "kecleon_bros.h"
extern struct unkStruct_203B2BC *gUnknown_203B2BC;
@ -22,9 +23,6 @@ extern void sub_801BEEC(s16);
extern void GetLinkedSequence(u32, struct Move *, u16*);
extern void sub_801F808(u16*);
extern void sub_8027794();
extern void sub_801A5D8(u32, u32, u32, u32);
extern void sub_801A8D0(u32);
extern void sub_801A9E0();
extern void sub_801F1B0(u32, u32);
extern void sub_801B3C0(struct Item *);
extern void unk_CopyMoves4To8(struct Move *, struct Move *);

3
src/friend_area_action_menu_1.c
View File

@ -9,6 +9,7 @@
#include "pokemon.h"
#include "friend_area_action_menu.h"
#include "menu_input.h"
#include "kecleon_bros.h"
extern struct unkStruct_203B2BC *gUnknown_203B2BC;
extern struct TeamInventory *gTeamInventory_203B460;
@ -21,9 +22,7 @@ extern void sub_801F214();
extern void SetFriendAreaActionMenuState(u32);
extern void PlaySound(u32);
extern void nullsub_104();
extern void sub_801A928();
extern void sub_8099690(u32);
extern u32 sub_801A8AC();
extern u32 sub_801A6E8(bool8);
extern s32 sub_80144A4(s32 *);

7
src/friend_list_menu.c
View File

@ -9,7 +9,7 @@
#include "moves.h"
#include "menu_input.h"
#include "team_inventory.h"
#include "kecleon_bros.h"
// there might be more overlap with unkStruct_203B2BC
// I was working on the moves and put the data that seemed to correspond to that
@ -126,9 +126,6 @@ extern bool8 sub_8024108(u32);
extern u32 sub_801B3C0(struct Item *param_1);
extern void sub_8023868(u32, u32, u32, u32);
extern void sub_801F1B0(u32, u32);
extern void sub_801A5D8(u32,u32, u32, u32);
extern void sub_801A8D0(u32);
extern void sub_801A9E0(void);
extern void PlaySound(u32);
extern void sub_8024458(s16, u32);
extern void sub_801BEEC(s16);
@ -150,9 +147,7 @@ extern void sub_801EE10(u32, s16, struct Move *, u32, u32, u32);
extern void sub_801F808(u16 *);
extern u32 sub_801602C(u32 r0, u8 *name);
extern u32 sub_801A6E8(bool8);
extern u32 sub_801A8AC(void);
extern void sub_8099690(u32);
extern void sub_801A928(void);
extern void sub_801F8D0(void);
extern u32 sub_801F890(void);
extern void sub_80160D8(void);

2
src/gulpin_shop_1.c
View File

@ -10,6 +10,7 @@
#include "menu_input.h"
#include "gulpin_shop.h"
#include "moves.h"
#include "felicity_bank.h"
// size: 0x1E0
struct unkStruct_203B27C
@ -90,7 +91,6 @@ bool8 sub_8021178(void);
void CreateGulpinShopMenu(void);
extern void sub_8014248(const u8 *, u32, u32, const struct MenuItem *, void *, u32, u32, struct OpenedFile **, u32);
extern void sub_80141B4(const u8 *, u32, struct OpenedFile **, u32);
extern void DrawTeamMoneyBox(u32);
void sub_8020950(void);
void sub_8020900(void);
bool8 sub_801F808(u16 *moveIDs);

15
src/kangaskhan_storage.c
View File

@ -7,6 +7,7 @@
#include "memory.h"
#include "menu_input.h"
#include "team_inventory.h"
#include "kecleon_bros.h"
EWRAM_DATA_2 struct unkStruct_203B208 *gUnknown_203B208 = {0};
EWRAM_DATA_2 struct unkStruct_203B20C *gUnknown_203B20C = {0};
@ -58,26 +59,18 @@ extern void sub_8013C68(u32 *);
extern void sub_80073E0(u32);
extern s32 sub_80144A4(s32 *);
extern u8 sub_801CF50(u32);
extern void sub_801A5D8(u32, u32, u32, u32);
extern void sub_801C8C4(u32, u32, u32, u32);
extern void sub_801CB5C(u32);
extern void sub_801A8D0(u32);
extern u32 sub_801CFE0(u8);
extern void sub_801CF94(void);
extern void sub_801AE84(void);
extern s32 sub_801AED0(s32);
extern u8 sub_801CF14(u32);
extern u8 sub_801CF50(u32);
extern u32 sub_801A6E8(bool8);
extern u32 sub_801AEA8(void);
extern u32 sub_801A8AC(void);
extern void sub_801A928(void);
extern void sub_80182E4(void);
extern void sub_8008C54(u32);
extern void sub_80073B8(u32);
extern void sub_8013C68(u32 *);
extern void sub_80073E0(u32);
extern bool8 sub_801ADA0(u32);
extern void sub_8099690(u32);
extern u32 sub_8013BBC(u32 *);
extern void sub_8017598(void);
@ -97,7 +90,6 @@ extern void sub_80189C8(void);
extern void sub_8018AE4(void);
extern void sub_8017F28();
extern void sub_8018100();
extern void sub_801A9E0();
extern void sub_801841C();
extern void sub_801CCD8();
extern void sub_80184D4();
@ -105,19 +97,14 @@ extern void sub_8018280();
void sub_80175FC(void);
extern void sub_80141B4(const char *r0, u32, struct OpenedFile **r1, u32);
extern void sub_8014248(const char *r0, u32, u32, const struct MenuItem *r4, u16 *, u32, u32, struct OpenedFile **r5, u32);
extern void sub_801A5D8(u32, u32, u32, u32);
extern void sub_801C8C4(u32, u32, u32, u32);
extern void sub_801CB5C(u32);
extern void sub_801A8D0(u32);
extern void sub_801BB20(void);
extern void sub_801A8D0(u32);
extern void sub_801A9E0(void);
extern void sub_801BC24(void);
void sub_80176B8(void);
void sub_80177F8(void);
void sub_8017758(void);
void sub_801A928(void);
extern void sub_801AD34(u32);
extern void sub_8013AA0(u32 *);
extern void sub_8017598(void);
extern void sub_801CCD8(void);

92
src/kecleon_bros.c
View File

@ -1,6 +1,7 @@
#include "global.h"
#include "code_800D090.h"
#include "constants/input.h"
#include "felicity_bank.h"
#include "kecleon_bros.h"
#include "memory.h"
#include "menu_input.h"
@ -50,69 +51,62 @@ extern const u8 *gKecleonShopDialogue[4][23];
extern const u8 gTeamToolboxA[];
extern const u8 gTeamToolboxB[];
// text.s
extern void sub_80073B8(u32);
extern void sub_80073E0(u32);
extern void sub_8007B7C(s32, s32, s32, s32, s32);
extern void sub_8008C54(u32);
extern void sub_8012D60(struct MenuStruct *, const struct MenuItem *, u32 *, u16 *, s32, s32);
// code_80130A8.s
extern void sub_80141B4(const u8 *, u32, struct OpenedFile **, u32);
extern void sub_8014248(const u8 *, u32, u32, const struct MenuItem *, void *, u32, u32, struct OpenedFile **, u32);
extern s32 sub_80144A4(s32 *);
extern void sub_8018D30(void);
extern void sub_80194F8(void);
extern void sub_80195C0(void);
extern void sub_8019660(void);
extern void sub_8019700(void);
extern void sub_8019730(void);
extern void sub_8019850(void);
extern void sub_80198E8(void);
extern void sub_8019944(void);
extern void sub_80199CC(void);
extern void sub_8019B08(void);
extern void sub_8019BBC(void);
extern void sub_8019C78(void);
extern void sub_8019D30(void);
extern void sub_8019D4C(void);
extern void sub_8019D68(void);
extern void sub_8019DAC(void);
extern u32 sub_8019E40(u32);
extern u32 sub_8019EDC(u8);
extern u8 sub_8019FB0(void);
extern void sub_8019FCC(u8);
extern void sub_801A010(void);
extern void sub_801A064(void);
extern void sub_801A0D8(void);
extern u32 sub_801A20C(u32);
extern u32 sub_801A2A8(u8);
extern u8 sub_801A37C(void);
extern void sub_801A398(u8);
extern void sub_801A3DC(void);
extern void sub_801A430(void);
extern void sub_801A4A4(void);
extern u32 sub_801A5D8(u32, s32, struct UnkTextStruct2_sub *, u32);
extern s32 sub_801A8AC(void);
extern void sub_801A8D0(u8);
extern void sub_801A928(void);
extern void sub_801A998(void);
extern void sub_801A9E0(void);
extern void sub_801AD34(u32);
extern bool8 sub_801ADA0(s32);
extern void sub_801AE84(void);
extern s32 sub_801AED0(s32);
extern s32 sub_801AEA8(void);
// code_801B3C0.c
extern u32 sub_801B3C0(struct Item *);
extern u32 sub_801B410(void);
extern void sub_801B450(void);
extern void sub_8090E14(u8 *, struct Item *, struct unkStruct_8090F58 *);
// code_8098BDC.s
extern void sub_8099690(u32);
extern void DrawTeamMoneyBox(u32);
// code_80118A4.c
extern void PlayMenuSoundEffect(u32);
extern void PlaySound(u16 songIndex);
// code_80130A8.s
extern void xxx_format_and_draw(u32, u32, u8 *, u32, u32);
void sub_8018D30(void);
void sub_80194F8(void);
void sub_80195C0(void);
void sub_8019660(void);
void sub_8019700(void);
void sub_8019730(void);
void sub_8019850(void);
void sub_80198E8(void);
void sub_8019944(void);
void sub_80199CC(void);
void sub_8019B08(void);
void sub_8019BBC(void);
void sub_8019C78(void);
void sub_8019D30(void);
void sub_8019D4C(void);
void sub_8019D68(void);
void sub_8019DAC(void);
void sub_8019E04(bool32);
u32 sub_8019E40(u32);
u32 sub_8019EDC(u8);
u8 sub_8019FB0(void);
void sub_8019FCC(u8);
void sub_801A010(void);
void sub_801A064(void);
void sub_801A0D8(void);
u32 sub_801A20C(u32);
u32 sub_801A2A8(u8);
u8 sub_801A37C(void);
void sub_801A398(u8);
void sub_801A3DC(void);
void sub_801A430(void);
void sub_801A4A4(void);
u32 sub_801A6E8(bool8);
void sub_801A998(void);
s32 sub_801AE24(u32);
u32 CountKecleonItems(void);
@ -120,7 +114,7 @@ void Kecleon_SortItems(void);
void UpdateKecleonStoreDialogue(void);
void UpdateKecleonStoreState(u32);
u32 DisplayKeckleonDialogueSprite(u32 mode)
u32 KecleonShop_New(u32 mode)
{
char *monName;
struct OpenedFile *faceFile;
@ -1443,7 +1437,7 @@ u32 sub_801A6E8(bool8 param_1)
PlayMenuSoundEffect(0);
break;
case 3:
if (sub_801AEA8() != 0 || sub_801ADA0(sub_801A8AC()) != FALSE)
if (sub_801AEA8() != 0 || sub_801ADA0(sub_801A8AC()))
PlayMenuSoundEffect(0);
else
PlayMenuSoundEffect(2);
@ -1470,7 +1464,7 @@ u32 sub_801A6E8(bool8 param_1)
goto _0801A87C;
index = sub_801A8AC();
if (gUnknown_203B224->unk4[index] != 0 || sub_801ADA0(index) != FALSE) {
if (gUnknown_203B224->unk4[index] != 0 || sub_801ADA0(index)) {
PlayMenuSoundEffect(6);
gUnknown_203B224->unk4[index] ^= 1;
sub_80138B8(&gUnknown_203B224->input, 0);
@ -1592,7 +1586,7 @@ void sub_801A9E0(void)
item.flags = 1;
sub_8090E14(buffer1, &item, &stack1);
if (gUnknown_203B224->unk4[teamItemIndex] != 0 || sub_801ADA0(teamItemIndex) != FALSE)
if (gUnknown_203B224->unk4[teamItemIndex] != 0 || sub_801ADA0(teamItemIndex))
xxx_call_draw_string(8,sub_8013800(&gUnknown_203B224->input,r7),buffer1,gUnknown_203B224->unk88, 0);
else {
strncpy(gUnknown_202DE58, buffer1, 0x50);

6
src/luminous_cave.c
View File

@ -11,6 +11,7 @@
#include "text_util.h"
#include "team_inventory.h"
#include "menu_input.h"
#include "kecleon_bros.h"
struct unkStruct_203B2B0
{
@ -193,9 +194,6 @@ void PlaySound(u32);
void sub_8024CFC(void);
void sub_8025254(void);
void sub_8024D48(void);
extern void sub_801A5D8(u32, u32, u32, u32);
extern void sub_801A8D0(u32);
extern void sub_801A9E0();
extern void sub_801B3C0(struct Item *);
extern void nullsub_104();
void sub_8024DBC(void);
@ -205,9 +203,7 @@ void sub_808F734(struct PokemonStruct *, s16);
u32 sub_801602C(u32 r0, u8 *name);
extern s32 sub_80144A4(s32 *);
extern u32 sub_801A6E8(bool8);
extern s32 sub_801A8AC(void);
extern void sub_8099690(u32);
extern void sub_801A928(void);
extern void PlayMenuSoundEffect(u32);
extern u32 sub_801B410(void);
extern void sub_801B450(void);

6
src/party_list_menu.c
View File

@ -12,6 +12,7 @@
#include "code_800D090.h"
#include "menu_input.h"
#include "moves.h"
#include "kecleon_bros.h"
struct unkStruct_203B2B8
{
@ -180,10 +181,8 @@ extern void sub_801F8D0(void);
extern u32 sub_801B410(void);
extern void sub_801B450(void);
extern void nullsub_104(void);
extern void sub_801A928(void);
extern void sub_8099690(u32);
extern u32 sub_801A6E8(bool8);
extern u32 sub_801A8AC(void);
extern u32 sub_8022860(void);
extern void sub_8022908(void);
extern void sub_801BF98(void);
@ -197,10 +196,7 @@ bool8 sub_8026E88(struct PokemonStruct *r0);
bool8 HasGummiItem();
bool8 sub_8026EB8(struct PokemonStruct *r0);
extern void sub_801BB20(void);
extern void sub_801A8D0(u32);
extern void sub_801A9E0(void);
extern void sub_801BC24(void);
extern void sub_801A5D8(u32, u32, u32, u32);
extern void sub_8024458(s16, u32);
void sub_8026E08(u32 r0);
void sub_8026DAC(u32 r0, struct BulkItem *item);

2
src/wigglytuff_shop.c
View File

@ -10,6 +10,7 @@
#include "menu_input.h"
#include "friend_area.h"
#include "wigglytuff_shop.h"
#include "felicity_bank.h"
extern struct UnkTextStruct2 gUnknown_80DC534;
extern struct UnkTextStruct2 gUnknown_80DC564;
@ -38,7 +39,6 @@ u8 sub_8021700(u32);
void sub_8092578(u8 *buffer, u8 index, u8 r2);
extern void sub_8014248(const char *r0, u32, u32, const struct MenuItem *r4, u16 *, u32, u32,u8 *r5, u32);
extern void sub_80141B4(const u8 *, u32, u8*, u32);
extern void DrawTeamMoneyBox(u32);
extern void sub_80211AC(u32, u32);
extern void sub_8021354(u32);
extern void sub_8021494();