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

add more things to headers and clean up

Browse Source
This commit is contained in:
Seth Barberee 2023-08-07 15:08:53 -07:00
parent 092a13c017
commit c374c094d9
24 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/friend_area.h
View File

@ -23,6 +23,7 @@ void LoadFriendAreas(void);
bool8 *GetBoughtFriendAreas(void);
void InitializeFriendAreas(void);
u8 sub_80923D4(s32 target);
void sub_809249C(u8 friendArea, bool8 clear);
bool8 HasAllFriendAreas(void);
bool8 GetFriendAreaStatus(u8 index);
void UnlockFriendArea(u8 index);
@ -32,7 +33,7 @@ s32 GetFriendAreaPrice(u8 index);
void sub_8092578(u8 *buffer, u8 index, bool8 printPrice);
const char *GetFriendAreaName(u8 index);
void sub_809249C(u8 friendArea, u8 clear);
void sub_8092638(u8 friendArea, struct unkStruct_8092638 *param_2, u8 param_3, u8 param_4);
void sub_8092638(u8 friendArea, struct unkStruct_8092638 *param_2, bool8 checkLeader, bool8 checkDungeon);
u32 SaveFriendAreas(u8 *r0, u32 r1);
u32 ReadSavedFriendAreas(u8 *r0, s32 r1);

9
include/pokemon_3.h
View File

@ -10,11 +10,20 @@ struct EvolveStatus
s16 targetEvolveSpecies;
};
bool8 HasRecruitedMon(s16 species_);
s16 GetBaseSpecies(s16 index);
s16 GetBaseSpeciesNoUnown(s16 index);
bool8 TacticsTargetLeader(u8 tactic);
bool8 HasIQForSkill(s32 pokeIQ, u8 IQSkillIndex);
s32 GetNumAvailableIQSkills(u8 *iqSkillBuffer, s32 pokeIQ);
void CopyTacticsNameToBuffer(char *buffer, u8 tactic);
u8 *GetIQSkillName(u8 skill);
u8 *GetIQSkillDescription(u8 skill);
u8 *GetTacticsDescription(u8 tactic);
void ToggleIQSkill(u8 *param_1, u32 skillIndex);
void SetIQSkill(u8 *param_1, u32 skillIndex);
bool8 IsIQSkillSet(u8 *IQSkillFlags, u32 IQSkill);
void SetDefaultIQSkills(u8 *param_1, bool8 enableSelfCurer);
void sub_808F468(struct PokemonStruct *param_1, struct EvolveStatus *evolveStatus, u8 param_3);
u32 sub_808F734(struct PokemonStruct *pokemon, s16 _species);

2
include/wigglytuff_shop.h
View File

@ -68,7 +68,7 @@ enum WigglytuffStates
bool8 sub_80211AC(u32 mode, u32 param_2);
bool8 sub_8021774(u8 friendArea, bool8 param_2, s32 param_3);
u32 sub_8021274(u8 param_1);
u32 sub_8021274(bool8 param_1);
u8 sub_802132C(void);
void sub_8021354(bool8 param_1);
void sub_80213A0(void);

3
src/code_80118A4.c
View File

@ -10,8 +10,7 @@
#include "config.h"
#include "game_options.h"
#include "sprite.h"
extern bool8 sub_80023E4(u8);
#include "event_flag.h"
extern struct GameOptions *gGameOptionsRef;

9
src/code_801C620.c
View File

@ -153,9 +153,9 @@ 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 char * GetIQSkillDescription(u8 r0);
extern s32 GetNumAvailableIQSkills(u8 *param_1, s32 pokeIQ);
extern char * GetIQSkillName(u8 r0);
extern void PlayMenuSoundEffect(u32);
extern void sub_8013C68(u32 *);
extern void xxx_format_and_draw(u32, u32, const u8 *, u32, u32);
extern u32 sub_80095E4(s16, u32);
extern void sub_801C440(void);
extern void sub_801C4C8(void);
@ -170,7 +170,6 @@ void sub_801C6E4(void);
void sub_801C848(void);
u32 sub_801C308(u8);
void ToggleIQSkill(u8 *param_1, u32 skillIndex);
s32 sub_801C390(void);
void sub_801C3F8(void);
@ -1266,4 +1265,4 @@ void sub_801D220(void)
ResetUnusedInputStruct();
sub_800641C(gUnknown_203B250->unkB8, 1, 1);
}
}

2
src/code_801D760.c
View File

@ -18,6 +18,7 @@
#include "code_8021774.h"
#include "code_80118A4.h"
#include "wigglytuff_shop.h"
#include "event_flag.h"
struct unkStruct_203B258
{
@ -104,7 +105,6 @@ struct unk_203B250 *gUnknown_203B250;
extern bool8 HasNoAcceptedJobs(void);
extern bool8 sub_8024108(u32);
extern bool8 sub_8096E2C(void);
extern bool8 sub_80023E4(u32);
extern u32 sub_801DCC4(void);
extern u32 sub_8027074(void);
extern void sub_80227B8(struct PokemonStruct *);

2
src/code_801EE10_1.c
View File

@ -9,6 +9,7 @@
#include "text_util.h"
#include "menu_input.h"
#include "code_80118A4.h"
#include "event_flag.h"
struct unkStruct_203B2AC
{
@ -49,7 +50,6 @@ extern struct unkStruct_3001B60 *gUnknown_3001B60;
extern struct UnkTextStruct2 gUnknown_80DC9B0;
extern struct UnkTextStruct2 gUnknown_80DC9C8;
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);

8
src/code_8023144.c
View File

@ -17,6 +17,7 @@
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "code_80118A4.h"
#include "exclusive_pokemon.h"
struct unkStruct_3001B5C
{
@ -47,7 +48,6 @@ extern struct UnkTextStruct2 gUnknown_80DC904;
void sub_8023758(void);
void sub_80237E0(void);
extern bool8 sub_8098134(s32);
extern void sub_8023730(void);
extern u8 sub_8023704(u8);
extern void sub_8023420(void);
@ -68,7 +68,7 @@ extern void sub_801B048(void);
void GetGummiItemStatBoost(struct PokemonStruct* pokemon, u8 id, bool8 checkBoostFlags, struct Gummi* gummi);
extern void sub_8099690(u32);
s32 GetNumAvailableIQSkills(u8 *iqSkillBuffer, s32 pokeIQ);
extern void sub_801A928(void);
void sub_8022D2C(void) {
s32 index;
@ -460,7 +460,7 @@ void sub_8023420(void)
extern u8 gUnknown_80DC934[];
bool8 HasRecruitedMon(s16 species_);
extern void sub_8008C54(u32);
extern u8 gUnknown_80DC93C[];
void sub_80234BC(void)
@ -485,7 +485,7 @@ void sub_80234BC(void)
{
y = sub_8013800(&gUnknown_3001B5C->input,index);
species = gUnknown_3001B5C->unkC[(gUnknown_3001B5C->input.unk1E * gUnknown_3001B5C->input.unk1C + index)];
sub_8092638(GetFriendArea(species),&auStack_2c,0,0);
sub_8092638(GetFriendArea(species),&auStack_2c,FALSE,FALSE);
color = COLOR_WHITE_2;
if (auStack_2c.hasFriendArea) {
color = HasRecruitedMon(species) ? COLOR_CYAN : COLOR_GREEN;

6
src/code_803B050.c
View File

@ -1,5 +1,8 @@
#include "global.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "event_flag.h"
#include "exclusive_pokemon.h"
extern s16 gUnknown_80E8126[];
@ -7,9 +10,6 @@ extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern struct PokemonStruct *sub_808D378(void);
extern bool8 sub_803C0DC(s16);
extern bool8 sub_8098134(s16);
extern s16 GetBaseSpecies(s16);
extern bool8 sub_80023E4(u32);
bool8 sub_803C110(s16 index)
{

2
src/code_8057824_1.c
View File

@ -13,6 +13,7 @@
#include "friend_area.h"
#include "item.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "position_util.h"
#include "exclusive_pokemon.h"
@ -330,7 +331,6 @@ extern void IncreaseEntityPixelPos(struct Entity *, u32, u32);
extern void sub_8042B0C(struct Entity *);
extern void DisplayDungeonDialogue(u32 *);
extern void sub_803E708(u32, u32);
extern u8 HasRecruitedMon(u32);
extern u8 sub_806FD18(struct Entity *);
extern void sub_80861D4(struct Entity *, u32, s32 direction);
extern void sub_806FDF4(struct Entity *, struct Entity *, struct Entity **);

3
src/code_8086A3C.c
View File

@ -7,13 +7,12 @@
#include "dungeon_music.h"
#include "dungeon_pokemon_attributes.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "dungeon_util_1.h"
#include "dungeon_util.h"
#include "exclusive_pokemon.h"
extern void SetDefaultIQSkills(u8 *param_1, u8 param_2);
extern u8 sub_8044B28(void);
extern u8 HasRecruitedMon(u32);
extern u8 gUnknown_202E038[];
extern void sub_8085374();
extern void sub_80855E4(void *);

2
src/code_80958E8.c
View File

@ -8,10 +8,10 @@
#include "dungeon.h"
#include "code_80958E8.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "code_8094F88.h"
extern bool8 sub_809017C(struct DungeonLocation *);
extern s16 GetBaseSpecies(s16);
extern u8 sub_803C1D0(struct DungeonLocation *, u8);
extern bool8 sub_803C0DC(s16);
extern void ResetMailboxSlot(u8);

2
src/code_80A26CC.c
View File

@ -1,7 +1,7 @@
#include "global.h"
#include "code_80A26CC.h"
#include "event_flag.h"
extern bool8 sub_80023E4(u32);
extern u8 sub_80973F4(s16);
extern u8 sub_8097384(s16);
s16 sub_80A26B8(s16);

3
src/event_flag.c
View File

@ -11,6 +11,8 @@
#include "friend_area.h"
#include "team_inventory.h"
#include "code_8097670.h"
#include "pokemon.h"
#include "pokemon_3.h"
extern u8 gUnknown_2000A88[0x400];
@ -51,7 +53,6 @@ extern u32 sub_8001658(u32, s32);
extern void sub_80018D8(u32, u32, u32);
extern void sub_809733C(u32, u32);
extern void sub_80973A8(u32, u32);
extern u8 HasRecruitedMon(u32);
extern void sub_800199C(u32, s32, u32, s32);
extern s32 sub_8001784(u32, s32, u16);

8
src/friend_area.c
View File

@ -464,7 +464,7 @@ NAKED void sub_8092404(u8 r0, u16 *r1, bool8 r2, bool8 r3)
}
#endif
void sub_809249C(u8 friendArea, u8 clear)
void sub_809249C(u8 friendArea, bool8 clear)
{
s32 index;
bool32 dungeonCheck;
@ -558,7 +558,7 @@ bool8 HasAllFriendAreas(void)
return TRUE;
}
void sub_8092638(u8 friendArea, struct unkStruct_8092638 *param_2, u8 param_3, u8 param_4)
void sub_8092638(u8 friendArea, struct unkStruct_8092638 *param_2, bool8 checkLeader, bool8 checkDungeon)
{
struct PokemonStruct *pokeStruct;
s32 counter;
@ -582,8 +582,8 @@ void sub_8092638(u8 friendArea, struct unkStruct_8092638 *param_2, u8 param_3, u
{
pokeStruct = &gRecruitedPokemonRef->pokemon[iVar4];
if (((((u8)pokeStruct->unk0 & 1) != 0) &&
((param_3 == 0 || (!pokeStruct->isTeamLeader)))) &&
((param_4 == 0 || ((pokeStruct->dungeonLocation).id != DUNGEON_JOIN_LOCATION_PARTNER)))) {
((checkLeader == 0 || (!pokeStruct->isTeamLeader)))) &&
((checkDungeon == 0 || ((pokeStruct->dungeonLocation).id != DUNGEON_JOIN_LOCATION_PARTNER)))) {
param_2->unk2++;
}
}

2
src/friend_area_action_menu_1.c
View File

@ -12,6 +12,7 @@
#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;
@ -25,7 +26,6 @@ extern void sub_8099690(u32);
extern void sub_8027EB8();
extern void sub_808D31C(struct PokemonStruct *);
extern bool8 sub_80023E4(u32);
extern struct PokemonStruct *sub_808D3F8(void);
extern struct PokemonStruct *sub_808D3BC(void);
extern u32 sub_801F890(void);

5
src/friend_list_menu.c
View File

@ -14,6 +14,7 @@
#include "code_8012A18_1.h"
#include "code_801B3C0.h"
#include "code_80118A4.h"
#include "event_flag.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
@ -137,7 +138,9 @@ extern void sub_801F808(u16 *);
extern void sub_8099690(u32);
extern void sub_801F8D0(void);
extern u32 sub_801F890(void);
extern bool8 sub_80023E4(u32);
extern void sub_80160D8(void);
extern u32 sub_8016080(void);
extern s32 sub_80144A4(s32 *);
void sub_8025434(s32);
void sub_802544C(void);

2
src/load_screen.c
View File

@ -14,6 +14,7 @@
#include "code_800D090.h"
#include "code_8094F88.h"
#include "menu_input.h"
#include "event_flag.h"
extern const struct FileArchive gTitleMenuFileArchive;
@ -44,7 +45,6 @@ void sub_80397B4(void);
extern void sub_80920D8(u8 *);
extern struct PokemonStruct *GetPlayerPokemonStruct(void);
extern bool8 sub_80023E4(u32);
extern u8 *sub_8098FB4();
extern u8 *GetDungeonLocationInfo(void);
extern u32 GetNumAdventures(void);

2
src/party_list_menu.c
View File

@ -15,6 +15,7 @@
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "code_80118A4.h"
#include "event_flag.h"
struct unkStruct_203B2B8
{
@ -165,7 +166,6 @@ ALIGNED(4) static const u8 fill0[] = "pksdir0";
extern u32 sub_8026F04(struct PokemonStruct *);
extern void sub_8026074(s32);
bool8 CanTakePokemonHeldItem(struct PokemonStruct *r0);
extern bool8 sub_80023E4(u8);
extern struct PokemonStruct *sub_808D3F8(void);
extern struct PokemonStruct *sub_808D3BC(void);
extern void sub_801F214(void);

25
src/pokemon_3.c
View File

@ -13,8 +13,8 @@
#include "luminous_cave.h"
extern u8 *gIQSkillNames[];
extern u32 gIQSkillDescriptions[];
extern u32 gTacticsDescriptions[];
extern u8 *gIQSkillDescriptions[];
extern u8 *gTacticsDescriptions[];
extern u8 *gTactics[];
extern bool8 gTacticsTargetLeader[];
@ -60,7 +60,6 @@ extern void sub_809447C(struct unkStruct_8094924*, void*);
extern void sub_808F428(struct unkStruct_8094924*, struct unkStruct_808E6F4*);
s16 GetPokemonEvolveConditions(s16 index, struct unkEvolve *r1);
void sub_8092638(u8 friendArea, struct unkStruct_8092638 *param_2, u8 param_3, u8 param_4);
u32 sub_808F798(struct PokemonStruct *, s16);
void sub_8097848(void);
@ -120,7 +119,7 @@ bool8 HasRecruitedMon(s16 species_) {
return FALSE;
}
s32 GetBaseSpecies(s16 index) {
s16 GetBaseSpecies(s16 index) {
if (index == MONSTER_CASTFORM_SNOWY)
return MONSTER_CASTFORM;
if (index == MONSTER_CASTFORM_SUNNY)
@ -462,24 +461,24 @@ void sub_808E9EC(struct PokemonStruct *r0, struct unkStruct_808E9EC *r1)
}
#endif
u8 *GetIQSkillName(u8 r0)
u8 *GetIQSkillName(u8 skill)
{
return gIQSkillNames[r0];
return gIQSkillNames[skill];
}
void CopyTacticsNameToBuffer(char *r0, u8 r1)
void CopyTacticsNameToBuffer(char *buffer, u8 tactic)
{
strncpy(r0, gTactics[r1], 0x14);
strncpy(buffer, gTactics[tactic], 0x14);
}
u32 GetIQSkillDescription(u8 r0)
u8 *GetIQSkillDescription(u8 skill)
{
return gIQSkillDescriptions[r0];
return gIQSkillDescriptions[skill];
}
u32 GetTacticsDescription(u8 r0)
u8 *GetTacticsDescription(u8 tactic)
{
return gTacticsDescriptions[r0];
return gTacticsDescriptions[tactic];
}
bool8 TacticsTargetLeader(u8 tactic)
@ -952,7 +951,7 @@ void sub_808F468(struct PokemonStruct *param_1, struct EvolveStatus *evolveStatu
if ((evolveConditions.preEvolution.evolveType == EVOLVE_TYPE_NONE) || (param_1->speciesNum != evolveConditions.preEvolution.evolveFrom)) continue;
friendArea = ((u8 (*)(s32))GetFriendArea)(index2); // UB
uVar2 = GetFriendArea(param_1->speciesNum);
sub_8092638(friendArea,&local_40,0,0);
sub_8092638(friendArea,&local_40,FALSE,FALSE);
if (!local_40.hasFriendArea) {
evolveStatus->evolutionConditionStatus |= EVOLUTION_LACK_FRIEND_AREA;
evolFlag = TRUE;

2
src/pokemon_mid.c
View File

@ -1,5 +1,6 @@
#include "global.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "file_system.h"
#include "item.h"
#include "moves.h"
@ -29,7 +30,6 @@ extern u16 gLevelCurrentPokeId;
extern struct LevelData gLevelCurrentData[];
extern s16 GetBaseSpecies(s16);
extern int sprintf(char *, const char *, ...);
extern u32 ReturnIntFromChar(u8 r0);
extern void CopyAndResetMoves(void*, void*);

2
src/rescue_team_info.c
View File

@ -2,11 +2,11 @@
#include "rescue_team_info.h"
#include "code_8092334.h"
#include "text_util.h"
#include "event_flag.h"
EWRAM_DATA_2 struct RescueTeamData *gRescueTeamInfoRef = {0};
EWRAM_DATA struct RescueTeamData gRescueTeamInfo = {0};
extern bool8 sub_80023E4(u32);
extern void BoundedCopyStringtoBuffer(u8 *buffer, u8 *string, s32 size);
extern const u8 *gRescueTeamRanks[];

8
src/wigglytuff_shop.c
View File

@ -162,9 +162,9 @@ bool8 sub_80211AC(u32 mode, u32 param_2)
}
}
u32 sub_8021274(u8 param_1)
u32 sub_8021274(bool8 param_1)
{
if (param_1 == 0) {
if (!param_1) {
sub_8013660(&gUnknown_203B280->unk40);
return 0;
}
@ -563,7 +563,7 @@ void sub_8021A60(void)
gUnknown_203B28C->unk30[sVar4] = 1;
}
}
for(index = 0; index < 0x19d; index++)
for(index = 0; index < NUM_MONSTERS; index++)
{
pokeStruct = &gRecruitedPokemonRef->pokemon[index];
if (((*(u8 *)&pokeStruct->unk0 & 1) != 0) &&
@ -816,7 +816,7 @@ void UpdateWigglytuffDialogue(void)
sub_8023354(1);
break;
case DISPLAY_POKEMON_FRIEND_AREA_INFO:
sub_8092638(gWigglytuffShop->chosenFriendArea,&uStack_14,0,0);
sub_8092638(gWigglytuffShop->chosenFriendArea,&uStack_14,FALSE,FALSE);
if (uStack_14.hasFriendArea) {
gWigglytuffShop->fallbackState = WIGGLYTUFF_CHECK_HAS_FRIEND_AREA;
}

2
src/wonder_mail_2.c
View File

@ -12,6 +12,7 @@
#include "code_8094F88.h"
#include "menu_input.h"
#include "code_80130A8.h"
#include "event_flag.h"
struct unkStruct_203B2C8
{
@ -52,7 +53,6 @@ extern void sub_802B624(void);
extern void sub_802F204(struct unkStruct_802F204 *, u32);
extern void sub_803C37C(struct DungeonLocation *, u32, u8 *);
extern u32 GetDungeonTeamRankPts(struct DungeonLocation *, u32);
extern bool8 sub_80023E4(u32);
ALIGNED(4) const char gRescueTeamNamePlaceholder[] = "????";