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

1 files changed, 18 insertions, 18 deletions

diff --git a/home/game_time.asm b/home/game_time.asm
index 14edda452..f80d9a462 100644
--- a/home/game_time.asm
+++ b/home/game_time.asm
@@ -1,11 +1,11 @@
 ResetGameTime:: ; 208a
 	xor a
-	ld [GameTimeCap], a
-	ld [GameTimeHours], a
-	ld [GameTimeHours + 1], a
-	ld [GameTimeMinutes], a
-	ld [GameTimeSeconds], a
-	ld [GameTimeFrames], a
+	ld [wGameTimeCap], a
+	ld [wGameTimeHours], a
+	ld [wGameTimeHours + 1], a
+	ld [wGameTimeMinutes], a
+	ld [wGameTimeSeconds], a
+	ld [wGameTimeFrames], a
 	ret
 ; 209e
 
@@ -16,7 +16,7 @@ GameTimer:: ; 209e
 
 	ld a, [rSVBK]
 	push af
-	ld a, BANK(GameTime)
+	ld a, BANK(wGameTime)
 	ld [rSVBK], a
 
 	call UpdateGameTimer
@@ -43,13 +43,13 @@ UpdateGameTimer:: ; 20ad
 	ret z
 
 ; Is the timer already capped?
-	ld hl, GameTimeCap
+	ld hl, wGameTimeCap
 	bit 0, [hl]
 	ret nz
 
 
 ; +1 frame
-	ld hl, GameTimeFrames
+	ld hl, wGameTimeFrames
 	ld a, [hl]
 	inc a
 
@@ -65,7 +65,7 @@ UpdateGameTimer:: ; 20ad
 	ld [hl], a
 
 ; +1 second
-	ld hl, GameTimeSeconds
+	ld hl, wGameTimeSeconds
 	ld a, [hl]
 	inc a
 
@@ -81,7 +81,7 @@ UpdateGameTimer:: ; 20ad
 	ld [hl], a
 
 ; +1 minute
-	ld hl, GameTimeMinutes
+	ld hl, wGameTimeMinutes
 	ld a, [hl]
 	inc a
 
@@ -97,9 +97,9 @@ UpdateGameTimer:: ; 20ad
 	ld [hl], a
 
 ; +1 hour
-	ld a, [GameTimeHours]
+	ld a, [wGameTimeHours]
 	ld h, a
-	ld a, [GameTimeHours + 1]
+	ld a, [wGameTimeHours + 1]
 	ld l, a
 	inc hl
 
@@ -113,19 +113,19 @@ UpdateGameTimer:: ; 20ad
 	cp LOW(1000)
 	jr c, .ok
 
-	ld hl, GameTimeCap
+	ld hl, wGameTimeCap
 	set 0, [hl]
 
 	ld a, 59 ; 999:59:59.00
-	ld [GameTimeMinutes], a
-	ld [GameTimeSeconds], a
+	ld [wGameTimeMinutes], a
+	ld [wGameTimeSeconds], a
 	ret
 
 
 .ok
 	ld a, h
-	ld [GameTimeHours], a
+	ld [wGameTimeHours], a
 	ld a, l
-	ld [GameTimeHours + 1], a
+	ld [wGameTimeHours + 1], a
 	ret
 ; 210f