Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-04-26 00:32:20 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add MAX_PC_BOXES constant

Browse Source
This commit is contained in:
Rachel 2024-11-17 13:02:14 -08:00
parent 9d56c09cd7
commit 651edf3c14
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/unk_02048614.h
View File

@ -8,8 +8,8 @@ BOOL ScrCmd_0B7(ScriptContext *param0);
BOOL ScrCmd_0B8(ScriptContext *param0);
BOOL ScrCmd_0B9(ScriptContext *param0);
BOOL ScrCmd_0E4(ScriptContext *param0);
BOOL ScrCmd_StartTrainerBattle(ScriptContext *param0);
BOOL ScrCmd_StartTagBattle(ScriptContext *param0);
BOOL ScrCmd_StartTrainerBattle(ScriptContext *ctx);
BOOL ScrCmd_StartTagBattle(ScriptContext *ctx);
BOOL ScrCmd_0E7(ScriptContext *param0);
BOOL ScrCmd_0E8(ScriptContext *param0);
BOOL ScrCmd_0E9(ScriptContext *param0);
@ -19,7 +19,7 @@ BOOL ScrCmd_CheckWonBattle(ScriptContext *ctx);
BOOL ScrCmd_CheckLostBattle(ScriptContext *ctx);
BOOL ScrCmd_CheckDidNotCapture(ScriptContext *ctx);
BOOL ScrCmd_0EE(ScriptContext *param0);
BOOL ScrCmd_StartDummyTrainerBattle(ScriptContext *param0);
BOOL ScrCmd_StartDummyTrainerBattle(ScriptContext *ctx);
BOOL ScrCmd_0F0(ScriptContext *param0);
BOOL ScrCmd_0F1(ScriptContext *param0);
BOOL ScrCmd_314(ScriptContext *param0);

2
include/unk_020797C8.h
View File

@ -6,6 +6,8 @@
#include "pokemon.h"
#include "strbuf.h"
#define MAX_PC_BOXES 18
void PCBoxes_Init(PCBoxes *param0);
u32 PCBoxes_SaveSize(void);
BOOL sub_02079868(PCBoxes *param0, BoxPokemon *param1);

5
src/encounter.c
View File

@ -412,7 +412,8 @@ static BOOL FieldTask_WildEncounter(FieldTask *task)
if (GetRadarChainActive(fieldSystem->chain)) {
if (sub_02069798(fieldSystem->chain)) {
if ((!(encounter->dto->resultMask == BATTLE_RESULT_WIN)) && (!(encounter->dto->resultMask == BATTLE_RESULT_CAPTURED_MON))) {
if (encounter->dto->resultMask != BATTLE_RESULT_WIN
&& encounter->dto->resultMask != BATTLE_RESULT_CAPTURED_MON) {
RadarChain_Clear(fieldSystem->chain);
}
} else {
@ -519,7 +520,7 @@ static BOOL FieldTask_SafariEncounter(FieldTask *task)
PCBoxes *boxes = SaveData_PCBoxes(fieldSystem->saveData);
Party *party = Party_GetFromSavedata(fieldSystem->saveData);
if (PCBoxes_FirstEmptyBox(boxes) == 18 && Party_GetCurrentCount(party) == MAX_PARTY_SIZE) {
if (PCBoxes_FirstEmptyBox(boxes) == MAX_PC_BOXES && Party_GetCurrentCount(party) == MAX_PARTY_SIZE) {
ScriptManager_Start(task, 8822, NULL, NULL);
}
}

3
src/scrcmd.c
View File

@ -4918,9 +4918,8 @@ static BOOL ScrCmd_0F5(ScriptContext *ctx)
static BOOL ScrCmd_StartLinkBattle(ScriptContext *ctx)
{
PartyManagementData *partyManagementData;
void **partyManagementDataPtr = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
partyManagementData = *partyManagementDataPtr;
PartyManagementData *partyManagementData = *partyManagementDataPtr;
Encounter_NewVsLink(ctx->fieldSystem->task, partyManagementData->unk_2C, BATTLE_TYPE_LINK | BATTLE_TYPE_TRAINER);
Heap_FreeToHeap(partyManagementData);