diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/mon_data.asm | 8 | ||||
| -rw-r--r-- | home/time.asm | 21 |
2 files changed, 14 insertions, 15 deletions
diff --git a/home/mon_data.asm b/home/mon_data.asm index dec80383c..f365f019c 100644 --- a/home/mon_data.asm +++ b/home/mon_data.asm @@ -31,7 +31,6 @@ GetBaseData:: jr .end .egg -; ???? ld de, UnknownEggPic ; Sprite dimensions @@ -39,8 +38,9 @@ GetBaseData:: ld hl, wBasePicSize ld [hl], b -; ???? - ld hl, wBasePadding +; Beta front and back sprites +; (see pokegold-spaceworld's data/pokemon/base_stats/*) + ld hl, wBaseUnusedFrontpic ld [hl], e inc hl ld [hl], d @@ -48,7 +48,7 @@ GetBaseData:: ld [hl], e inc hl ld [hl], d - jr .end + jr .end ; useless .end ; Replace Pokedex # with species diff --git a/home/time.asm b/home/time.asm index 8f6879397..e631fe060 100644 --- a/home/time.asm +++ b/home/time.asm @@ -76,11 +76,11 @@ FixDays:: jr z, .daylo ; reset dh (bit 8) res 0, a - ldh [hRTCDayHi], a ; DH + ldh [hRTCDayHi], a ; mod 140 ; mod twice since bit 8 (DH) was set - ldh a, [hRTCDayLo] ; DL + ldh a, [hRTCDayLo] .modh sub 140 jr nc, .modh @@ -90,7 +90,7 @@ FixDays:: add 140 ; update dl - ldh [hRTCDayLo], a ; DL + ldh [hRTCDayLo], a ; flag for sRTCStatusFlags ld a, %01000000 @@ -98,7 +98,7 @@ FixDays:: .daylo ; quit if fewer than 140 days have passed - ldh a, [hRTCDayLo] ; DL + ldh a, [hRTCDayLo] cp 140 jr c, .quit @@ -109,7 +109,7 @@ FixDays:: add 140 ; update dl - ldh [hRTCDayLo], a ; DL + ldh [hRTCDayLo], a ; flag for sRTCStatusFlags ld a, %00100000 @@ -128,11 +128,10 @@ FixDays:: FixTime:: ; add ingame time (set at newgame) to current time -; day hr min sec ; store time in wCurDay, hHours, hMinutes, hSeconds ; second - ldh a, [hRTCSeconds] ; S + ldh a, [hRTCSeconds] ld c, a ld a, [wStartSecond] add c @@ -144,7 +143,7 @@ FixTime:: ; minute ccf ; carry is set, so turn it off - ldh a, [hRTCMinutes] ; M + ldh a, [hRTCMinutes] ld c, a ld a, [wStartMinute] adc c @@ -156,7 +155,7 @@ FixTime:: ; hour ccf ; carry is set, so turn it off - ldh a, [hRTCHours] ; H + ldh a, [hRTCHours] ld c, a ld a, [wStartHour] adc c @@ -168,7 +167,7 @@ FixTime:: ; day ccf ; carry is set, so turn it off - ldh a, [hRTCDayLo] ; DL + ldh a, [hRTCDayLo] ld c, a ld a, [wStartDay] adc c @@ -178,7 +177,7 @@ FixTime:: InitTimeOfDay:: xor a ld [wStringBuffer2], a - ld a, $0 ; useless + ld a, 0 ; useless ld [wStringBuffer2 + 3], a jr InitTime |