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 /engine/rtc.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 'engine/rtc.asm')
| -rwxr-xr-x | engine/rtc.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/rtc.asm b/engine/rtc.asm index 571de9284..37e24c1ed 100755 --- a/engine/rtc.asm +++ b/engine/rtc.asm @@ -44,7 +44,7 @@ GetTimeOfDay:: ; 14032 ; get time of day inc hl ld a, [hl] - ld [TimeOfDay], a + ld [wTimeOfDay], a ret ; 14044 @@ -68,7 +68,7 @@ Unreferenced_1404e: StageRTCTimeForSave: ; 14056 call UpdateTime ld hl, wRTC - ld a, [CurDay] + ld a, [wCurDay] ld [hli], a ld a, [hHours] ld [hli], a @@ -138,7 +138,7 @@ Function140ae: ; 140ae call UpdateTime ld a, [wRTC + 0] ld b, a - ld a, [CurDay] + ld a, [wCurDay] cp b jr c, .dont_update @@ -166,9 +166,9 @@ _InitTime:: ; 140ed call GetClock call FixDays ld hl, hRTCSeconds - ld de, StartSecond + ld de, wStartSecond - ld a, [StringBuffer2 + 3] + ld a, [wStringBuffer2 + 3] sub [hl] dec hl jr nc, .okay_secs @@ -177,7 +177,7 @@ _InitTime:: ; 140ed ld [de], a dec de - ld a, [StringBuffer2 + 2] + ld a, [wStringBuffer2 + 2] sbc [hl] dec hl jr nc, .okay_mins @@ -186,7 +186,7 @@ _InitTime:: ; 140ed ld [de], a dec de - ld a, [StringBuffer2 + 1] + ld a, [wStringBuffer2 + 1] sbc [hl] dec hl jr nc, .okay_hrs @@ -195,7 +195,7 @@ _InitTime:: ; 140ed ld [de], a dec de - ld a, [StringBuffer2] + ld a, [wStringBuffer2] sbc [hl] dec hl jr nc, .okay_days |