diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/clock.c | 4 | ||||
| -rw-r--r-- | src/lottery_corner.c | 10 | ||||
| -rw-r--r-- | src/rom4.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/clock.c b/src/clock.c index feefae16c..cc02dc9a0 100644 --- a/src/clock.c +++ b/src/clock.c @@ -24,7 +24,7 @@ void sub_806A328(void) FlagSet(SYS_CLOCK_SET); RtcCalcLocalTime(); gSaveBlock2.lastBerryTreeUpdate = gLocalTime; - VarSet(0x4040, gLocalTime.days); + VarSet(VAR_DAYS, gLocalTime.days); } void DoTimeBasedEvents(void) @@ -39,7 +39,7 @@ void DoTimeBasedEvents(void) void sub_806A390(struct Time *time) { - u16 *varPtr = GetVarPointer(0x4040); + u16 *varPtr = GetVarPointer(VAR_DAYS); int days = *varPtr; u16 newDays; diff --git a/src/lottery_corner.c b/src/lottery_corner.c index 54ba3c46d..4d80f86c2 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -22,7 +22,7 @@ void ResetLotteryCorner(void) u16 rand = Random(); SetLotteryNumber((Random() << 16) | rand); - VarSet(0x4045, 0); + VarSet(VAR_POKELOT_PRIZE, 0); } void SetRandomLotteryNumber(u16 i) @@ -147,14 +147,14 @@ void SetLotteryNumber(u32 lotteryNum) u16 lowNum = lotteryNum >> 16; u16 highNum = lotteryNum; - VarSet(0x404B, highNum); - VarSet(0x404C, lowNum); + VarSet(VAR_POKELOT_RND1, highNum); + VarSet(VAR_POKELOT_RND2, lowNum); } u32 GetLotteryNumber(void) { - u16 highNum = VarGet(0x404B); - u16 lowNum = VarGet(0x404C); + u16 highNum = VarGet(VAR_POKELOT_RND1); + u16 lowNum = VarGet(VAR_POKELOT_RND2); return (lowNum << 16) | highNum; } diff --git a/src/rom4.c b/src/rom4.c index 971c46584..95d5ec2fd 100644 --- a/src/rom4.c +++ b/src/rom4.c @@ -731,7 +731,7 @@ bool16 sub_8053D30(struct WarpData *warp) bool16 sub_8053D6C(struct WarpData *warp) { - if (VarGet(16563)) + if (VarGet(0x40B3)) return FALSE; if (warp->mapGroup != 32) return FALSE; |