diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-04-29 15:35:10 -0400 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-04-29 15:35:25 -0400 |
| commit | 6f0a4b22152bcefac4bcd5f2532d8452583973d0 (patch) | |
| tree | ab26c0a41eb010d12d96e15b1982b707f337041b /src | |
| parent | 788dc307d403794f5e6eda65ebcc5d864827145d (diff) | |
Use fadescreen constants, sync common scripts after pc.inc
Diffstat (limited to 'src')
| -rw-r--r-- | src/debug/taya_debug_window.c | 2 | ||||
| -rw-r--r-- | src/easy_chat_1.c | 2 | ||||
| -rw-r--r-- | src/field_weather.c | 1 | ||||
| -rw-r--r-- | src/mail.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/debug/taya_debug_window.c b/src/debug/taya_debug_window.c index aa3c1d993..0b3afa28d 100644 --- a/src/debug/taya_debug_window.c +++ b/src/debug/taya_debug_window.c @@ -262,7 +262,7 @@ bool8 debug_sub_8090880(void) { if (!UpdatePaletteFade()) { - sub_80E60D8(); + ShowEasyChatScreen(); return TRUE; } diff --git a/src/easy_chat_1.c b/src/easy_chat_1.c index 4f5c71518..ba2fded16 100644 --- a/src/easy_chat_1.c +++ b/src/easy_chat_1.c @@ -197,7 +197,7 @@ u8 *sub_80EB218(u8 *, u16, u16); u16 sub_80EB2D4(); bool8 sub_80EB680(u16 *, u16, u16, u16); -void sub_80E60D8(void) +void ShowEasyChatScreen(void) { u8 r4 = 3; u16 *r1; diff --git a/src/field_weather.c b/src/field_weather.c index 340445fd2..eb802ae84 100644 --- a/src/field_weather.c +++ b/src/field_weather.c @@ -15,6 +15,7 @@ #include "task.h" #include "trig.h" #include "ewram.h" +#include "constants/field_weather.h" #define MACRO1(color) ((((color) >> 1) & 0xF) | (((color) >> 2) & 0xF0) | (((color) >> 3) & 0xF00)) diff --git a/src/mail.c b/src/mail.c index 9a56d73cc..65c85e39b 100644 --- a/src/mail.c +++ b/src/mail.c @@ -868,7 +868,7 @@ u8 debug_sub_810CEA4(void) if (!gPaletteFade.active) { gSpecialVar_0x8004 = 4; - sub_80E60D8(); + ShowEasyChatScreen(); return 1; } return 0; |