diff options
| -rw-r--r-- | constants/engine_flags.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 16 | ||||
| -rw-r--r-- | data/engine_flags.asm | 2 | ||||
| -rwxr-xr-x | engine/main_menu.asm | 4 | ||||
| -rw-r--r-- | maps/ElmsLab.asm | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 7941f3b10..9b2eaaeaf 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -22,7 +22,7 @@ const ENGINE_CAUGHT_POKERUS const ENGINE_ROCKET_SIGNAL_ON_CH20 const ENGINE_CREDITS_SKIP - const ENGINE_BUG_CONTEST_ON ; 10 + const ENGINE_MAIN_MENU_MOBILE_CHOICES ; 10 ; wStatusFlags2 const ENGINE_BUG_CONTEST_TIMER const ENGINE_SAFARI_ZONE diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 8162f5bc1..9f9132a66 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -150,14 +150,14 @@ NUM_OBJECTS EQU $10 ; wStatusFlags:: ; d84c const_def - const STATUSFLAGS_POKEDEX_F ; 0 - const STATUSFLAGS_UNOWN_DEX_F ; 1 - const STATUSFLAGS_FLASH_F ; 2 - const STATUSFLAGS_CAUGHT_POKERUS_F ; 3 - const STATUSFLAGS_ROCKET_SIGNAL_F ; 4 - const STATUSFLAGS_NO_WILD_ENCOUNTERS_F ; 5 - const STATUSFLAGS_HALL_OF_FAME_F ; 6 - const STATUSFLAGS_BUG_CONTEST_ON_F ; 7 + const STATUSFLAGS_POKEDEX_F ; 0 + const STATUSFLAGS_UNOWN_DEX_F ; 1 + const STATUSFLAGS_FLASH_F ; 2 + const STATUSFLAGS_CAUGHT_POKERUS_F ; 3 + const STATUSFLAGS_ROCKET_SIGNAL_F ; 4 + const STATUSFLAGS_NO_WILD_ENCOUNTERS_F ; 5 + const STATUSFLAGS_HALL_OF_FAME_F ; 6 + const STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F ; 7 ; wStatusFlags2:: ; d84d const_def diff --git a/data/engine_flags.asm b/data/engine_flags.asm index 80834bdac..7a74276cd 100644 --- a/data/engine_flags.asm +++ b/data/engine_flags.asm @@ -29,7 +29,7 @@ EngineFlags: ; 80462 engine_flag wStatusFlags, STATUSFLAGS_CAUGHT_POKERUS_F engine_flag wStatusFlags, STATUSFLAGS_ROCKET_SIGNAL_F engine_flag wStatusFlags, STATUSFLAGS_HALL_OF_FAME_F - engine_flag wStatusFlags, STATUSFLAGS_BUG_CONTEST_ON_F + engine_flag wStatusFlags, STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F engine_flag wStatusFlags2, STATUSFLAGS2_BUG_CONTEST_TIMER_F engine_flag wStatusFlags2, STATUSFLAGS2_SAFARI_GAME_F diff --git a/engine/main_menu.asm b/engine/main_menu.asm index b4a5d1919..d83ce873b 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -168,7 +168,7 @@ MainMenu_GetWhichMenu: ; 49da4 jr nz, .mystery_gift ; This check makes no difference. ld a, [wStatusFlags] - bit STATUSFLAGS_BUG_CONTEST_ON_F, a + bit STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F, a ld a, $1 ; Continue jr z, .ok jr .ok @@ -183,7 +183,7 @@ MainMenu_GetWhichMenu: ; 49da4 .mystery_gift ; This check makes no difference. ld a, [wStatusFlags] - bit STATUSFLAGS_BUG_CONTEST_ON_F, a + bit STATUSFLAGS_MAIN_MENU_MOBILE_CHOICES_F, a jr z, .ok3 jr .ok3 diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm index 8490fed48..4d936906c 100644 --- a/maps/ElmsLab.asm +++ b/maps/ElmsLab.asm @@ -338,7 +338,7 @@ ElmAfterTheftScript: writetext ElmAfterTheftText5 buttonsound setevent EVENT_GAVE_MYSTERY_EGG_TO_ELM - setflag ENGINE_BUG_CONTEST_ON + setflag ENGINE_MAIN_MENU_MOBILE_CHOICES setmapscene ROUTE_29, SCENE_ROUTE29_CATCH_TUTORIAL clearevent EVENT_ROUTE_30_YOUNGSTER_JOEY setevent EVENT_ROUTE_30_BATTLE |