ref: b254a4571d4db54e4fdf15302788acc47d0de08c
parent: 2f9a0d7d9f3e2ee0f1db0ef25cd47803bc0efdf6
author: Rangi <remy.oukaour+rangi42@gmail.com>
date: Sun Feb 25 17:23:20 EST 2018
ENGINE_BUG_CONTEST_ON -> ENGINE_MAIN_MENU_MOBILE_CHOICES (resolves #490) Went with CHOICES instead of HIDDEN since setting the flag would presumably have shown the items, not hidden them
--- 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
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -150,14 +150,14 @@
; 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
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -29,7 +29,7 @@
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
--- a/engine/main_menu.asm
+++ b/engine/main_menu.asm
@@ -168,7 +168,7 @@
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 @@
.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
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -338,7 +338,7 @@
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