diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 18:21:53 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-02-03 19:42:56 -0500 |
| commit | 32ed487a476e01759d3d9dbc818d8566ae2c9cb7 (patch) | |
| tree | 669e90b56d36f17efff5f673235193f5298c0ceb /home/time.asm | |
| parent | 6ff2cb20e67db2054486fc5dc48eb9263298d4ad (diff) | |
| parent | b35eb72290b964b98844afbe741bb7ede34b9ef3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# audio/engine.asm
# constants/gfx_constants.asm
# constants/map_data_constants.asm
# constants/pokemon_data_constants.asm
# constants/sprite_constants.asm
# constants/wram_constants.asm
# data/maps/data.asm
# engine/battle/ai/scoring.asm
# engine/battle/core.asm
# engine/battle/effect_commands.asm
# engine/battle/misc.asm
# engine/battle_anims/getpokeballwobble.asm
# engine/breeding.asm
# engine/buy_sell_toss.asm
# engine/decorations.asm
# engine/events/battle_tower/battle_tower.asm
# engine/events/battle_tower/rules.asm
# engine/events/buena.asm
# engine/events/bug_contest/contest_2.asm
# engine/events/daycare.asm
# engine/events/dratini.asm
# engine/events/halloffame.asm
# engine/events/happiness_egg.asm
# engine/events/kurt.asm
# engine/events/lucky_number.asm
# engine/events/magnet_train.asm
# engine/events/overworld.asm
# engine/events/pokerus/pokerus.asm
# engine/events/print_unown.asm
# engine/events/print_unown_2.asm
# engine/events/unown_walls.asm
# engine/item_effects.asm
# engine/link.asm
# engine/mon_menu.asm
# engine/player_object.asm
# engine/routines/playslowcry.asm
# engine/scripting.asm
# engine/search.asm
# engine/search2.asm
# engine/specials.asm
# engine/start_menu.asm
# engine/timeset.asm
# home/battle_vars.asm
# home/map.asm
# maps/GoldenrodUndergroundSwitchRoomEntrances.asm
# maps/IlexForest.asm
# maps/KrissHouse2F.asm
# maps/Route39Barn.asm
# mobile/mobile_12_2.asm
# mobile/mobile_40.asm
# mobile/mobile_5f.asm
# wram.asm
Diffstat (limited to 'home/time.asm')
| -rw-r--r-- | home/time.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/home/time.asm b/home/time.asm index a4d0f0125..f007fd1db 100644 --- a/home/time.asm +++ b/home/time.asm @@ -140,12 +140,12 @@ FixDays:: ; 5e8 FixTime:: ; 61d ; add ingame time (set at newgame) to current time ; day hr min sec -; store time in CurDay, hHours, hMinutes, hSeconds +; store time in wCurDay, hHours, hMinutes, hSeconds ; second ld a, [hRTCSeconds] ; S ld c, a - ld a, [StartSecond] + ld a, [wStartSecond] add c sub 60 jr nc, .updatesec @@ -157,7 +157,7 @@ FixTime:: ; 61d ccf ; carry is set, so turn it off ld a, [hRTCMinutes] ; M ld c, a - ld a, [StartMinute] + ld a, [wStartMinute] adc c sub 60 jr nc, .updatemin @@ -169,7 +169,7 @@ FixTime:: ; 61d ccf ; carry is set, so turn it off ld a, [hRTCHours] ; H ld c, a - ld a, [StartHour] + ld a, [wStartHour] adc c sub 24 jr nc, .updatehr @@ -181,27 +181,27 @@ FixTime:: ; 61d ccf ; carry is set, so turn it off ld a, [hRTCDayLo] ; DL ld c, a - ld a, [StartDay] + ld a, [wStartDay] adc c - ld [CurDay], a + ld [wCurDay], a ret ; 658 InitTimeOfDay:: ; 658 xor a - ld [StringBuffer2], a + ld [wStringBuffer2], a ld a, $0 ; useless - ld [StringBuffer2 + 3], a + ld [wStringBuffer2 + 3], a jr InitTime InitDayOfWeek:: ; 663 call UpdateTime ld a, [hHours] - ld [StringBuffer2 + 1], a + ld [wStringBuffer2 + 1], a ld a, [hMinutes] - ld [StringBuffer2 + 2], a + ld [wStringBuffer2 + 2], a ld a, [hSeconds] - ld [StringBuffer2 + 3], a + ld [wStringBuffer2 + 3], a jr InitTime ; useless InitTime:: ; 677 |