dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use FADE_ defines in field_fadetransition

Browse Source
This commit is contained in:
PikalaxALT
2020-03-09 09:38:58 -04:00
parent 8955f1fa5f
commit 884c000028
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/field_weather.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h" #include "global.h"
void FadeScreen(u8, s8); void FadeScreen(u8 mode, s8 delay);
void SetSav1Weather(u32); void SetSav1Weather(u32);
u8 GetSav1Weather(void); u8 GetSav1Weather(void);
src/field_fadetransition.c
+16 -15
View File
@@ -23,6 +23,7 @@
#include "start_menu.h" #include "start_menu.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/event_object_movement.h" #include "constants/event_object_movement.h"
#include "constants/field_weather.h"
static void sub_807DF4C(u8 a0); static void sub_807DF4C(u8 a0);
static void sub_807DFBC(u8 taskId); static void sub_807DFBC(u8 taskId);
@@ -56,12 +57,12 @@ void WarpFadeInScreen(void)
{ {
case 0: case 0:
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
FadeScreen(0, 0); FadeScreen(FADE_FROM_BLACK, 0);
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
break; break;
case 1: case 1:
palette_bg_faded_fill_white(); palette_bg_faded_fill_white();
FadeScreen(2, 0); FadeScreen(FADE_FROM_WHITE, 0);
palette_bg_faded_fill_white(); palette_bg_faded_fill_white();
break; break;
} }
@@ -73,12 +74,12 @@ static void sub_807DBAC(void)
{ {
case 0: case 0:
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
FadeScreen(0, 3); FadeScreen(FADE_FROM_BLACK, 3);
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
break; break;
case 1: case 1:
palette_bg_faded_fill_white(); palette_bg_faded_fill_white();
FadeScreen(2, 3); FadeScreen(FADE_FROM_WHITE, 3);
palette_bg_faded_fill_white(); palette_bg_faded_fill_white();
break; break;
} }
@@ -87,7 +88,7 @@ static void sub_807DBAC(void)
void FadeInFromBlack(void) void FadeInFromBlack(void)
{ {
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
FadeScreen(0, 0); FadeScreen(FADE_FROM_BLACK, 0);
palette_bg_faded_fill_black(); palette_bg_faded_fill_black();
} }
@@ -95,16 +96,16 @@ void WarpFadeOutScreen(void)
{ {
const struct MapHeader *header = warp1_get_mapheader(); const struct MapHeader *header = warp1_get_mapheader();
if (header->regionMapSectionId != gMapHeader.regionMapSectionId && MapHasPreviewScreen(header->regionMapSectionId, MPS_TYPE_CAVE)) if (header->regionMapSectionId != gMapHeader.regionMapSectionId && MapHasPreviewScreen(header->regionMapSectionId, MPS_TYPE_CAVE))
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
else else
{ {
switch (MapTransitionIsEnter(GetCurrentMapType(), header->mapType)) switch (MapTransitionIsEnter(GetCurrentMapType(), header->mapType))
{ {
case 0: case FALSE:
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
break; break;
case 1: case TRUE:
FadeScreen(3, 0); FadeScreen(FADE_TO_WHITE, 0);
break; break;
} }
} }
@@ -114,11 +115,11 @@ static void sub_807DC70(void)
{ {
switch (MapTransitionIsEnter(GetCurrentMapType(), warp1_get_mapheader()->mapType)) switch (MapTransitionIsEnter(GetCurrentMapType(), warp1_get_mapheader()->mapType))
{ {
case 0: case FALSE:
FadeScreen(1, 3); FadeScreen(FADE_TO_BLACK, 3);
break; break;
case 1: case TRUE:
FadeScreen(3, 3); FadeScreen(FADE_TO_WHITE, 3);
break; break;
} }
} }
@@ -654,7 +655,7 @@ static void sub_807E678(u8 taskId)
{ {
case 0: case 0:
ClearLinkCallback_2(); ClearLinkCallback_2();
FadeScreen(1, 0); FadeScreen(FADE_TO_BLACK, 0);
TryFadeOutOldMapMusic(); TryFadeOutOldMapMusic();
PlaySE(SE_KAIDAN); PlaySE(SE_KAIDAN);
data[0]++; data[0]++;