Merge pull request #660 from mid-kid/master

Make the map setup commands match the actual function names better

mobile/mobile_40.asm

@@ -1089,9 +1089,9 @@ Function1006dc:
 	ld [de], a
 	ret
 
-Function1006fd:
-	ld a, $04
-	ld hl, $a800
+MobileBattleResetTimer:
+	ld a, BANK(sMobileBattleTimer)
+	ld hl, sMobileBattleTimer
 	call GetSRAMBank
 	xor a
 	ld [hli], a
@@ -1272,7 +1272,7 @@ Function100826:
 .asm_100830
 	ld [hld], a
 	ccf
-	ld a, [wBGMapBufferPtrs]
+	ld a, [wcd70]
 	adc [hl]
 	sub $3c
 	jr nc, .asm_10083c
@@ -7543,7 +7543,7 @@ Function10378c:
 	ld a, c
 	and a
 	ret z
-	farcall Function1006fd
+	farcall MobileBattleResetTimer
 	ret
 
 .failed_to_save

mobile/mobile_45_sprite_engine.asm

@@ -691,7 +691,7 @@ Function1163c0:
 	ldh [rSVBK], a
 	farcall ReloadMapPart
 	ld a, [wLinkMode]
-	cp $4
+	cp LINK_MOBILE
 	jr z, .asm_11642a
 	ld a, $8
 	ld [wMusicFade], a

mobile/mobile_46.asm

@@ -7324,7 +7324,7 @@ Function11b7e5:
 	farcall Function17d1f1
 	ld a, $1
 	ld [wForceEvolution], a
-	ld a, $2
+	ld a, LINK_TRADECENTER
 	ld [wLinkMode], a
 	farcall EvolvePokemon
 	xor a

mobile/mobile_5f.asm

@@ -295,7 +295,7 @@ Function17d0f3:
 	farcall Function17d1f1
 	ld a, $1
 	ld [wForceEvolution], a
-	ld a, $2
+	ld a, LINK_TRADECENTER
 	ld [wLinkMode], a
 	farcall EvolvePokemon
 	xor a