atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add start menu funcs, credit deokishisu

Browse source
This commit is contained in:
ghoulslash 2023-03-03 09:08:05 -05:00
parent dfce7f1548
commit 7bb8115099
4 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/event_scripts.s
View file

@ -691,6 +691,7 @@ EventScript_BackupMrBrineyLocation:: @ 8271E95
.include "data/scripts/set_gym_trainers.inc"
EventScript_CancelMessageBox::
special DoPicboxCancel
release
end

1
data/specials.inc
View file

@ -535,3 +535,4 @@ gSpecials:: @ 81DBA64
def_special RemoveRecordsWindow
def_special CloseDeptStoreElevatorWindow
def_special TrySetBattleTowerLinkType
def_special DoPicboxCancel

12
src/field_control_avatar.c
View file

@ -1103,6 +1103,16 @@ static const u8 *GetSignpostScriptAtMapPosition(struct MapPosition *position)
return EventScript_TestSignpostMsg;
}
static void Task_OpenStartMenu(u8 taskId)
{
if (!ArePlayerFieldControlsLocked())
{
PlaySE(SE_WIN_OPEN);
ShowStartMenu();
DestroyTask(taskId);
}
}
void FieldInput_HandleCancelSignpost(struct FieldInput *input)
{
if (ScriptContext1_IsScriptSetUp() == TRUE)
@ -1123,6 +1133,8 @@ void FieldInput_HandleCancelSignpost(struct FieldInput *input)
{
ScriptContext1_SetupScript(EventScript_CancelMessageBox);
ScriptContext2_Enable();
if (!FuncIsActiveTask(Task_OpenStartMenu))
CreateTask(Task_OpenStartMenu, 8);
}
}
}

7
src/field_specials.c
View file

@ -4376,3 +4376,10 @@ u8 Script_TryGainNewFanFromCounter(void)
{
return TryGainNewFanFromCounter(gSpecialVar_0x8004);
}
void DoPicboxCancel(void)
{
u8 t = EOS;
AddTextPrinterParameterized(0, FONT_NORMAL, &t, 0, 1, 0, NULL);
ScriptMenu_HidePokemonPic();
}