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 /engine/events | |
| parent | 094fe56cb67e2363afb12016ca4b9ddedc333065 (diff) | |
| parent | 0e0f43747db3b55f21218d8ead5a9364564b8a96 (diff) | |
Merge pull request #550 from mid-kid/master
Misc things
Diffstat (limited to 'engine/events')
| -rw-r--r-- | engine/events/fish.asm | 4 | ||||
| -rw-r--r-- | engine/events/fruit_trees.asm | 8 | ||||
| -rw-r--r-- | engine/events/shuckle.asm | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engine/events/fish.asm b/engine/events/fish.asm index a1df536bb..c1dde87d8 100644 --- a/engine/events/fish.asm +++ b/engine/events/fish.asm @@ -93,8 +93,8 @@ GetFishGroupIndex: ; Return the index of fishgroup d in de. push hl - ld hl, wDailyFlags - bit DAILYFLAGS_FISH_SWARM_F, [hl] + ld hl, wDailyFlags1 + bit DAILYFLAGS1_FISH_SWARM_F, [hl] pop hl jr z, .done diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm index 6d5ca6a1d..15fa4f80f 100644 --- a/engine/events/fruit_trees.asm +++ b/engine/events/fruit_trees.asm @@ -41,8 +41,8 @@ GetCurTreeFruit: ret TryResetFruitTrees: - ld hl, wDailyFlags - bit DAILYFLAGS_ALL_FRUIT_TREES_F, [hl] + ld hl, wDailyFlags1 + bit DAILYFLAGS1_ALL_FRUIT_TREES_F, [hl] ret nz jp ResetFruitTrees @@ -65,8 +65,8 @@ ResetFruitTrees: ld [hli], a ld [hli], a ld [hl], a - ld hl, wDailyFlags - set DAILYFLAGS_ALL_FRUIT_TREES_F, [hl] + ld hl, wDailyFlags1 + set DAILYFLAGS1_ALL_FRUIT_TREES_F, [hl] ret GetFruitTreeFlag: diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index c6d909afe..b1c87f53a 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -54,8 +54,8 @@ GiveShuckle: call CopyName2 ; Engine flag for this event. - ld hl, wDailyFlags - set DAILYFLAGS_GOT_SHUCKIE_TODAY_F, [hl] + ld hl, wDailyFlags1 + set DAILYFLAGS1_GOT_SHUCKIE_TODAY_F, [hl] ld a, 1 ld [wScriptVar], a ret |