diff options
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 28 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 11 |
2 files changed, 25 insertions, 14 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 41d52d25..51fb02cc 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -92,19 +92,19 @@ engine_flag_def ENGINE_LUCKY_NUMBER_SHOW, wLuckyNumberShowFlag, 0 engine_flag_def ENGINE_4E, wStatusFlags2, 3 - engine_flag_def ENGINE_KURT_MAKING_BALLS, wDailyFlags, 0 ; kurt making balls - engine_flag_def ENGINE_DAILY_BUG_CONTEST, wDailyFlags, 1 ; did bug catching contest today ; $50 - engine_flag_def ENGINE_SPECIAL_WILDDATA, wDailyFlags, 2 ; special wilddata? - engine_flag_def ENGINE_TIME_CAPSULE, wDailyFlags, 3 ; time capsule (24h wait) - engine_flag_def ENGINE_ALL_FRUIT_TREES, wDailyFlags, 4 ; all fruit trees - engine_flag_def ENGINE_GOT_SHUCKIE_TODAY, wDailyFlags, 5 ; shuckle given - engine_flag_def ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED, wDailyFlags, 6 ; goldenrod underground merchant closed - engine_flag_def ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY, wDailyFlags, 7 ; fought in trainer hall today + engine_flag_def ENGINE_KURT_MAKING_BALLS, wDailyFlags1, 0 ; kurt making balls + engine_flag_def ENGINE_DAILY_BUG_CONTEST, wDailyFlags1, 1 ; did bug catching contest today ; $50 + engine_flag_def ENGINE_SPECIAL_WILDDATA, wDailyFlags1, 2 ; special wilddata? + engine_flag_def ENGINE_TIME_CAPSULE, wDailyFlags1, 3 ; time capsule (24h wait) + engine_flag_def ENGINE_ALL_FRUIT_TREES, wDailyFlags1, 4 ; all fruit trees + engine_flag_def ENGINE_GOT_SHUCKIE_TODAY, wDailyFlags1, 5 ; shuckle given + engine_flag_def ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED, wDailyFlags1, 6 ; goldenrod underground merchant closed + engine_flag_def ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY, wDailyFlags1, 7 ; fought in trainer hall today - engine_flag_def ENGINE_MT_MOON_SQUARE_CLEFAIRY, wWeeklyFlags, 0 ; mt moon square clefairy - engine_flag_def ENGINE_UNION_CAVE_LAPRAS, wWeeklyFlags, 1 ; union cave lapras ; $58 - engine_flag_def ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT, wWeeklyFlags, 2 ; goldenrod underground haircut used - engine_flag_def ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN, wWeeklyFlags, 3 ; goldenrod mall happiness event floor05 person07 - engine_flag_def ENGINE_DAISYS_GROOMING, wWeeklyFlags, 4 ; tea in blues house - engine_flag_def ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT, wWeeklyFlags, 5 ; indigo plateau rival fight + engine_flag_def ENGINE_MT_MOON_SQUARE_CLEFAIRY, wDailyFlags2, 0 ; mt moon square clefairy + engine_flag_def ENGINE_UNION_CAVE_LAPRAS, wDailyFlags2, 1 ; union cave lapras ; $58 + engine_flag_def ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT, wDailyFlags2, 2 ; goldenrod underground haircut used + engine_flag_def ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN, wDailyFlags2, 3 ; goldenrod mall happiness event floor05 person07 + engine_flag_def ENGINE_DAISYS_GROOMING, wDailyFlags2, 4 ; tea in blues house + engine_flag_def ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT, wDailyFlags2, 5 ; indigo plateau rival fight NUM_ENGINE_FLAGS EQU const_value diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 96d78f92..40ff3791 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -206,6 +206,17 @@ PLAYER_SURF_PIKA EQU 8 const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 const BIKEFLAGS_DOWNHILL_F ; 2 +; wDailyFlags1:: + const_def + const DAILYFLAGS1_KURT_MAKING_BALLS_F ; 0 + const DAILYFLAGS1_BUG_CONTEST_F ; 1 + const DAILYFLAGS1_FISH_SWARM_F ; 2 + const DAILYFLAGS1_TIME_CAPSULE_F ; 3 + const DAILYFLAGS1_ALL_FRUIT_TREES_F ; 4 + const DAILYFLAGS1_GOT_SHUCKIE_TODAY_F ; 5 + const DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F ; 6 + const DAILYFLAGS1_TRAINER_HOUSE_F ; 7 + ; wDayCareMan:: ; dc40 DAYCAREMAN_HAS_MON_F EQU 0 DAYCAREMAN_MONS_COMPATIBLE_F EQU 5 |