ref: f98a95b8ee2bb14f8fdb675e37c9876b8163b509
parent: 23cdf06e5ec6e217dcd91a1414dfa7801d453044
author: mid-kid <[email protected]>
date: Mon Aug 6 15:43:54 EDT 2018
wWeeklyFlags -> wDailyFlags2 These are by far not always checked each week, and as such shouldn't be called that. Since they're almost always used through the `bit` instruction, it's very inconvenient to just make wDailyFlags a `dw` instead.
--- 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
--- a/constants/wram_constants.asm
+++ b/constants/wram_constants.asm
@@ -232,27 +232,27 @@
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
+ 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
-; wWeeklyFlags:: ; dc1f
+; 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
--- a/data/engine_flags.asm
+++ b/data/engine_flags.asm
@@ -104,23 +104,23 @@
engine_flag wStatusFlags2, STATUSFLAGS2_UNUSED_3_F
- engine_flag wDailyFlags, DAILYFLAGS_KURT_MAKING_BALLS_F ; $50
- engine_flag wDailyFlags, DAILYFLAGS_BUG_CONTEST_F
- engine_flag wDailyFlags, DAILYFLAGS_FISH_SWARM_F
- engine_flag wDailyFlags, DAILYFLAGS_TIME_CAPSULE_F
- engine_flag wDailyFlags, DAILYFLAGS_ALL_FRUIT_TREES_F
- engine_flag wDailyFlags, DAILYFLAGS_GOT_SHUCKIE_TODAY_F
- engine_flag wDailyFlags, DAILYFLAGS_GOLDENROD_UNDERGROUND_BARGAIN_F
- engine_flag wDailyFlags, DAILYFLAGS_TRAINER_HOUSE_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_KURT_MAKING_BALLS_F ; $50
+ engine_flag wDailyFlags1, DAILYFLAGS1_BUG_CONTEST_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_FISH_SWARM_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_TIME_CAPSULE_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_ALL_FRUIT_TREES_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_GOT_SHUCKIE_TODAY_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_GOLDENROD_UNDERGROUND_BARGAIN_F
+ engine_flag wDailyFlags1, DAILYFLAGS1_TRAINER_HOUSE_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_MT_MOON_SQUARE_CLEFAIRY_F ; $58
- engine_flag wWeeklyFlags, WEEKLYFLAGS_UNION_CAVE_LAPRAS_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_GOLDENROD_DEPT_STORE_TM27_RETURN_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_DAISYS_GROOMING_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_INDIGO_PLATEAU_RIVAL_FIGHT_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_DAILY_MOVE_TUTOR_F
- engine_flag wWeeklyFlags, WEEKLYFLAGS_BUENAS_PASSWORD_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_MT_MOON_SQUARE_CLEFAIRY_F ; $58
+ engine_flag wDailyFlags2, DAILYFLAGS2_UNION_CAVE_LAPRAS_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_GOLDENROD_UNDERGROUND_GOT_HAIRCUT_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_GOLDENROD_DEPT_STORE_TM27_RETURN_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_DAISYS_GROOMING_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_INDIGO_PLATEAU_RIVAL_FIGHT_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_MOVE_TUTOR_F
+ engine_flag wDailyFlags2, DAILYFLAGS2_BUENAS_PASSWORD_F
engine_flag wSwarmFlags, SWARMFLAGS_BUENAS_PASSWORD_F ; $60
engine_flag wSwarmFlags, SWARMFLAGS_GOLDENROD_DEPT_STORE_SALE_F
--- a/engine/events/fish.asm
+++ b/engine/events/fish.asm
@@ -93,8 +93,8 @@
; 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
--- a/engine/events/fruit_trees.asm
+++ b/engine/events/fruit_trees.asm
@@ -41,8 +41,8 @@
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 @@
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:
--- a/engine/events/shuckle.asm
+++ b/engine/events/shuckle.asm
@@ -54,8 +54,8 @@
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
--- a/engine/items/mart.asm
+++ b/engine/items/mart.asm
@@ -54,8 +54,8 @@
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
--- a/engine/overworld/time.asm
+++ b/engine/overworld/time.asm
@@ -91,9 +91,9 @@
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 @@
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
--- a/engine/pokegear/radio.asm
+++ b/engine/pokegear/radio.asm
@@ -1558,8 +1558,8 @@
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 @@
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 @@
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 @@
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
--- a/mobile/mobile_45.asm
+++ b/mobile/mobile_45.asm
@@ -4265,7 +4265,7 @@
ld l, c
ld h, b
xor a
- ld [wWeeklyFlags], a
+ ld [wDailyFlags2], a
.asm_1158e5
ld b, $3
@@ -4290,7 +4290,7 @@
push hl
dec hl
ld a, c
- ld [wWeeklyFlags], a
+ ld [wDailyFlags2], a
.asm_115908
xor a
ld [hld], a
@@ -4430,7 +4430,7 @@
jp nz, .asm_1158e5
.asm_1159c4
- ld a, [wWeeklyFlags]
+ ld a, [wDailyFlags2]
cp $0
jr z, .asm_1159d8
push hl
@@ -4890,7 +4890,7 @@
Function115c49:
ld a, e
- ld [wWeeklyFlags], a
+ ld [wDailyFlags2], a
ld a, d
ld [wSwarmFlags], a
xor a
@@ -4960,7 +4960,7 @@
ld [$dc1a], a
push de
push hl
- ld hl, wWeeklyFlags
+ ld hl, wDailyFlags2
ld a, [hli]
ld h, [hl]
ld l, a
@@ -5070,7 +5070,7 @@
.asm_115d38
push de
push hl
- ld a, [wWeeklyFlags]
+ ld a, [wDailyFlags2]
ld l, a
ld a, [wSwarmFlags]
ld h, a
--- a/wram.asm
+++ b/wram.asm
@@ -2714,8 +2714,8 @@
wMomItemTriggerBalance:: ds 3 ; dc19
wDailyResetTimer:: dw ; dc1c
-wDailyFlags:: db
-wWeeklyFlags:: db
+wDailyFlags1:: db
+wDailyFlags2:: db
wSwarmFlags:: db
ds 2
wTimerEventStartDay:: db