pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

wWeeklyFlags -> wDailyFlags2

Browse Source 
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.
This commit is contained in:
mid-kid
2018-08-06 19:43:54 +02:00
parent 23cdf06e5e
commit f98a95b8ee
11 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/events/fish.asm
View File

@@ -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

8
engine/events/fruit_trees.asm
View File

@@ -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:

4
engine/events/shuckle.asm
View File

@@ -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

4
engine/items/mart.asm
View File

@@ -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

14
engine/overworld/time.asm
View File

@@ -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

20
engine/pokegear/radio.asm
View File

@@ -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