Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2025-03-01 17:46:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #333 from DizzyEggg/dungeon_names
Some checks failed
GithubCI / build (push) Has been cancelled
Details

Browse Source 
Rename xxx_dungeon_8042F6C to RunDungeon
This commit is contained in:
AnonymousRandomPerson 2025-02-20 20:33:04 -05:00 committed by GitHub
commit feff193221
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/structs/str_dungeon_8042F6C.h
View File

@ -6,7 +6,7 @@
#include "structs/str_pokemon.h"
#include "structs/str_wonder_mail.h"
struct UnkStruct_xxx_dungeon_8042F6C
struct UnkStruct_RunDungeon
{
u8 unk0;
DungeonLocation unk4;
@ -30,7 +30,7 @@ struct UnkStruct_xxx_dungeon_8042F6C
WonderMailSub unk84;
};
void xxx_dungeon_8042F6C(struct UnkStruct_xxx_dungeon_8042F6C *r8);
void RunDungeon(struct UnkStruct_RunDungeon *r8);
#endif // GUARD_STR_DUNGEON_8042F6C_H

10
src/code.c
View File

@ -31,7 +31,7 @@ extern void sub_808ED00();
extern void SetDungeonLocationInfo(DungeonLocation *dl);
extern void sub_808CE74(s16, bool32, u8*);
void xxx_dungeon_8001340(struct UnkStruct_xxx_dungeon_8042F6C *r0);
void xxx_dungeon_8001340(struct UnkStruct_RunDungeon *r0);
void sub_80011E8(u8 *param_1);
void sub_809542C(WonderMailSub *param_1);
@ -53,7 +53,7 @@ EWRAM_INIT struct PersonalityRelated gPersonalityRelated_203B040 = {
.PartnerNick = {""},
};
void SaveLoadRelated_8000EDC(struct UnkStruct_xxx_dungeon_8042F6C *param_1)
void SaveLoadRelated_8000EDC(struct UnkStruct_RunDungeon *param_1)
{
u8 quickSaveValid;
s32 quickSaveStatus;
@ -267,7 +267,7 @@ void NDS_LoadOverlay_GroundMain()
}
void nullsub_2(struct UnkStruct_xxx_dungeon_8042F6C *r0)
void nullsub_2(struct UnkStruct_RunDungeon *r0)
{
}
@ -277,10 +277,10 @@ u32 xxx_script_related_8001334(u32 r0)
return xxx_script_related_8098468(r0);
}
void xxx_dungeon_8001340(struct UnkStruct_xxx_dungeon_8042F6C *r0)
void xxx_dungeon_8001340(struct UnkStruct_RunDungeon *r0)
{
nullsub_2(r0);
xxx_dungeon_8042F6C(r0);
RunDungeon(r0);
NDS_LoadOverlay_GroundMain();
}

9
src/code_8042B34.c
View File

@ -345,7 +345,7 @@ extern s32 gDungeonBrightness;
extern Entity *gLeaderPointer;
void EnforceMaxItemsAndMoney(void);
void sub_8043FD0(void);
static void sub_8043FD0(void);
void sub_806B404(void);
u8 GetFloorType(void);
@ -362,7 +362,8 @@ extern const s16 gUnknown_80F6850[4];
extern OpenedFile *gDungeonNameBannerPalette;
void xxx_dungeon_8042F6C(struct UnkStruct_xxx_dungeon_8042F6C *r8)
// This functions is the main 'loop' when the player is in a Dungeon. It runs from the moment the player enters a dungeon, until they leave(by completing or by fainting).
void RunDungeon(struct UnkStruct_RunDungeon *r8)
{
bool8 check;
Entity *leader;
@ -1074,10 +1075,10 @@ bool8 sub_8043ED0(bool8 a0)
return ret;
}
void sub_8043FD0(void)
static void sub_8043FD0(void)
{
s32 level;
for (level = 2; level < 6; level++) {
for (level = 2; level <= 5; level++) {
s32 i, monId, movesCount;
for (monId = 0; monId < NUM_MONSTERS; monId++) {
PokemonStruct1 *monStruct = &gRecruitedPokemonRef->pokemon[monId];