summaryrefslogtreecommitdiff
path: root/constants
diff options
context:
space:
mode:
Diffstat (limited to 'constants')
-rw-r--r--constants/engine_flags.asm8
-rw-r--r--constants/wram_constants.asm23
2 files changed, 26 insertions, 5 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm
index 40ba221d4..d3ccdbf06 100644
--- a/constants/engine_flags.asm
+++ b/constants/engine_flags.asm
@@ -97,18 +97,18 @@
; wDailyFlags
const ENGINE_KURT_MAKING_BALLS ; 50
const ENGINE_DAILY_BUG_CONTEST
- const ENGINE_SPECIAL_WILDDATA
+ const ENGINE_FISH_SWARM
const ENGINE_TIME_CAPSULE
const ENGINE_ALL_FRUIT_TREES
- const ENGINE_SHUCKLE_GIVEN
+ const ENGINE_GOT_SHUCKIE_TODAY
const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED
const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY
; wWeeklyFlags
const ENGINE_MT_MOON_SQUARE_CLEFAIRY
const ENGINE_UNION_CAVE_LAPRAS
const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
- const ENGINE_GOLDENROD_MALL_5F_HAPPINESS_EVENT
- const ENGINE_TEA_IN_BLUES_HOUSE
+ const ENGINE_GOLDENROD_DEPT_STORE_TM27_RETURN
+ const ENGINE_DAISYS_GROOMING
const ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
const ENGINE_DAILY_MOVE_TUTOR
const ENGINE_BUENAS_PASSWORD
diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm
index 59ca28c36..422334e47 100644
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -17,7 +17,6 @@ AUTO_INPUT EQU $ff
const WILDMON ; 4
; Options:: ; cfcc
-
const_value set 4
const NO_TEXT_SCROLL ; 4
const STEREO ; 5
@@ -226,6 +225,28 @@ CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2
const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1
const BIKEFLAGS_DOWNHILL_F ; 2
+; wDailyFlags:: ; dc1e
+ const_def
+ const DAILYFLAGS_KURT_MAKING_BALLS_F ; 0
+ const DAILYFLAGS_BUG_CONTEST_F ; 1
+ const DAILYFLAGS_FISH_SWARM_F ; 2
+ const DAILYFLAGS_TIME_CAPSULE_F ; 3
+ const DAILYFLAGS_ALL_FRUIT_TREES_F ; 4
+ const DAILYFLAGS_GOT_SHUCKIE_TODAY_F ; 5
+ const DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F ; 6
+ const DAILYFLAGS_TRAINER_HOUSE_F ; 7
+
+; wWeeklyFlags:: ; dc1f
+ const_def
+ const WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; 0
+ const WEEKLYFLAGS_UNION_CAVE_LAPRAS_F ; 1
+ const WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F ; 2
+ const WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F ; 3
+ const WEEKLYFLAGS_DAISYS_GROOMING_F ; 4
+ const WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F ; 5
+ const WEEKLYFLAGS_DAILY_MOVE_TUTOR_F ; 6
+ const WEEKLYFLAGS_BUENAS_PASSWORD_F ; 7
+
; wSwarmFlags:: ; dc20
const_def
const SWARMFLAGS_BUENAS_PASSWORD_F ; 0