diff options
Diffstat (limited to 'engine')
| -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 | ||||
| -rwxr-xr-x | engine/mart.asm | 2 | ||||
| -rw-r--r-- | engine/phone/phone_scripts.asm | 6 | ||||
| -rw-r--r-- | engine/radio.asm | 10 | ||||
| -rwxr-xr-x | engine/time.asm | 12 |
7 files changed, 19 insertions, 19 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 diff --git a/engine/mart.asm b/engine/mart.asm index ed93cbb81..0306a3e49 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -59,7 +59,7 @@ BargainShop: ; 15a84 or [hl] jr z, .skip_set ld hl, wDailyFlags - set 6, [hl] + set DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F, [hl] .skip_set ld hl, Text_BargainShop_ComeAgain diff --git a/engine/phone/phone_scripts.asm b/engine/phone/phone_scripts.asm index 501f4b757..d087a59f1 100644 --- a/engine/phone/phone_scripts.asm +++ b/engine/phone/phone_scripts.asm @@ -788,7 +788,7 @@ RalphPhoneScript1: checkmorn iftrue Ralph_WednesdayMorning Ralph_CheckSwarm: - checkflag ENGINE_SPECIAL_WILDDATA + checkflag ENGINE_FISH_SWARM iftrue Ralph_ReportSwarm farjump UnknownScript_0xa0940 @@ -824,9 +824,9 @@ Ralph_FightMe: farjump PhoneScript_WantsToBattle_Male Ralph_SetUpSwarm: - checkflag ENGINE_SPECIAL_WILDDATA + checkflag ENGINE_FISH_SWARM iftrue .Generic - setflag ENGINE_SPECIAL_WILDDATA + setflag ENGINE_FISH_SWARM pokenamemem QWILFISH, MEM_BUFFER_1 landmarktotext ROUTE_32, MEM_BUFFER_2 writebyte FISHSWARM_QWILFISH diff --git a/engine/radio.asm b/engine/radio.asm index 9e9646505..d2e36e572 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -1560,7 +1560,7 @@ BuenasPassword4: ld a, [wBuenasPassword] ; If we already generated the password today, we don't need to generate a new one. ld hl, wWeeklyFlags - bit 7, [hl] ; ENGINE_BUENAS_PASSWORD + bit WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] jr nz, .AlreadyGotIt ; There are only 11 groups to choose from. .greater_than_11 @@ -1582,7 +1582,7 @@ BuenasPassword4: ld [wBuenasPassword], a ; Set the flag so that we don't generate a new password this week. ld hl, wWeeklyFlags - set 7, [hl] ; ENGINE_BUENAS_PASSWORD + set WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] .AlreadyGotIt: ld c, a call GetBuenasPassword @@ -1703,14 +1703,14 @@ BuenasPassword7: BuenasPasswordAfterMidnight: push hl ld hl, wWeeklyFlags - res 7, [hl] ; ENGINE_BUENAS_PASSWORD + res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] pop hl ld a, BUENAS_PASSWORD_8 jp NextRadioLine BuenasPassword8: ld hl, wWeeklyFlags - res 7, [hl] ; ENGINE_BUENAS_PASSWORD + res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] ld hl, BuenaRadioMidnightText10 ld a, BUENAS_PASSWORD_9 jp NextRadioLine @@ -1778,7 +1778,7 @@ BuenasPassword20: pop af ld [hBGMapMode], a ld hl, wWeeklyFlags - res 7, [hl] + res WEEKLYFLAGS_BUENAS_PASSWORD_F, [hl] ld a, BUENAS_PASSWORD ld [wCurrentRadioLine], a xor a diff --git a/engine/time.asm b/engine/time.asm index 29c811810..9d1a249c5 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -102,10 +102,10 @@ CheckDailyResetTimer:: ; 11452 ret nc xor a ld hl, wDailyFlags - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a + ld [hli], a ; wDailyFlags + ld [hli], a ; wWeeklyFlags + ld [hli], a ; wSwarmFlags + ld [hl], a ; wSwarmFlags + 1 ld hl, wDailyRematchFlags rept 4 ld [hli], a @@ -227,14 +227,14 @@ CheckUnusedTwoDayTimer: ; 1150c ; unused ld hl, wDailyFlags - set 2, [hl] + set DAILYFLAGS_FISH_SWARM_F, [hl] ret ; 11522 ; unused and a ld hl, wDailyFlags - bit 2, [hl] + bit DAILYFLAGS_FISH_SWARM_F, [hl] ret nz scf ret |