dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream' into tustin2121-patch-5

Browse Source
This commit is contained in:
Marcus Huderle
2020-01-13 20:26:20 -06:00
parent 5007d279fe 22931846d6
commit 5a2d676e71
1553 changed files with 106038 additions and 112232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/fldeff_flash.c
View File

@@ -27,8 +27,8 @@ struct FlashStruct
};
// static functions
static void hm2_flash(void);
static void sub_81371B4(void);
static void FieldCallback_Flash(void);
static void FldEff_UseFlash(void);
static bool8 TryDoMapTransition(void);
static void DoExitCaveTransition(void);
static void Task_ExitCaveTransition1(u8 taskId);
@@ -87,26 +87,26 @@ bool8 SetUpFieldMove_Flash(void)
else if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH))
{
gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
gPostMenuFieldCallback = hm2_flash;
gPostMenuFieldCallback = FieldCallback_Flash;
return TRUE;
}
return FALSE;
}
static void hm2_flash(void)
static void FieldCallback_Flash(void)
{
u8 taskId = oei_task_add();
gFieldEffectArguments[0] = GetCursorSelectionMonId();
gTasks[taskId].data[8] = (uintptr_t)sub_81371B4 >> 16;
gTasks[taskId].data[9] = (uintptr_t)sub_81371B4;
gTasks[taskId].data[8] = (uintptr_t)FldEff_UseFlash >> 16;
gTasks[taskId].data[9] = (uintptr_t)FldEff_UseFlash;
}
static void sub_81371B4(void)
static void FldEff_UseFlash(void)
{
PlaySE(SE_W115);
FlagSet(FLAG_SYS_USE_FLASH);
ScriptContext1_SetupScript(EventScript_2926F8);
ScriptContext1_SetupScript(EventScript_FldEffFlash);
}
static void CB2_ChangeMapMain(void)