Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-18 16:53:54 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in the dungeon requirement text function

Browse Source
This commit is contained in:
DizzyEggg 2025-06-20 14:08:16 +02:00
parent e63bcb8f28
commit 4bbabbe2e6
5 changed files with 54 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/dungeon_info.h
View File

@ -18,7 +18,12 @@ void PrintYellowDungeonNametoBuffer(u8 *buffer, DungeonLocation *dungeonLocation
void PrintDungeonLocationtoBuffer(u8 *buffer, DungeonLocation *dungeonLocation);
void GeneralizeMazeDungeonLoc(DungeonLocation *dst, const DungeonLocation *src);
u32 sub_809034C(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 param_4_, bool32 param_5_);
#define DUNGEON_REQUIREMENTS_PASS 0
#define DUNGEON_REQUIREMENTS_FAIL 1
#define DUNGEON_REQUIREMENTS_ASK 2
u32 BufferDungeonRequirementsText(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 param_4_, bool32 param_5_);
u32 GetDungeonLocMissionDifficulty(DungeonLocation *dungeon);
u8 GetRandomItemForValidDungeonLoc(DungeonLocation *dungeon, u32 param_2);
bool8 IsNotValidDungeon(u8 dungeon);

5
include/global.h
View File

@ -50,6 +50,11 @@ static inline u8 *InlineStrncpy(u8 *dst, const u8 *src, s32 n)
return strncpy(dst, src, n);
}
static inline u8 *InlineStrcat(u8 *dst, u8 *src)
{
return strcat(dst, src);
}
static inline bool8 AreStringsDifferent(const u8 *str1, const u8 *str2)
{
return strcmp(str1, str2) != 0;

78
src/dungeon_info.c
View File

@ -2536,14 +2536,10 @@ bool8 DoEnemiesEvolveWhenKOed(u8 dungeon)
return gDungeons[dungeon].enemiesEvolveWhenKOed;
}
// Needed to match.
static inline void AddNewLine(const u8 *str, u8 *buffer, u8 *newLine)
{
FormatString(str, buffer, newLine, 0);
}
#define TXT_BUFFER_LEN 200
// I think this checks if the dungeon HM requirement is met
u32 sub_809034C(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 requireHm_, bool32 param_5_)
// This checks if the dungeon requirements are met. (For example HMs)
u32 BufferDungeonRequirementsText(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 requireHm_, bool32 param_5_)
{
s32 maxPartyMembers, i;
@ -2554,9 +2550,9 @@ u32 sub_809034C(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 requireHm_,
s32 numInvSlots = GetNumberOfFilledInventorySlots();
s32 counter = 0;
s32 sp_0xf0;
bool8 sp_0xf4 = FALSE;
bool8 r8 = FALSE;
u8 text[200];
bool8 requirementsAsk = FALSE;
bool8 requirementFailed = FALSE;
u8 text[TXT_BUFFER_LEN];
u8 newLine[2];
newLine[0] = '\n';
@ -2581,22 +2577,22 @@ u32 sub_809034C(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 requireHm_,
}
if (counter > maxPartyMembers) {
if (maxPartyMembers == 1) {
AddNewLine(gText_OnlyOneMonMayEnterDungeon,text,newLine);
FormatString(gText_OnlyOneMonMayEnterDungeon,text,&text[TXT_BUFFER_LEN], 0);
}
else {
gFormatArgs[0] = counter - maxPartyMembers;
AddNewLine(gText_TooManyMembersToEnterDungeon,text,newLine);
FormatString(gText_TooManyMembersToEnterDungeon,text,&text[TXT_BUFFER_LEN], 0);
}
AppendWithNewLines(buffer,text);
r8 = TRUE;
requirementFailed = TRUE;
}
if (gDungeons[dungeonIndex].maxItemsAllowed != 0 && gDungeons[dungeonIndex].maxItemsAllowed < numInvSlots) {
gFormatArgs[0] = gDungeons[dungeonIndex].maxItemsAllowed;
gFormatArgs[1] = numInvSlots - gDungeons[dungeonIndex].maxItemsAllowed;
AddNewLine((!r8) ? gText_OnlyXItemsMayBeBroughtIntoDungeon : gText_AlsoOnlyXItemsMayBeBroughtIntoDungeon, text, newLine);
FormatString((requirementFailed) ? gText_AlsoOnlyXItemsMayBeBroughtIntoDungeon : gText_OnlyXItemsMayBeBroughtIntoDungeon, text, &text[TXT_BUFFER_LEN], 0);
AppendWithNewLines(buffer,text);
r8 = TRUE;
requirementFailed = TRUE;
}
if (speciesId != MONSTER_NONE) {
@ -2604,9 +2600,9 @@ u32 sub_809034C(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 requireHm_,
CopyCyanMonsterNametoBuffer(gFormatBuffer_Monsters[0],speciesId);
if (counter > 3) {
AddNewLine((!r8) ? gText_ClientCouldNotJoinTooManyMembers : gText_AlsoClientCouldNotJoinTooManyMembers, text,newLine);
FormatString((requirementFailed) ? gText_AlsoClientCouldNotJoinTooManyMembers : gText_ClientCouldNotJoinTooManyMembers, text, &text[TXT_BUFFER_LEN], 0);
AppendWithNewLines(buffer,text);
r8 = TRUE;
requirementFailed = TRUE;
}
bodySize = GetBodySize(speciesId);
for (i = 0; i < NUM_MONSTERS; i++) {
@ -2617,31 +2613,31 @@ u32 sub_809034C(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 requireHm_,
}
}
if (bodySize > 6) {
AddNewLine((!r8) ? gText_ClientCouldNotJoinNoSpace : gText_AlsoClientCouldNotJoinNoSpace, text,newLine);
FormatString((requirementFailed) ? gText_AlsoClientCouldNotJoinNoSpace : gText_ClientCouldNotJoinNoSpace, text, &text[TXT_BUFFER_LEN], 0);
AppendWithNewLines(buffer,text);
r8 = TRUE;
requirementFailed = TRUE;
}
}
if (requireHm) {
s32 i;
u16 movesNeeded[4] = {MOVE_FLY, MOVE_DIVE, MOVE_WATERFALL, MOVE_SURF};
u8 hmsNeeded[4] = {ITEM_HM_FLY, ITEM_HM_DIVE, ITEM_HM_WATERFALL, ITEM_HM_SURF};
u16 movesNeeded[MAX_MON_MOVES] = {MOVE_FLY, MOVE_DIVE, MOVE_WATERFALL, MOVE_SURF};
u8 hmsNeeded[MAX_MON_MOVES] = {ITEM_HM_FLY, ITEM_HM_DIVE, ITEM_HM_WATERFALL, ITEM_HM_SURF};
for (i = 0; i < 4; i++) {
for (i = 0; i < MAX_MON_MOVES; i++) {
if ((((gDungeons[dungeonIndex].HMMask >> (i) & 1) != 0) && !TeamMonWithMove(movesNeeded[i])) && GetItemPossessionCount(hmsNeeded[i]) == 0) {
break;
}
}
if (i < 4) {
if (i < MAX_MON_MOVES) {
struct Move move;
InitPokemonMove(&move,movesNeeded[i]);
BufferMoveName(gFormatBuffer_Items[0],&move,0);
AddNewLine((!r8) ? gText_MustHaveMonWithMove : gText_AlsoMustHaveMonWithMove, text,newLine);
FormatString((requirementFailed) ? gText_AlsoMustHaveMonWithMove : gText_MustHaveMonWithMove, text, &text[TXT_BUFFER_LEN], 0);
AppendWithNewLines(buffer,text);
r8 = TRUE;
requirementFailed = TRUE;
}
}
@ -2663,60 +2659,60 @@ u32 sub_809034C(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 requireHm_,
}
}
if (otherSpeciesId == NUM_MONSTERS) {
AddNewLine((!r8) ? gText_MustHaveWaterTypeMon : gText_AlsoMustHaveWaterTypeMon, text,newLine);
FormatString((requirementFailed) ? gText_AlsoMustHaveWaterTypeMon : gText_MustHaveWaterTypeMon, text, &text[TXT_BUFFER_LEN], 0);
AppendWithNewLines(buffer,text);
r8 = TRUE;
requirementFailed = TRUE;
}
}
}
if (r8) {
return 1;
if (requirementFailed) {
return DUNGEON_REQUIREMENTS_FAIL;
}
if ((!gDungeons[dungeonIndex].enterWithoutGameSave) || (param_5)) {
if (!sp_0xf4) {
if (!requirementsAsk) {
strcpy(buffer,gText_IsOkToEnterWithFollowingRules);
strcat(buffer,newLine);
sp_0xf4 = TRUE;
requirementsAsk = TRUE;
}
strcat(buffer,gText_GameWilllBeSavedBeforeEntering);
strcat(buffer,newLine);
}
if (gDungeons[dungeonIndex].levelResetTo1) {
if (!sp_0xf4) {
if (!requirementsAsk) {
strcpy(buffer,gText_IsOkToEnterWithFollowingRules);
strcat(buffer,newLine);
sp_0xf4 = TRUE;
requirementsAsk = TRUE;
}
strcat(buffer,gText_TeamWillEnterAtLv1);
strcat(buffer,newLine);
}
if ((gDungeons[dungeonIndex].maxItemsAllowed == 0) && (numInvSlots + sp_0xf0 != 0)) {
if (!sp_0xf4) {
if (!requirementsAsk) {
strcpy(buffer,gText_IsOkToEnterWithFollowingRules);
strcat(buffer,newLine);
sp_0xf4 = TRUE;
requirementsAsk = TRUE;
}
strcat(buffer,gText_AllItemsLostOnEntering);
strcat(buffer,newLine);
}
if ((!gDungeons[dungeonIndex].keepMoney) && (gTeamInventoryRef->teamMoney != 0)) {
if (!sp_0xf4) {
if (!requirementsAsk) {
strcpy(buffer,gText_IsOkToEnterWithFollowingRules);
strcat(buffer,newLine);
sp_0xf4 = TRUE;
requirementsAsk = TRUE;
}
strcat(buffer, gText_AllMoneyLostOnEntering);
strcat(buffer,newLine);
InlineStrcat(buffer,newLine);
}
if (sp_0xf4) {
return 2;
if (requirementsAsk) {
return DUNGEON_REQUIREMENTS_ASK;
}
else {
sprintfStatic(buffer,_("No problem."));
return 0;
return DUNGEON_REQUIREMENTS_PASS;
}
}

4
src/ground_script.c
View File

@ -1043,7 +1043,7 @@ s16 HandleAction(Action *action, DebugLocation *debug)
s32 val;
sub_8099220(&unkStruct, dungeonEnter);
val = sub_80023E4(6);
res = sub_809034C(unkStruct.sub0.unk0.id, 0, gUnknown_203B4B0, val, 0);
res = BufferDungeonRequirementsText(unkStruct.sub0.unk0.id, 0, gUnknown_203B4B0, val, FALSE);
gUnknown_2039DA4 = res;
switch (res) {
case 2: {
@ -1085,7 +1085,7 @@ s16 HandleAction(Action *action, DebugLocation *debug)
u32 res;
ret = GetMailatIndex(GetScriptVarValue(NULL, 20));
val = sub_80023E4(6);
res = sub_809034C(ret->dungeonSeed.location.id, 0, gUnknown_203B4B0, val, 1);
res = BufferDungeonRequirementsText(ret->dungeonSeed.location.id, 0, gUnknown_203B4B0, val, TRUE);
gUnknown_2039DA4 = res;
switch (res) {
case 2: {

8
src/world_map.c
View File

@ -101,15 +101,15 @@ void ShowWorldMap_Async(struct WorldMapSetupStruct *setupPtr)
speciesId = 0;
}
dungeonEnter = sub_809034C(setupPtr->info.unk4.unk0.id, speciesId, text, setupPtr->info.unk6C, FALSE);
if (dungeonEnter == 0) {
dungeonEnter = BufferDungeonRequirementsText(setupPtr->info.unk4.unk0.id, speciesId, text, setupPtr->info.unk6C, FALSE);
if (dungeonEnter == DUNGEON_REQUIREMENTS_PASS) {
setupPtr->dungeonEntered = TRUE;
}
else if (dungeonEnter == 1) {
else if (dungeonEnter == DUNGEON_REQUIREMENTS_FAIL) {
PrintDialogueMessage_Async(text);
setupPtr->dungeonEntered = FALSE;
}
else if (dungeonEnter == 2) {
else if (dungeonEnter == DUNGEON_REQUIREMENTS_ASK) {
if (PlayerEnterDungeonPrompt_Async(text)) {
setupPtr->dungeonEntered = TRUE;
}