ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 04:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2356 from LOuroboros/PeeC

Browse Source 
Modified the debug menu's PC access
This commit is contained in:
Eduardo Quezada D'Ottone 2022-09-24 22:18:21 -03:00 committed by GitHub
commit 13573b6e53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/debug.c
View File

@ -2805,9 +2805,8 @@ static void Task_WaitFadeAccessPC(u8 taskId)
static void DebugAction_AccessPC(u8 taskId) static void DebugAction_AccessPC(u8 taskId)
{ {
Debug_DestroyMenu_Full(taskId); Debug_DestroyMenu_Full(taskId);
CleanupOverworldWindowsAndTilemaps(); LockPlayerFieldControls();
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); ScriptContext_SetupScript(EventScript_PC);
CreateTask(Task_WaitFadeAccessPC, 0);
} }

18
src/field_specials.c
View File

@ -953,9 +953,22 @@ void FieldShowRegionMap(void)
SetMainCallback2(CB2_FieldShowRegionMap); SetMainCallback2(CB2_FieldShowRegionMap);
} }
static bool8 IsPlayerInFrontOfPC(void)
{
u16 x, y;
u16 tileInFront;
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
tileInFront = MapGridGetMetatileIdAt(x, y);
return (tileInFront == METATILE_BrendansMaysHouse_BrendanPC_Off
|| tileInFront == METATILE_BrendansMaysHouse_MayPC_Off
|| tileInFront == METATILE_Building_PC_Off);
}
void DoPCTurnOnEffect(void) void DoPCTurnOnEffect(void)
{ {
if (FuncIsActiveTask(Task_PCTurnOnEffect) != TRUE) if (FuncIsActiveTask(Task_PCTurnOnEffect) != TRUE && IsPlayerInFrontOfPC() == TRUE)
{ {
u8 taskId = CreateTask(Task_PCTurnOnEffect, 8); u8 taskId = CreateTask(Task_PCTurnOnEffect, 8);
gTasks[taskId].data[0] = 0; gTasks[taskId].data[0] = 0;
@ -1041,6 +1054,9 @@ static void PCTurnOffEffect(void)
s8 dy = 0; s8 dy = 0;
u16 tileId = 0; u16 tileId = 0;
u8 playerDirection = GetPlayerFacingDirection(); u8 playerDirection = GetPlayerFacingDirection();
if (IsPlayerInFrontOfPC() == TRUE)
return;
switch (playerDirection) switch (playerDirection)
{ {
case DIR_NORTH: case DIR_NORTH: