ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-25 15:08:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed opening to summary screen SELECT

Browse Source
This commit is contained in:
TheXaman 2021-12-02 18:16:41 +01:00
parent cb1c753b63
commit a36445ea11
2 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/field_control_avatar.c
View File

@ -20,7 +20,6 @@
#include "metatile_behavior.h"
#include "overworld.h"
#include "pokemon.h"
#include "pokemon_debug.h"
#include "safari_zone.h"
#include "script.h"
#include "secret_base.h"
@ -131,14 +130,6 @@ void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
input->dpadDirection = DIR_WEST;
else if (heldKeys & DPAD_RIGHT)
input->dpadDirection = DIR_EAST;
#ifdef P_ENABLE_DEBUG
if ((heldKeys & R_BUTTON) && input->pressedStartButton)
{
input->input_field_1_2 = TRUE;
input->pressedStartButton = FALSE;
}
#endif
}
int ProcessPlayerFieldInput(struct FieldInput *input)
@ -198,21 +189,6 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
if (input->pressedSelectButton && UseRegisteredKeyItemOnField() == TRUE)
return TRUE;
#ifdef P_ENABLE_DEBUG
if (input->input_field_1_2)
{
//PlaySE(SE_WIN_OPEN);
//Debug_ShowMainMenu();
//PlayRainStoppingSoundEffect();
CleanupOverworldWindowsAndTilemaps();
SetMainCallback2(CB2_Debug_Pokemon);
return TRUE;
}
#endif
return FALSE;
}

10
src/pokemon_summary_screen.c
View File

@ -28,6 +28,7 @@
#include "palette.h"
#include "pokeball.h"
#include "pokemon.h"
#include "pokemon_debug.h"
#include "pokemon_storage_system.h"
#include "pokemon_summary_screen.h"
#include "region_map.h"
@ -1555,6 +1556,15 @@ static void Task_HandleInput(u8 taskId)
PlaySE(SE_SELECT);
BeginCloseSummaryScreen(taskId);
}
#ifdef P_ENABLE_DEBUG
else if (JOY_NEW(SELECT_BUTTON))
{
sMonSummaryScreen->callback = CB2_Debug_Pokemon;
StopPokemonAnimations();
PlaySE(SE_SELECT);
CloseSummaryScreen(taskId);
}
#endif
}
}