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

24
engine/time.asm
View File

@@ -188,13 +188,13 @@ CheckBugContestTimer:: ; 114a4 (4:54a4)
InitializeStartDay: ; 114dd
call UpdateTime
ld hl, wStartDay
ld hl, wTimerEventStartDay
call CopyDayToHL
ret
; 114e7
CheckPokerusTick:: ; 114e7
ld hl, wStartDay
ld hl, wTimerEventStartDay
call CalcDaysSince
call GetDaysSince
and a
@@ -271,15 +271,15 @@ DoMysteryGiftIfDayHasPassed: ; 11548
call GetSRAMBank
ld hl, sMysteryGiftTimer
ld a, [hli]
ld [Buffer1], a
ld [wBuffer1], a
ld a, [hl]
ld [Buffer2], a
ld [wBuffer2], a
call CloseSRAM
ld hl, Buffer1
ld hl, wBuffer1
call CheckDayDependentEventHL
jr nc, .not_timed_out
ld hl, Buffer1
ld hl, wBuffer1
call InitOneDayCountdown
call CloseSRAM
farcall Function1050c8
@@ -287,7 +287,7 @@ DoMysteryGiftIfDayHasPassed: ; 11548
.not_timed_out
ld a, BANK(sMysteryGiftTimer)
call GetSRAMBank
ld hl, Buffer1
ld hl, wBuffer1
ld a, [hli]
ld [sMysteryGiftTimer], a
ld a, [hl]
@@ -417,7 +417,7 @@ _CalcHoursDaysSince: ; 115f8
ld [wHoursSince], a ; hours since
_CalcDaysSince:
ld a, [CurDay]
ld a, [wCurDay]
ld c, a
sbc [hl]
jr nc, .skip
@@ -429,7 +429,7 @@ _CalcDaysSince:
; 11613
CopyDayHourMinSecToHL: ; 11613
ld a, [CurDay]
ld a, [wCurDay]
ld [hli], a
ld a, [hHours]
ld [hli], a
@@ -441,13 +441,13 @@ CopyDayHourMinSecToHL: ; 11613
; 11621
CopyDayToHL: ; 11621
ld a, [CurDay]
ld a, [wCurDay]
ld [hl], a
ret
; 11626
CopyDayHourToHL: ; 11626
ld a, [CurDay]
ld a, [wCurDay]
ld [hli], a
ld a, [hHours]
ld [hli], a
@@ -455,7 +455,7 @@ CopyDayHourToHL: ; 11626
; 1162e
CopyDayHourMinToHL: ; 1162e
ld a, [CurDay]
ld a, [wCurDay]
ld [hli], a
ld a, [hHours]
ld [hli], a