diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-12-20 23:44:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 23:44:56 -0800 |
| commit | 026e1108b26f4ce5cea362997135bd8efc7cb28a (patch) | |
| tree | 4f99fb34ab0abd51d8f0a4f958ec5b0001f5fed9 /src/field_special_scene.c | |
| parent | d42ea06dc5ade2209fb84ffedafd33de3fbc9cd1 (diff) | |
| parent | d1cf9006fb4b29e63302c69c912e431a873626c0 (diff) | |
Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
Diffstat (limited to 'src/field_special_scene.c')
| -rw-r--r-- | src/field_special_scene.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/field_special_scene.c b/src/field_special_scene.c index 439b1855a..267198f79 100644 --- a/src/field_special_scene.c +++ b/src/field_special_scene.c @@ -179,7 +179,7 @@ void Task_HandleTruckSequence(u8 taskId) data[1]++; if (data[1] == SECONDS(2.5)) { - pal_fill_black(); + FadeInFromBlack(); data[1] = 0; data[0] = 2; } @@ -249,12 +249,12 @@ void EndTruckSequence(u8 taskId) } } -bool8 sub_80FB59C(void) +bool8 TrySetPortholeWarpDestination(void) { s8 mapGroup, mapNum; s16 x, y; - if (GetSSTidalLocation(&mapGroup, &mapNum, &x, &y)) + if (GetSSTidalLocation(&mapGroup, &mapNum, &x, &y) != SS_TIDAL_LOCATION_CURRENTS) { return FALSE; } @@ -336,11 +336,11 @@ static void ShowSSTidalWhileSailing(void) StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(DIR_WEST)); } -void sub_80FB768(void) +void FieldCB_ShowPortholeView(void) { ShowSSTidalWhileSailing(); gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE; - pal_fill_black(); + FadeInFromBlack(); CreateTask(Task_HandlePorthole, 80); ScriptContext2_Enable(); } @@ -351,6 +351,6 @@ void LookThroughPorthole(void) FlagSet(FLAG_DONT_TRANSITION_MUSIC); FlagSet(FLAG_HIDE_MAP_NAME_POPUP); SetDynamicWarp(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); - sub_80FB59C(); - sub_80AF8B8(); + TrySetPortholeWarpDestination(); + DoPortholeWarp(); } |