Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2025-02-11 15:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean menu_input

Browse Source
This commit is contained in:
Kermalis 2023-08-26 13:56:46 -04:00
parent 0a19222313
commit 01d6fe2685
57 changed files with 603 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/code_800558C_1.h
View File

@ -1,6 +1,7 @@
#ifndef GUARD_CODE_800558C_1_H
#define GUARD_CODE_800558C_1_H
void nullsub_7(s16 *);
void nullsub_10(bool8);
void nullsub_12(void);
void nullsub_13(void);

16
include/code_80118A4.h Normal file
View File

@ -0,0 +1,16 @@
#ifndef GUARD_CODE_80118A4_H
#define GUARD_CODE_80118A4_H
void FadeOutAllMusic(u16);
void PlayMenuSoundEffect(u32);
void PlaySound(u16);
void sub_801180C(void);
void sub_8011830(void);
void sub_8011860(void);
void xxx_call_fade_in_new_bgm(u16, u16);
void xxx_call_fade_out_bgm(u16);
void xxx_call_start_bg_music(void);
void xxx_call_stop_bgm(void);
void xxx_call_stop_fanfare_se(u16);
#endif // GUARD_CODE_80118A4_H

7
include/gulpin_shop.h
View File

@ -1,5 +1,10 @@
#ifndef GUARD_GULPIN_SHOP_H
#define GUARD_GULPIN_SHOP_H
#define GUARD_GULPIN_SHOP_H
#include "constants/move.h"
#include "file_system.h"
#include "menu.h"
#include "text.h"
// size: 0x18C
struct GulpinShopWork

1
include/text_util.h
View File

@ -11,5 +11,6 @@ u8 sub_8092354(u8 index);
u8 sub_8092364(u8 index);
void CopyAbilityNametoBuffer(char *buffer, u8 index);
u8 *GetAbilityDescription(u8 index);
u32 ReturnIntFromChar2(u8);
#endif

2
src/adventure_log.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "constants/input.h"
#include "memory.h"
@ -42,7 +43,6 @@ const u8 fill_adven[] = "pksdir0";
void sub_8032084();
void DisplayAdventureLog();
extern void PlayMenuSoundEffect(u32);
extern bool8 sub_8097710(u8);
extern s16 sub_80978B8();

3
src/code_2.c
View File

@ -20,8 +20,8 @@
#include "cpu.h"
#include "code_8094F88.h"
#include "sprite.h"
#include "code_80118A4.h"
extern void sub_801180C(void);
extern void NDS_LoadOverlay_GroundMain(void);
extern void sub_8014144(void);
extern void sub_8097670(void);
@ -48,7 +48,6 @@ extern void xxx_draw_string_80144C4(void);
extern void sub_8005838(u32, u32);
extern void nullsub_8(u32);
extern void sub_80060EC(void);
extern void sub_8011860(void);
extern void sub_800CB20(void);
extern void TransferBGPaletteBuffer(void);
extern void xxx_call_update_bg_vram(void);

6
src/code_800558C_1.c
View File

@ -28,8 +28,10 @@ void sub_8005770(s32 param_1, u8 *RGBArray, s32 a1, u8 *a2)
}
}
void nullsub_7(void)
{}
// Maybe struct Position
void nullsub_7(s16 *a0)
{
}
void nullsub_8(void)
{}

2
src/code_800DAC0.c
View File

@ -1,5 +1,6 @@
#include "global.h"
#include "code_800DAC0.h"
#include "code_80118A4.h"
#include "file_system.h"
#include "memory.h"
@ -50,7 +51,6 @@ extern void sub_803EAF0(u32, u32);
extern void sub_800CD64(u32, u32);
extern struct unkStruct_800F18C *sub_800F18C(s32);
extern void sub_800DCA8(struct unkStruct_203B0CC_sub *);
extern void PlaySound(u16);
extern u8 gefob000_string[];
extern u8 gefob001_string[];

55
src/code_80118A4.c
View File

@ -1,6 +1,7 @@
#include <stdarg.h>
#include <stdio.h>
#include "global.h"
#include "code_80118A4.h"
#include "music.h"
#include "constants/bg_music.h"
#include "play_time.h"
@ -10,13 +11,11 @@
#include "game_options.h"
#include "sprite.h"
void xxx_call_stop_bgm(void);
extern bool8 sub_80023E4(u8);
extern void xxx_call_stop_fanfare_se(u16 r0);
extern struct GameOptions *gGameOptionsRef;
// size: 0x4DD8
struct UnkBgStruct
{
u8 padding[0x4c4b];
@ -24,8 +23,8 @@ struct UnkBgStruct
u8 padding2[0x17A];
u32 *unk4dcc;
u32 unk4dd0;
s16 xoffset;
s16 yoffset;
/* 0x4DD4 */ s16 xoffset;
/* 0x4DD6 */ s16 yoffset;
};
extern struct UnkBgStruct *gUnknown_203B0E4;
@ -43,7 +42,6 @@ extern void xxx_call_update_bg_vram(void);
extern void sub_8009908(void);
extern void xxx_call_update_bg_sound_input(void);
extern void sub_80060EC(void);
extern void sub_8011860(void);
extern void sub_800CB20(void);
extern void sub_8004AF0(u8, u32 *r1, u32, u32, u32 *r2, u32);
extern u8 sub_80111C4();
@ -77,15 +75,15 @@ void sub_801169C(void)
void sub_8011760(void)
{
if(sub_80023E4(0xD))
if (sub_80023E4(13))
StartNewBGM(MUS_WORLD_CALAMITY);
else if(sub_80023E4(0xC))
else if (sub_80023E4(12))
StartNewBGM(MUS_POKEMON_SQUARE);
}
void sub_801178C(void)
{
if(sub_80023E4(0xD))
if (sub_80023E4(13))
StartNewBGM(MUS_WORLD_CALAMITY);
else
StartNewBGM(MUS_POKEMON_SQUARE);
@ -93,13 +91,13 @@ void sub_801178C(void)
void sub_80117AC(void)
{
if(!sub_80023E4(0xD))
FadeOutBGM(0x1E);
if (!sub_80023E4(13))
FadeOutBGM(30);
}
void sub_80117C4(void)
{
FadeOutBGM(0x1E);
FadeOutBGM(30);
}
// Some sound effect
@ -143,18 +141,14 @@ void xxx_call_start_bg_music(void)
void sub_8011860(void)
{
if(gUnknown_202DE20 > 0)
{
if (gUnknown_202DE20 > 0)
gUnknown_202DE20--;
}
if(gUnknown_202DE22 > 0)
{
if (gUnknown_202DE22 > 0)
gUnknown_202DE22--;
}
if(gUnknown_202DE24 > 0)
{
if (gUnknown_202DE24 > 0)
gUnknown_202DE24--;
}
}
void StopAllMusic_1(void)
@ -196,14 +190,13 @@ void xxx_call_fade_out_bgm(u16 speed)
FadeOutBGM(speed);
}
u32 IsEqualtoBGTrack(u16 songIndex)
bool8 IsEqualtoBGTrack(u16 songIndex)
{
u32 currBGSong;
currBGSong = GetCurrentBGSong();
if(songIndex == STOP_BGM)
if (songIndex == STOP_BGM)
return currBGSong != STOP_BGM;
return currBGSong == songIndex;
}
@ -232,23 +225,25 @@ bool8 IsFanfareSEPlaying_1(u16 songIndex)
return IsFanfareSEPlaying(songIndex);
}
void PlayMenuSoundEffect(u32 r0)
void PlayMenuSoundEffect(u32 a0)
{
if(gUnknown_202DE20 > 0)
if (gUnknown_202DE20 > 0)
return;
PlayFanfareSE(gUnknown_80D4144[r0], MAX_VOLUME);
PlayFanfareSE(gUnknown_80D4144[a0], MAX_VOLUME);
gUnknown_202DE20 = 4;
}
void sub_8011A04(void)
{
if(gUnknown_202DE22 > 0)
if (gUnknown_202DE22 > 0)
return;
gUnknown_202DE22 = 3;
PlayFanfareSE(305, MAX_VOLUME);
}
void sub_8011A2C(u32 r0)
UNUSED static void sub_8011A2C(u32 a0)
{
gUnknown_202DE1C = r0;
gUnknown_202DE1C = a0;
}

4
src/code_8012A18.c
View File

@ -1,10 +1,10 @@
#include "global.h"
#include "code_800558C.h"
#include "input.h"
#include "code_80118A4.h"
#include "game_options.h"
#include "input.h"
#include "sprite.h"
extern void sub_8011860();
extern void xxx_draw_string_80144C4();
extern void nullsub_8(u8);
extern void sub_800CB20();

3
src/code_8012A18_1.c
View File

@ -48,9 +48,6 @@ enum
MENU_ACTION_NO,
};
extern u32 ReturnIntFromChar2(u8);
s32 sub_8015FEC(u8 *buffer, s32 size)
{
struct unkChar *iVar2;

2
src/code_801AFA4.c
View File

@ -7,6 +7,7 @@
#include "pokemon.h"
#include "gulpin_shop.h"
#include "code_80130A8.h"
#include "code_80118A4.h"
extern void sub_8092C84(u8 *, u16);
extern void sub_8099690(u32);
@ -33,7 +34,6 @@ extern void unk_CopyMoves4To8(struct Move *, struct Move *);
extern bool8 IsHMItem(u8);
extern void sub_801B178(void);
extern void sub_8094060(void *, struct Move *);
extern void PlaySound(u32);
extern void PrintPokeNameToBuffer(u8 *buffer, struct PokemonStruct *pokemon);
extern u32 sub_801E8C0(void);

3
src/code_801B3C0.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_801B3C0.h"
#include "constants/colors.h"
#include "text1.h"
@ -67,7 +68,6 @@ extern struct UnkTextStruct2 gUnknown_80DBA70;
extern void sub_801BB5C(void);
extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern void sub_801B748(u32);
extern void PlayMenuSoundEffect(u32);
extern void sub_8013F84(void);
extern s32 sub_80913E0(struct Item *, u32, struct subStruct_203B240 **);
extern void sub_80140B4(struct UnkTextStruct2 *);
@ -83,7 +83,6 @@ extern void sub_801B760(void);
extern void sub_801B874(void);
extern u32 sub_8001784(u32, u32, u16);
extern void sub_800199C(u32, u32, u32, u32);
extern void PlaySound(u32);
extern s32 sub_808D544(u32);
void sub_801B480(void);

3
src/code_801C620.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_801C620.h"
#include "constants/item.h"
#include "constants/iq_skill.h"
@ -152,7 +153,6 @@ extern void sub_801CC38(void);
extern void sub_80140B4(struct UnkTextStruct2 *);
extern u32 sub_8097DF0(char *, struct subStruct_203B240 **);
extern void sub_8013F84(void);
extern void PlayMenuSoundEffect(u32);
extern char * GetIQSkillDescription(u8 r0);
extern s32 GetNumAvailableIQSkills(u8 *param_1, s32 pokeIQ);
extern char * GetIQSkillName(u8 r0);
@ -170,7 +170,6 @@ void sub_801C6E4(void);
void sub_801C848(void);
u32 sub_801C308(u8);
extern void PlaySound(u32);
void ToggleIQSkill(u8 *param_1, u32 skillIndex);
s32 sub_801C390(void);
void sub_801C3F8(void);

2
src/code_801D760.c
View File

@ -16,6 +16,7 @@
#include "code_800D090.h"
#include "menu_input.h"
#include "code_8021774.h"
#include "code_80118A4.h"
struct unkStruct_203B258
{
@ -31,7 +32,6 @@ extern struct unkStruct_203B258 *gUnknown_203B258;
extern struct UnkTextStruct2 gUnknown_80DBF88;
extern struct UnkTextStruct2 gUnknown_80DBF70;
extern void PlayMenuSoundEffect(u32);
extern void sub_801DB54();
extern void sub_801DBD4();

2
src/code_801EE10_1.c
View File

@ -8,6 +8,7 @@
#include "text2.h"
#include "text_util.h"
#include "menu_input.h"
#include "code_80118A4.h"
struct unkStruct_203B2AC
{
@ -52,7 +53,6 @@ extern bool8 sub_80023E4(u32);
extern void sub_808FF20(u32 *, struct PokemonStruct *, bool8);
extern void CreatePokemonInfoTabScreen(u32, s16, u32 *, u32 *, u32);
extern void sub_802452C(void);
extern void PlayMenuSoundEffect(u32);
bool8 ComparePokemonNames(s16 a1, s16 a2);
void sub_8024588(void);

2
src/code_801EE10_mid.c
View File

@ -11,6 +11,7 @@
#include "sprite.h"
#include "code_80130A8.h"
#include "code_801EE10_mid.h"
#include "code_80118A4.h"
extern struct unkStruct_203B270 *gUnknown_203B270;
@ -56,7 +57,6 @@ extern u8 gAvailablePokemonNames[];
extern u8 gUnknown_80DC310[];
extern u8 gUnknown_80DC2DC[];
extern void PlayMenuSoundEffect(u32);
extern void sub_80140B4(struct UnkTextStruct2 *);
extern void sub_801F918(s32);
extern void sub_801FA58(void);

2
src/code_8021774.c
View File

@ -10,6 +10,7 @@
#include "code_800D090.h"
#include "menu_input.h"
#include "code_8021774.h"
#include "code_80118A4.h"
struct unkStruct_203B28C
{
@ -54,7 +55,6 @@ extern void sub_8092578(u8 *buffer, u8 index, u8 r2);
extern void sub_8021878(void);
extern void sub_8021894(void);
extern void PlayMenuSoundEffect(u32);
extern void sub_8021A60(void);
void sub_8021820(void);
u8 sub_80023E4(u32);

2
src/code_8021774_pre.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_801EE10_mid.h"
#include "code_8021774_pre.h"
#include "constants/friend_area.h"
@ -35,7 +36,6 @@ extern struct UnkTextStruct2 gUnknown_80DC464;
u8 sub_8021700(u32 mode);
s32 sub_8021664(void);
extern void sub_8021410(void);
extern void PlayMenuSoundEffect(u32);
bool8 sub_80211AC(u32 param_1, u32 param_2)
{

2
src/code_8023144.c
View File

@ -16,6 +16,7 @@
#include "kecleon_bros.h"
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "code_80118A4.h"
struct unkStruct_3001B5C
{
@ -52,7 +53,6 @@ extern u8 sub_8023704(u8);
extern void sub_8023420(void);
extern void sub_80234BC(void);
extern u32 sub_80236A4(void);
extern void PlayMenuSoundEffect(u32);
extern u8 gUnknown_80DC5EC[];

2
src/code_8031D70.c
View File

@ -9,6 +9,7 @@
#include "pokemon.h"
#include "code_8094F88.h"
#include "menu_input.h"
#include "code_80118A4.h"
struct unkStruct_203B334
{
@ -48,7 +49,6 @@ ALIGNED(4) const u8 gUnknown_80E1FDC[] = "Password";
ALIGNED(4) static const u8 fill0[] = "pksdir0";
extern void sub_803D2C0(u8 *, struct unkStruct_203B480 *);
extern void PlayMenuSoundEffect(u32);
void sub_8031E00(void);
void sub_8031E58(void);

3
src/code_8040094.c
View File

@ -1,5 +1,5 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_80521D0.h"
#include "dungeon_entity.h"
#include "dungeon_global_data.h"
@ -19,7 +19,6 @@ extern void sub_80060EC(void);
extern void sub_800CB20(void);
extern void LoadBufferedInputs(void);
extern void xxx_call_update_bg_sound_input(void);
extern void sub_8011860(void);
extern void sub_803F580(u32);
extern void sub_8049ED4();

3
src/dungeon_music.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "code_80118A4.h"
#include "constants/bg_music.h"
#include "dungeon.h"
#include "music.h"
@ -26,8 +27,6 @@ extern u8 gUnknown_810AC64; // 0x8
extern u8 gUnknown_810AC66; // 0x8
extern void sub_80709C8(u8 *buffer, struct EntityInfo *entityInfo);
void FadeOutAllMusic(u16);
void xxx_call_stop_bgm(void);
// Dungeon Music Player adds in this flag to tell
// the system to fade in rather than immediately playing

2
src/felicity_bank.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "felicity_bank.h"
#include "memory.h"
@ -28,7 +29,6 @@ extern u8 gFelicitySavings[];
extern u8 gFelicityMoney[];
extern u8 gUnknown_80DB738;
extern void PlaySound(u32);
extern void sub_801645C();
extern void sub_80169BC();
extern void sub_8016B00();

2
src/friend_area_action_menu_1.c
View File

@ -11,6 +11,7 @@
#include "code_80130A8.h"
#include "code_801EE10_1.h"
#include "code_801B3C0.h"
#include "code_80118A4.h"
extern struct unkStruct_203B2BC *gUnknown_203B2BC;
extern struct TeamInventory *gTeamInventoryRef;
@ -19,7 +20,6 @@ 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);

2
src/friend_list_menu.c
View File

@ -13,6 +13,7 @@
#include "code_801EE10_1.h"
#include "code_8012A18_1.h"
#include "code_801B3C0.h"
#include "code_80118A4.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
@ -119,7 +120,6 @@ extern s16 sub_80A5728(void);
extern u8 sub_8002658(s16);
extern bool8 sub_8024108(u32);
extern void sub_801F1B0(u32, u32);
extern void PlaySound(u32);
extern void sub_8024458(s16, u32);
extern void sub_801BEEC(s16);
extern void nullsub_104(void);

4
src/friend_rescue.c
View File

@ -20,6 +20,7 @@
#include "code_801C620.h"
#include "code_801B3C0.h"
#include "cpu.h"
#include "code_80118A4.h"
extern void SetFriendRescueMenuState(u32);
extern struct PokemonStruct *GetPlayerPokemonStruct(void);
@ -281,7 +282,6 @@ extern void sub_802F2C0(void);
extern void sub_8030DE4(void);
extern void sub_802453C(void);
extern u8 sub_800D588(void);
extern void sub_8011830(void);
extern void sub_80151C0(u32, u8 *);
extern u32 sub_801D008(void);
extern u32 sub_8023CE8(void);
@ -303,8 +303,6 @@ extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern void MemoryFill8(u8 *dest, u8 value, s32 size);
extern void ResetUnusedInputStruct(void);
extern void sprintfStatic(char *buffer, const char *text, ...);
extern void xxx_call_start_bg_music(void);
u32 CreateFriendRescueMenu(void)
{

3
src/ground_main.c
View File

@ -4,6 +4,7 @@
#include "debug.h"
#include "code_80A26CC.h"
#include "event_flag.h"
#include "code_80118A4.h"
EWRAM_DATA u32 gUnknown_20398A8 = {0};
EWRAM_DATA u32 gUnknown_20398AC = {0};
@ -49,7 +50,6 @@ extern void sub_809CA20();
extern void sub_80A6E80();
extern void sub_8099BE4();
extern void sub_8099744();
extern void sub_8011860();
extern void sub_800CB20();
extern void nullsub_120();
extern void sub_80A5E70();
@ -78,7 +78,6 @@ extern void sub_80961B4();
extern void ClearAllItems_8091FB4();
extern const char *sub_80A2B18(s16);
extern void ChooseKecleonShopInventory(u32);
extern void FadeOutAllMusic(u16);
extern u8 sub_809C730();
extern s16 sub_80A2750(s16);

6
src/gulpin_shop.c
View File

@ -1,12 +1,13 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "gulpin_shop.h"
#include "pokemon.h"
#include "memory.h"
#include "menu_input.h"
#include "moves.h"
#include "text1.h"
#include "text2.h"
#include "gulpin_shop.h"
#include "menu_input.h"
extern struct GulpinShopWork *gGulpinShopWork;
extern const struct UnkTextStruct2 gUnknown_80DC11C;
@ -38,7 +39,6 @@ extern void sub_801F280(u32);
extern void sub_801F808(u16 *);
extern u32 sub_801F890(void);
extern void sub_801F8D0(void);
extern void PlaySound(u32);
void SetGulpinShopState(u32);
u32 CreateGulpinShop(s32 isAsleep, s16 pokeSpecies, struct Move *moves)

3
src/gulpin_shop_1.c
View File

@ -11,6 +11,7 @@
#include "felicity_bank.h"
#include "code_80130A8.h"
#include "code_801EE10_1.h"
#include "code_80118A4.h"
// size: 0x1E0
struct unkStruct_203B27C
@ -84,8 +85,6 @@ extern u8 gUnknown_80DC438[];
extern u8 gUnknown_80DC448[];
extern u8 gUnknown_202E128[];
void PlayMenuSoundEffect(u32);
void PlaySound(u32);
bool8 sub_8021178(void);
void CreateGulpinShopMenu(void);
void sub_8020950(void);

4
src/hints_menu.c
View File

@ -1,9 +1,10 @@
#include "global.h"
#include "code_80118A4.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"
#include "text2.h"
#include "input.h"
#include "menu_input.h"
#define MAX_HINTS 5
@ -44,7 +45,6 @@ extern struct Hints gGameHints[MAX_HINTS];
extern u8 gUnknown_80DC0D4[MAX_HINTS];
extern void sub_801E714(void);
extern void PlayMenuSoundEffect(u32);
extern void sub_801E714(void);
extern void sub_801E76C(void);
extern void DisplayChosenHint(void);

5
src/kecleon_bros.c
View File

@ -1,5 +1,6 @@
#include "global.h"
#include "code_800D090.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "constants/input.h"
@ -58,10 +59,6 @@ extern const u8 gTeamToolboxB[];
// code_8098BDC.s
extern void sub_8099690(u32);
// code_80118A4.c
extern void PlayMenuSoundEffect(u32);
extern void PlaySound(u16 songIndex);
void sub_8018D30(void);
void sub_80194F8(void);
void sub_80195C0(void);

6
src/luminous_cave.c
View File

@ -14,6 +14,7 @@
#include "code_80130A8.h"
#include "code_8012A18_1.h"
#include "code_801B3C0.h"
#include "code_80118A4.h"
struct unkStruct_203B2B0
{
@ -186,11 +187,7 @@ extern void LuminousCave_AdvancetoFallbackState(void);
extern void sub_8024804(void);
extern void UpdateLuminousCaveDialogue(void);
void xxx_call_fade_out_bgm(u16 speed);
void xxx_call_stop_fanfare_se(u16 songIndex);
void xxx_call_fade_in_new_bgm(u16 songIndex, u16 speed);
void sub_80977D0(void);
void PlaySound(u32);
void sub_8024CFC(void);
void sub_8025254(void);
void sub_8024D48(void);
@ -200,7 +197,6 @@ void sub_8024E30(void);
void sub_801AEE4(u32, u32);
void sub_808F734(struct PokemonStruct *, s16);
extern void sub_8099690(u32);
extern void PlayMenuSoundEffect(u32);
extern void sub_808F468(struct PokemonStruct *, u8 *, u32);
bool8 LuminousCave_HasOnly1Member(void);

3
src/mailbox.c
View File

@ -7,6 +7,7 @@
#include "mailbox.h"
#include "wonder_mail.h"
#include "menu_input.h"
#include "code_80118A4.h"
EWRAM_DATA_2 struct unkStruct_203B304 *gUnknown_203B304 = {0};
@ -105,8 +106,6 @@ extern void sub_8096D24(void);
extern void ResetMailboxSlot(u8);
extern void ReceivePKMNNews(u8);
extern void sub_8096078(void);
extern void PlayMenuSoundEffect(u32);
extern void PlaySound(u32);
extern void sub_802BEDC(void);
extern u8 sub_802BE74(void);
extern u8 HasNoAcceptedJobs(void);

3
src/makuhita_dojo.c
View File

@ -1,5 +1,6 @@
#include "global.h"
#include "code_800D090.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "constants/colors.h"
#include "constants/input.h"
@ -79,8 +80,6 @@ extern u8 sub_80A2740(s32 r0);
extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern bool8 IsMazeCompleted(s32);
extern void PlayMenuSoundEffect(u32);
extern void PlaySound(u16);
extern void PrintColoredPokeNameToBuffer(u8 *, struct PokemonStruct *, s32);
extern void PrintYellowDungeonNametoBuffer(u8 *, struct DungeonLocation *);

1023
src/menu_input.c
View File

File diff suppressed because it is too large Load Diff

2
src/options_menu.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "constants/colors.h"
#include "constants/input.h"
@ -54,7 +55,6 @@ extern const char *gUnknown_80D4928[];
extern s32 sub_8008ED0(u8 *);
extern void CreateOthersMenu(void);
void PlayMenuSoundEffect(u32);
void CreateOptionsMenu(void);
void nullsub_38(void);
extern void SetOptionsMenuState(u32);

4
src/other_menus.c
View File

@ -12,6 +12,7 @@
#include "pokemon.h"
#include "code_8094F88.h"
#include "sprite.h"
#include "code_80118A4.h"
struct unkStruct_203B35C
{
@ -444,7 +445,6 @@ extern u32 sub_8037C10(u32);
extern void sub_8037748(void);
extern void sub_80371B8(void);
extern void sub_8037900(void);
extern void PlayMenuSoundEffect(u32);
extern u32 sub_8037798(void);
extern void sub_8005838(u32, u32);
extern void sub_80060EC();
@ -456,11 +456,9 @@ extern void xxx_call_update_bg_sound_input();
extern s32 sub_8037D64(u32 mode, void *, void *);
extern s32 sub_80381F4(u32 mode, void *, void *);
extern void sub_8037810(void);
extern void sub_8011830(void);
extern s32 sub_8037B28(u32);
s32 sub_8035D3C(void);
extern s32 sub_8035D74(void);
extern void xxx_call_start_bg_music(void);
extern void xxx_draw_string_80144C4(void);
void sub_8036FDC(s32 param_1)

2
src/party_list_menu.c
View File

@ -14,6 +14,7 @@
#include "kecleon_bros.h"
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "code_80118A4.h"
struct unkStruct_203B2B8
{
@ -163,7 +164,6 @@ ALIGNED(4) static const u8 fill0[] = "pksdir0";
extern u32 sub_8026F04(struct PokemonStruct *);
extern void sub_8026074(s32);
extern void PlaySound(u32);
bool8 CanTakePokemonHeldItem(struct PokemonStruct *r0);
extern bool8 sub_80023E4(u8);
extern struct PokemonStruct *sub_808D3F8(void);

2
src/pelipper_board.c
View File

@ -11,6 +11,7 @@
#include "menu_input.h"
#include "team_inventory.h"
#include "pelipper_board.h"
#include "code_80118A4.h"
EWRAM_DATA_2 struct unkStruct_203B308 *gPelipperBoard = {0};
@ -92,7 +93,6 @@ extern void ResetPelipperBoardSlot(u8);
extern void sub_80965F4(void);
extern void sub_802C2D4(void);
extern u32 sub_802C1E4(u32);
extern void PlaySound(u32);
extern u8 sub_802C26C(void);
extern u8 HasNoAcceptedJobs(void);
extern bool8 IsMailinJobSlot(struct WonderMail *mail);

3
src/personality_test.c
View File

@ -14,6 +14,7 @@
#include "menu_input.h"
#include "code_80130A8.h"
#include "code_8012A18_1.h"
#include "code_80118A4.h"
enum
{
@ -50,8 +51,6 @@ extern void SetBGPaletteBufferColorArray(s32 index, u8 *colorArray);
extern void RedrawPartnerSelectionMenu(void);
extern void PlayMenuSoundEffect(u32);
extern u32 sub_80095E4(s16, u32);
extern struct GameOptions *gGameOptionsRef;

2
src/pokemon_news.c
View File

@ -8,6 +8,7 @@
#include "save.h"
#include "menu_input.h"
#include "code_80130A8.h"
#include "code_80118A4.h"
struct unkStruct_203B2CC
{
@ -153,7 +154,6 @@ extern u16 gUnknown_203B2DC;
extern s32 GetNumPKMNNews(void);
extern void sub_802B880(void);
extern void CreatePKMNNewsMenu(void);
extern void PlayMenuSoundEffect(u32);
extern void sub_802BCC4(void);
extern void sub_802BB14(u32);
extern u8 HasNoMailinMailbox(void);

2
src/post_office_guide.c
View File

@ -9,6 +9,7 @@
#include "code_8094F88.h"
#include "menu_input.h"
#include "code_80130A8.h"
#include "code_80118A4.h"
struct PostOfficeHelper
{
@ -177,7 +178,6 @@ extern u8 gUnknown_202DE58[];
extern u8 gUnknown_202E5D8[];
extern u8 gAvailablePokemonNames[];
extern void PlayMenuSoundEffect(u32);
extern void sub_8031A84();
extern void DisplayMissionObjectives();
extern u8 *GetCurrentMissionText(s16 r0);

5
src/save.c
View File

@ -10,6 +10,7 @@
#include "exclusive_pokemon.h"
#include "game_options.h"
#include "code_80130A8.h"
#include "code_80118A4.h"
EWRAM_DATA_2 u32 gUnknown_203B17C = {0};
EWRAM_DATA_2 char *gUnknown_203B180 = {0};
@ -141,7 +142,6 @@ ALIGNED(4) static const char fill_save7[] = _("pksdir0");
extern bool8 sub_800DAB0(u16, u8*, s32);
extern bool8 sub_800DAB4(u16, u8*, s32);
extern bool8 sub_800DAB8(void);
extern void sub_8011830(void);
extern void sub_80140DC();
extern void sub_8014114();
extern u32 SaveRecruitedPokemon(u8 *, u32);
@ -168,9 +168,6 @@ extern void sub_80974E8(void);
extern void ResetNumAdventures(void);
extern void sub_80993D8(void);
extern void xxx_call_start_bg_music(void);
u32 sub_8011C1C(void)
{
return gUnknown_203B17C;

6
src/text_util.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "text_util.h"
#define NUM_POKEMON_TYPES 18
@ -107,8 +108,7 @@ u32 ReturnIntFromChar2(u8 r0)
return r0;
}
// Unused
void sub_8092290(u8 *buffer, u8 *string)
UNUSED static void sub_8092290(u8 *buffer, u8 *string)
{
while( *string != '\0' ) {
*buffer++ = ReturnIntFromChar2(*string++);
@ -116,7 +116,7 @@ void sub_8092290(u8 *buffer, u8 *string)
*buffer = 0; // append a 0
}
void sub_80922B4(u8 *buffer, u8 *string, s32 size)
void sub_80922B4(u8 *buffer, const u8 *string, s32 size)
{
while(1)
{

3
src/thank_you_wonder_mail.c
View File

@ -18,6 +18,7 @@
#include "code_801C620.h"
#include "code_801B3C0.h"
#include "cpu.h"
#include "code_80118A4.h"
extern struct WonderMailStruct_203B2C4 *gUnknown_203B2C4;
@ -216,9 +217,7 @@ extern void SetThankYouMailMenuState(u32);
extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern void sub_802F204(struct unkStruct_802F204 *, u32);
extern void sub_80151C0(u32, u8 *);
extern void xxx_call_start_bg_music(void);
extern void sub_803092C(void);
extern void sub_8011830(void);
extern s32 sub_8037B28(u32);
extern u32 sub_8030894(void);
extern u32 sub_801D008(void);

3
src/trade_items_menu.c
View File

@ -13,6 +13,7 @@
#include "text1.h"
#include "text2.h"
#include "cpu.h"
#include "code_80118A4.h"
EWRAM_DATA_2 struct TradeItemsMenu *gTradeItemsMenu = {0};
@ -88,8 +89,6 @@ extern void sub_8035C1C();
extern u32 sub_801D008();
extern s32 sub_8037B28(u32);
extern void sub_8011830(void);
extern void xxx_call_start_bg_music(void);
extern s32 sub_80381F4(u32, void *, void *);
extern s32 sub_8037D64(u32, void *, void *);

2
src/wigglytuff_shop.c
View File

@ -13,6 +13,7 @@
#include "code_8021774_pre.h"
#include "code_801EE10_mid.h"
#include "code_8021774.h"
#include "code_80118A4.h"
extern struct UnkTextStruct2 gUnknown_80DC534;
extern struct UnkTextStruct2 gUnknown_80DC564;
@ -38,7 +39,6 @@ extern const u8 *gUnknown_80D4978[];
u8 sub_8021700(u32);
void sub_8092578(u8 *buffer, u8 index, u8 r2);
extern void sub_8022380(void);
extern void PlaySound(u32);
bool8 sub_8023144(s32 param_1, s32 index, struct UnkTextStruct2_sub *sub, u32 param_4);
void sub_8023354(u8 param_1);
extern bool8 sub_80023E4(u32);

3
src/wonder_mail.c
View File

@ -15,6 +15,7 @@
#include "main_menu.h"
#include "code_801EE10_1.h"
#include "cpu.h"
#include "code_80118A4.h"
extern struct WonderMailStruct_203B2C0 *gUnknown_203B2C0;
@ -61,10 +62,8 @@ extern s32 sub_8037D64(u32, void *, void *);
extern s32 sub_80381F4(u32, void *, void *);
extern void sub_80306A8(u32, u32, u32, u32);
extern s32 sub_8037B28(u32);
extern void sub_8011830(void);
extern void sub_8031D70(u8, u32);
extern void sub_80151C0(u32, u8 *);
extern void xxx_call_start_bg_music(void);
extern u32 sub_8023CE8(void);
extern u32 sub_8030894(void);
extern void sub_8030F58(u32);

2
src/wonder_mail_2_1.c
View File

@ -9,6 +9,7 @@
#include "code_802C39C.h"
#include "menu_input.h"
#include "wonder_mail_2_1.h"
#include "code_80118A4.h"
extern struct unkStruct_203B2F0 *gUnknown_203B2F0;
extern struct unkStruct_203B2E8* gUnknown_203B2E8;
@ -103,7 +104,6 @@ extern void CreateRescueTitle(struct unkStruct_802C39C *);
extern void sub_802C6DC(void);
extern void DrawJobListMenu(void);
extern void PlayMenuSoundEffect(u32);
extern bool8 IsPelipperBoardSlotEmpty(u8);
extern void SetJobListState(u32);
extern void sub_802CC00(void);

4
src/wonder_mail_2_mid.c
View File

@ -9,13 +9,13 @@
#include "pokemon_mail.h"
#include "wonder_mail.h"
#include "code_802C39C.h"
#include "menu_input.h"
#include "menu_input.h"
#include "code_80118A4.h"
bool8 IsMailSlotEmpty(u8);
extern s32 CountPelipperBoardSlots(void);
extern void sub_802C328(void);
extern void DrawPelipperBoardJobMenu(void);
extern void PlayMenuSoundEffect(u32);
extern u8 HasNoPelipperBoardJobs(void);
extern struct WonderMail *GetPelipperBoardSlotInfo(u32);

3
src/wonder_mail_3.c
View File

@ -12,6 +12,7 @@
#include "code_80958E8.h"
#include "wonder_mail_2_1.h"
#include "code_80130A8.h"
#include "code_80118A4.h"
const struct UnkTextStruct2 gUnknown_80DFDD4 =
{
@ -150,7 +151,6 @@ extern void CreateRescueTitle(struct unkStruct_802C39C *);
extern u8 gUnknown_80DFDBC[];
extern void sub_802CF5C(void);
extern void sub_802CFD0(void);
extern void PlayMenuSoundEffect(u32);
extern void sub_802DF24(void);
extern void SetJobListState(u32);
@ -159,7 +159,6 @@ extern void ResetJobSlot(u8);
extern u8 HasNoAcceptedJobs(void);
u32 sub_802C598(u8 param_1);
extern void sub_802C688(void);
extern void PlaySound(u32);
extern u8 GetPelipperBoardSlotIndex(void);
extern struct UnkTextStruct2 gUnknown_80DFD8C;

3
src/wonder_mail_3_mid.c
View File

@ -11,6 +11,7 @@
#include "menu_input.h"
#include "code_802C39C.h"
#include "code_80130A8.h"
#include "code_80118A4.h"
struct unkStruct_803B344
{
@ -121,9 +122,7 @@ extern void PrintPokeNameToBuffer(u8 *buffer, struct PokemonStruct *pokemon);
extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern void sub_802F6FC(void);
extern void ProceedToNextRewardSceneState(void);
extern void PlayMenuSoundEffect(u32);
extern void sub_802F300(void);
extern void PlaySound(u32);
extern s32 sub_808D544(u32);
extern u32 sub_801B60C(u32, u8, u8);
extern void sub_8092578(u8 *buffer, u8 index, u8 r2);

2
src/wonder_mail_4.c
View File

@ -10,6 +10,7 @@
#include "constants/wonder_mail.h"
#include "code_802C39C.h"
#include "menu_input.h"
#include "code_80118A4.h"
struct unkStruct_203B320
{
@ -80,7 +81,6 @@ extern s32 sub_8030A74(void);
extern void sub_80308A0(void);
extern void sub_803092C(void);
extern void PlayMenuSoundEffect(u32);
extern void CreateRescueTitle(struct unkStruct_802C39C *);
u32 sub_80306A8(u32 wonderMailType, u32 r1, struct UnkTextStruct2_sub *r2, u32 r3)

2
src/wonder_mail_5.c
View File

@ -10,6 +10,7 @@
#include "code_800D090.h"
#include "code_802C39C.h"
#include "menu_input.h"
#include "code_80118A4.h"
struct unkStruct_203B324
{
@ -49,7 +50,6 @@ const u8 gUnknown_80E0938[] = "%-4d";
static const u8 wonder_mail_fill[] = "pksdir0";
extern void sub_8030DD4(void);
extern void PlayMenuSoundEffect(u32);
extern void CreateRescueDescription(struct unkStruct_802C39C *);
void sub_8030E2C(void);

2
src/wonder_mail_802DF88.c
View File

@ -7,6 +7,7 @@
#include "text1.h"
#include "text2.h"
#include "code_80130A8.h"
#include "code_80118A4.h"
struct unkStruct_203B2FC
{
@ -104,7 +105,6 @@ const struct UnkTextStruct2 gUnknown_80E0264 =
static const u8 wonder_mail_802DF88_fill1[] = "pksdir0";
extern void CreateRescueDescription(struct unkStruct_802C39C *);
extern void PlayMenuSoundEffect(u32);
extern void sub_802DC28(u32);
extern void sub_802F2C0(void);
extern void sub_802DC28(u32);

3
src/wonder_mail_main_menu.c
View File

@ -12,6 +12,7 @@
#include "code_801C620.h"
#include "code_801B3C0.h"
#include "cpu.h"
#include "code_80118A4.h"
#define SELECT_WONDER_MAIL_MODE_MAIN_SCREEN 0
#define SEND_WONDER_MAIL_MAIN_SCREEN 1
@ -134,9 +135,7 @@ extern void sub_8031E10(void);
extern u8 sub_800D588(void);
extern s32 sub_8037D64(u32, void *, void *);
extern s32 sub_80381F4(u32, void *, void *);
extern void sub_8011830(void);
extern void sub_80151C0(u32, u8 *);
extern void xxx_call_start_bg_music(void);
extern void sub_802EF48(void);
extern void sub_802D098(struct WonderMail *);