diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-05-10 16:53:14 -0500 |
| commit | 32153295edc1e93bd27894f75f2ab01f9140bed5 (patch) | |
| tree | 397bb2852fbacc95b66a2b121c0a7eeb31c5c44d /src/start_menu.c | |
| parent | e78f49f1efc2eadb674d00c00ffc9a4018b3cdbd (diff) | |
| parent | 242af849cb56ce0c4469c4e2be82a3ad5dbd3434 (diff) | |
Merge remote-tracking branch 'upstream/master' into decompile_battle_2
Diffstat (limited to 'src/start_menu.c')
| -rw-r--r-- | src/start_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/start_menu.c b/src/start_menu.c index 48217219d..37d361c0b 100644 --- a/src/start_menu.c +++ b/src/start_menu.c @@ -4,7 +4,7 @@ #include "event_data.h" #include "field_map_obj_helpers.h" #include "field_player_avatar.h" -#include "field_screeneffect.h" +#include "field_weather.h" #include "load_save.h" #include "main.h" #include "map_obj_lock.h" @@ -782,7 +782,7 @@ static bool32 sub_80719FC(u8 *step) case 2: SetUpWindowConfig(&gWindowConfig_81E6CE4); InitMenuWindow(&gWindowConfig_81E6CE4); - REG_DISPCNT = 0x100; + REG_DISPCNT = DISPCNT_MODE_0 | DISPCNT_BG0_ON; break; case 3: { |