diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 15:59:24 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 15:59:24 -0500 |
| commit | efe6981a0db99aa2deeb7fbea5a51c9e40dd4138 (patch) | |
| tree | dd2156fc491fe2e354f02ec6931c4373f573b4e5 /engine/events | |
| parent | 3a7f518de4bbced15cbf5bb877a988055de7d063 (diff) | |
Add daily+weekly bit flags (close issue #429)
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/fish.asm | 2 | ||||
| -rw-r--r-- | engine/events/fruit_trees.asm | 4 | ||||
| -rwxr-xr-x | engine/events/special.asm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/events/fish.asm b/engine/events/fish.asm index 39644847d..5924180f6 100644 --- a/engine/events/fish.asm +++ b/engine/events/fish.asm @@ -98,7 +98,7 @@ GetFishGroupIndex: ; 9245b push hl ld hl, wDailyFlags - bit 2, [hl] + bit DAILYFLAGS_FISH_SWARM_F, [hl] pop hl jr z, .done diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 44f2315a0..99b38873f 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -44,7 +44,7 @@ GetCurTreeFruit: ; 44041 TryResetFruitTrees: ; 4404c ld hl, wDailyFlags - bit 4, [hl] + bit DAILYFLAGS_ALL_FRUIT_TREES_F, [hl] ret nz jp ResetFruitTrees ; 44055 @@ -71,7 +71,7 @@ ResetFruitTrees: ; 4406a ld [hli], a ld [hl], a ld hl, wDailyFlags - set 4, [hl] + set DAILYFLAGS_ALL_FRUIT_TREES_F, [hl] ret ; 44078 diff --git a/engine/events/special.asm b/engine/events/special.asm index 128e7af29..304cfcbb9 100755 --- a/engine/events/special.asm +++ b/engine/events/special.asm @@ -56,7 +56,7 @@ Special_GiveShuckle: ; 7305 ; Engine flag for this event. ld hl, wDailyFlags - set 5, [hl] ; ENGINE_SHUCKLE_GIVEN + set DAILYFLAGS_GOT_SHUCKIE_TODAY_F, [hl] ld a, 1 ld [ScriptVar], a ret |