diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-08-19 13:09:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-19 13:09:16 -0400 |
| commit | edb624c20ceb50eef9d73a5df0ac041cc156dd32 (patch) | |
| tree | 44e584f918b28e4be2fd58798dd43e34cf0001dd /constants | |
| parent | 094fe56cb67e2363afb12016ca4b9ddedc333065 (diff) | |
| parent | 0e0f43747db3b55f21218d8ead5a9364564b8a96 (diff) | |
Merge pull request #550 from mid-kid/master
Misc things
Diffstat (limited to 'constants')
| -rw-r--r-- | constants/engine_flags.asm | 4 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 38 |
2 files changed, 21 insertions, 21 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index 518edf806..d6ef40b55 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -94,7 +94,7 @@ const ENGINE_LUCKY_NUMBER_SHOW ; wStatusFlags2 const ENGINE_4F -; wDailyFlags +; wDailyFlags1 const ENGINE_KURT_MAKING_BALLS ; 50 const ENGINE_DAILY_BUG_CONTEST const ENGINE_FISH_SWARM @@ -103,7 +103,7 @@ const ENGINE_GOT_SHUCKIE_TODAY const ENGINE_GOLDENROD_UNDERGROUND_MERCHANT_CLOSED const ENGINE_FOUGHT_IN_TRAINER_HALL_TODAY -; wWeeklyFlags +; wDailyFlags2 const ENGINE_MT_MOON_SQUARE_CLEFAIRY const ENGINE_UNION_CAVE_LAPRAS const ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 5889ca7a6..c5bc47650 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -232,27 +232,27 @@ CELEBIEVENT_FOREST_IS_RESTLESS_F EQU 2 const BIKEFLAGS_ALWAYS_ON_BIKE_F ; 1 const BIKEFLAGS_DOWNHILL_F ; 2 -; wDailyFlags:: ; dc1e +; wDailyFlags1:: ; 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 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 + +; wDailyFlags2:: ; 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 + const DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F ; 0 + const DAILYFLAGS2_UNION_CAVE_LAPRAS_F ; 1 + const DAILYFLAGS2_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F ; 2 + const DAILYFLAGS2_GOLDENROD_DEPT_STORE_TM27_RETURN_F ; 3 + const DAILYFLAGS2_DAISYS_GROOMING_F ; 4 + const DAILYFLAGS2_INDIGO_PLATEAU_RIVAL_FIGHT_F ; 5 + const DAILYFLAGS2_MOVE_TUTOR_F ; 6 + const DAILYFLAGS2_BUENAS_PASSWORD_F ; 7 ; wSwarmFlags:: ; dc20 const_def |