diff options
Diffstat (limited to 'engine')
| -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 | ||||
| -rw-r--r-- | engine/items/mart.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/time.asm | 14 | ||||
| -rw-r--r-- | engine/pokegear/radio.asm | 20 |
6 files changed, 27 insertions, 27 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 diff --git a/engine/items/mart.asm b/engine/items/mart.asm index 7e185662b..8afae541a 100644 --- a/engine/items/mart.asm +++ b/engine/items/mart.asm @@ -54,8 +54,8 @@ BargainShop: ld a, [hli] or [hl] jr z, .skip_set - ld hl, wDailyFlags - set DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl] + ld hl, wDailyFlags1 + set DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl] .skip_set ld hl, Text_BargainShop_ComeAgain diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index abb12d87d..74bd1b6d9 100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -91,9 +91,9 @@ CheckDailyResetTimer:: call CheckDayDependentEventHL ret nc xor a - ld hl, wDailyFlags - ld [hli], a ; wDailyFlags - ld [hli], a ; wWeeklyFlags + ld hl, wDailyFlags1 + ld [hli], a ; wDailyFlags1 + ld [hli], a ; wDailyFlags2 ld [hli], a ; wSwarmFlags ld [hl], a ; wSwarmFlags + 1 ld hl, wDailyRematchFlags @@ -207,14 +207,14 @@ CheckUnusedTwoDayTimer: ret ; unused - ld hl, wDailyFlags - set DAILYFLAGS_FISH_SWARM_F, [hl] + ld hl, wDailyFlags1 + set DAILYFLAGS1_FISH_SWARM_F, [hl] ret ; unused and a - ld hl, wDailyFlags - bit DAILYFLAGS_FISH_SWARM_F, [hl] + ld hl, wDailyFlags1 + bit DAILYFLAGS1_FISH_SWARM_F, [hl] ret nz scf ret diff --git a/engine/pokegear/radio.asm b/engine/pokegear/radio.asm index b76cad13e..390fef28e 100644 --- a/engine/pokegear/radio.asm +++ b/engine/pokegear/radio.asm @@ -1558,8 +1558,8 @@ BuenasPassword4: jp c, BuenasPassword8 ld a, [wBuenasPassword] ; If we already generated the password today, we don't need to generate a new one. - ld hl, wWeeklyFlags - bit WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] + ld hl, wDailyFlags2 + bit DAILYFLAGS2_BUENAS_PASSWORD_F, [hl] jr nz, .AlreadyGotIt ; There are only 11 groups to choose from. .greater_than_11 @@ -1580,8 +1580,8 @@ BuenasPassword4: add e ld [wBuenasPassword], a ; Set the flag so that we don't generate a new password this week. - ld hl, wWeeklyFlags - set WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] + ld hl, wDailyFlags2 + set DAILYFLAGS2_BUENAS_PASSWORD_F, [hl] .AlreadyGotIt: ld c, a call GetBuenasPassword @@ -1701,15 +1701,15 @@ BuenasPassword7: BuenasPasswordAfterMidnight: push hl - ld hl, wWeeklyFlags - res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] + ld hl, wDailyFlags2 + res DAILYFLAGS2_BUENAS_PASSWORD_F, [hl] pop hl ld a, BUENAS_PASSWORD_8 jp NextRadioLine BuenasPassword8: - ld hl, wWeeklyFlags - res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] + ld hl, wDailyFlags2 + res DAILYFLAGS2_BUENAS_PASSWORD_F, [hl] ld hl, BuenaRadioMidnightText10 ld a, BUENAS_PASSWORD_9 jp NextRadioLine @@ -1776,8 +1776,8 @@ BuenasPassword20: farcall NoRadioName pop af ld [hBGMapMode], a - ld hl, wWeeklyFlags - res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] + ld hl, wDailyFlags2 + res DAILYFLAGS2_BUENAS_PASSWORD_F, [hl] ld a, BUENAS_PASSWORD ld [wCurrentRadioLine], a xor a |