Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokecrystal

Browse Source 
# 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
This commit is contained in:
Rangi
2018-02-03 18:21:53 -05:00
parent 6ff2cb20e6 b35eb72290
commit 32ed487a47
367 changed files with 8920 additions and 8922 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/timeset.asm
View File

@@ -11,11 +11,11 @@ InitClock: ; 90672 (24:4672)
ld a, $0
ld [wSpriteUpdatesEnabled], a
ld a, $10
ld [MusicFade], a
ld [wMusicFade], a
ld a, LOW(MUSIC_NONE)
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, HIGH(MUSIC_NONE)
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
ld c, 8
call DelayFrames
call RotateFourPalettesLeft
@@ -72,7 +72,7 @@ InitClock: ; 90672 (24:4672)
jr nc, .SetHourLoop
ld a, [wInitHourBuffer]
ld [StringBuffer2 + 1], a
ld [wStringBuffer2 + 1], a
call .ClearScreen
ld hl, Text_WhatHrs
call PrintText
@@ -102,7 +102,7 @@ InitClock: ; 90672 (24:4672)
jr nc, .SetMinutesLoop
ld a, [wInitMinuteBuffer]
ld [StringBuffer2 + 2], a
ld [wStringBuffer2 + 2], a
call .ClearScreen
ld hl, Text_WhoaMins
call PrintText
@@ -453,7 +453,7 @@ SetDayOfWeek: ; 90913
call YesNoBox
jr c, .loop
ld a, [wTempDayOfWeek]
ld [StringBuffer2], a
ld [wStringBuffer2], a
call InitDayOfWeek
call LoadStandardFont
pop af
@@ -534,7 +534,7 @@ SetDayOfWeek: ; 90913
; 909f2
.WeekdayStrings: ; 909f2
; entries correspond to CurDay constants (see constants/wram_constants.asm)
; entries correspond to wCurDay constants (see constants/wram_constants.asm)
dw .Sunday
dw .Monday
dw .Tuesday
@@ -667,7 +667,7 @@ DebugDisplayTime: ; 90abc
ld [hl], " "
inc hl
ld de, StartDay
ld de, wStartDay
call .PrintTime
ld [hl], " "