summaryrefslogtreecommitdiff
path: root/data/engine_flags.asm
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2018-08-06 19:43:54 +0200
committermid-kid <esteve.varela@gmail.com>2018-08-07 09:46:21 +0200
commitf98a95b8ee2bb14f8fdb675e37c9876b8163b509 (patch)
treec077e770b10a044e9ba061151d9a793c66af79b2 /data/engine_flags.asm
parent23cdf06e5ec6e217dcd91a1414dfa7801d453044 (diff)
wWeeklyFlags -> wDailyFlags2
These are by far not always checked each week, and as such shouldn't be called that. Since they're almost always used through the `bit` instruction, it's very inconvenient to just make wDailyFlags a `dw` instead.
Diffstat (limited to 'data/engine_flags.asm')
-rw-r--r--data/engine_flags.asm34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/engine_flags.asm b/data/engine_flags.asm
index 21f8ca0fe..ab669acfc 100644
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -104,23 +104,23 @@ EngineFlags:
engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F
- engine_flag wDailyFlags, DAILYFLAGS_KURT_MAKING_BALLS_F ; $50
- engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F
- engine_flag wDailyFlags, DAILYFLAGS_FISH_SWARM_F
- engine_flag wDailyFlags, DAILYFLAGS_TIME_CAPSULE_F
- engine_flag wDailyFlags, DAILYFLAGS_ALL_FRUIT_TREES_F
- engine_flag wDailyFlags, DAILYFLAGS_GOT_SHUCKIE_TODAY_F
- engine_flag wDailyFlags, DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F
- engine_flag wDailyFlags, DAILYFLAGS_TRAINER_HOUSE_F
-
- engine_flag wWeeklyFlags, WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; $58
- engine_flag wWeeklyFlags, WEEKLYFLAGS_UNION_CAVE_LAPRAS_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_DAISYS_GROOMING_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_DAILY_MOVE_TUTOR_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_BUENAS_PASSWORD_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F ; $50
+ engine_flag wDailyFlags1, DAILYFLAGS1_BUG_CONTEST_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_FISH_SWARM_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_TIME_CAPSULE_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_ALL_FRUIT_TREES_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_GOT_SHUCKIE_TODAY_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_TRAINER_HOUSE_F
+
+ engine_flag wDailyFlags2, DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F ; $58
+ engine_flag wDailyFlags2, DAILYFLAGS2_UNION_CAVE_LAPRAS_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_GOLDENROD_DEPT_STORE_TM27_RETURN_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_DAISYS_GROOMING_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_INDIGO_PLATEAU_RIVAL_FIGHT_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_MOVE_TUTOR_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_BUENAS_PASSWORD_F
engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F ; $60
engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F