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 /include | |
parent | 788dc307d403794f5e6eda65ebcc5d864827145d (diff) |
Use fadescreen constants, sync common scripts after pc.inc
Diffstat (limited to 'include')
-rw-r--r-- | include/constants/field_weather.h | 24 | ||||
-rw-r--r-- | include/easy_chat.h | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/include/constants/field_weather.h b/include/constants/field_weather.h new file mode 100644 index 000000000..e84dbc48c --- /dev/null +++ b/include/constants/field_weather.h @@ -0,0 +1,24 @@ +#ifndef GUARD_CONSTANTS_FIELD_WEATHER_H +#define GUARD_CONSTANTS_FIELD_WEATHER_H + +#define MAX_RAIN_SPRITES 24 +#define NUM_CLOUD_SPRITES 3 +#define NUM_FOG_HORIZONTAL_SPRITES 20 +#define NUM_ASH_SPRITES 20 +#define NUM_FOG_DIAGONAL_SPRITES 20 +#define NUM_SANDSTORM_SPRITES 20 +#define NUM_SWIRL_SANDSTORM_SPRITES 5 + +// Controls how the weather should be changing the screen palettes. +#define WEATHER_PAL_STATE_CHANGING_WEATHER 0 +#define WEATHER_PAL_STATE_SCREEN_FADING_IN 1 +#define WEATHER_PAL_STATE_SCREEN_FADING_OUT 2 +#define WEATHER_PAL_STATE_IDLE 3 + +// Modes for FadeScreen +#define FADE_FROM_BLACK 0 +#define FADE_TO_BLACK 1 +#define FADE_FROM_WHITE 2 +#define FADE_TO_WHITE 3 + +#endif // GUARD_CONSTANTS_FIELD_WEATHER_H diff --git a/include/easy_chat.h b/include/easy_chat.h index b86b166aa..729bc0b62 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -117,7 +117,7 @@ struct Shared1000 // const pointer to shared1000. easy_chat might be two separate files. extern struct Shared1000 *const gEasyChatStruct; -void sub_80E60D8(void); +void ShowEasyChatScreen(void); void sub_80E62A0(u8 arg0, u16 *arg1, void (*arg2)(void), u8 arg3); u16 sub_80EB72C(u16 group); void sub_80EB6FC(u16 *, u16); |