diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 11:29:00 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-17 11:29:00 -0400 |
| commit | be93ab33a752fe0360c3b23dd4f33e1b0a05bf0e (patch) | |
| tree | 8fad7073f61b88e5080946d6f38669c3b67f2452 /engine/rtc | |
| parent | 8019db3ea98ee60d3e6675431e07819b83daf04c (diff) | |
Harmonize engine/{phone, pokedex, pokegear, printer, rtc, tilesets} with pokegold
To do: engine/{menus, movie, overworld, pokemon}
Diffstat (limited to 'engine/rtc')
| -rw-r--r-- | engine/rtc/reset_password.asm | 18 | ||||
| -rw-r--r-- | engine/rtc/rtc.asm | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/engine/rtc/reset_password.asm b/engine/rtc/reset_password.asm index 6fd7b3e15..b24609a10 100644 --- a/engine/rtc/reset_password.asm +++ b/engine/rtc/reset_password.asm @@ -13,7 +13,7 @@ _ResetClock: call VerticalMenu ret c ld a, [wMenuCursorY] - cp $1 + cp 1 ret z call ClockResetPassword jr c, .wrongpassword @@ -62,7 +62,7 @@ ClockResetPassword: ld bc, 5 xor a call ByteFill - ld a, $4 + ld a, 4 ld [wStringBuffer2 + 5], a ld hl, .PasswordAskEnterText call PrintText @@ -120,7 +120,7 @@ ClockResetPassword: hlcoord 14, 16 ld a, [wStringBuffer2 + 5] ld e, a - ld d, $0 + ld d, 0 add hl, de ld [hl], "▲" ret @@ -150,7 +150,7 @@ ClockResetPassword: .right ld a, [wStringBuffer2 + 5] - cp $4 + cp 4 ret z inc a ld [wStringBuffer2 + 5], a @@ -166,7 +166,7 @@ ClockResetPassword: ret .wraparound_up - ld [hl], $0 + ld [hl], 0 ret .down @@ -219,13 +219,13 @@ ClockResetPassword: call GetSRAMBank ld de, 0 ld hl, sPlayerData + (wPlayerID - wPlayerData) - ld c, $2 + ld c, 2 call .ComponentFromNumber ld hl, sPlayerData + (wPlayerName - wPlayerData) ld c, NAME_LENGTH_JAPANESE - 1 call .ComponentFromString ld hl, sPlayerData + (wMoney - wPlayerData) - ld c, $3 + ld c, 3 call .ComponentFromNumber call CloseSRAM ret @@ -234,7 +234,7 @@ ClockResetPassword: ld a, [hli] add e ld e, a - ld a, $0 + ld a, 0 adc d ld d, a dec c @@ -247,7 +247,7 @@ ClockResetPassword: ret z add e ld e, a - ld a, $0 + ld a, 0 adc d ld d, a dec c diff --git a/engine/rtc/rtc.asm b/engine/rtc/rtc.asm index c7c4fae9e..6577598f3 100644 --- a/engine/rtc/rtc.asm +++ b/engine/rtc/rtc.asm @@ -74,11 +74,11 @@ StageRTCTimeForSave: ret SaveRTC: - ld a, $a + ld a, SRAM_ENABLE ld [MBC3SRamEnable], a call LatchClock ld hl, MBC3RTC - ld a, $c + ld a, RTC_DH ld [MBC3SRamBank], a res 7, [hl] ld a, BANK(sRTCStatusFlags) |