pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

ENGINE_BUG_CONTEST_ON -> ENGINE_MAIN_MENU_MOBILE_CHOICES (resolves #490)

Browse Source 
Went with CHOICES instead of HIDDEN since setting the flag would presumably have shown the items, not hidden them
This commit is contained in:
Rangi 2018-02-25 22:23:20 -05:00
parent 2f9a0d7d9f
commit b254a4571d
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/engine_flags.asm
View File

@ -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

16
constants/wram_constants.asm
View File

@ -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

2
data/engine_flags.asm
View File

@ -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

4
engine/main_menu.asm
View File

@ -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

2
maps/ElmsLab.asm
View File

@ -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