diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-22 17:28:05 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-10-22 17:57:28 -0500 |
| commit | c0aaa014247f8dfd78d9c7668b8a2096456ec253 (patch) | |
| tree | 84aa65d5c881380f33b384ed053f6640874982a9 | |
| parent | 4fd848e6898f342ad7be274d3bf2f5604a59dfee (diff) | |
Document flash.inc
| -rw-r--r-- | data/scripts/flash.inc | 2 | ||||
| -rw-r--r-- | include/event_scripts.h | 2 | ||||
| -rw-r--r-- | src/fldeff_flash.c | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc index e0630db56..916b50719 100644 --- a/data/scripts/flash.inc +++ b/data/scripts/flash.inc @@ -1,4 +1,4 @@ -EventScript_2926F8:: @ 82926F8 +EventScript_FldEffFlash:: @ 82926F8 animateflash 1 setflashradius 1 end diff --git a/include/event_scripts.h b/include/event_scripts.h index 52f3cc251..6ebce69f3 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -376,7 +376,7 @@ extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[]; //field effects extern const u8 EventScript_FldEffStrength[]; extern const u8 EventScript_FailSweetScent[]; -extern const u8 EventScript_2926F8[]; +extern const u8 EventScript_FldEffFlash[]; extern const u8 EventScript_FldEffRockSmash[]; //player pc diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index a2457307b..fedf38cf5 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -26,8 +26,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 sub_8137304(void); static void sub_81373F0(void); static void sub_8137404(u8 taskId); @@ -86,26 +86,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 sub_81371D4(void) |