From d48ea223eaad84af95e4f29043c279b56aa4ae88 Mon Sep 17 00:00:00 2001
From: "U-Daniel-PC\\Daniel" <corrnondacqb@yahoo.com>
Date: Fri, 5 Jun 2015 14:01:18 -0500
Subject: Fix a lot of bugs

---
 home/copy2.asm     | 12 ++++++------
 home/overworld.asm |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'home')

diff --git a/home/copy2.asm b/home/copy2.asm
index 318ed882..ad82260a 100644
--- a/home/copy2.asm
+++ b/home/copy2.asm
@@ -14,11 +14,11 @@ FarCopyDataDouble:: ; 15d4 (0:15d4)
 	ld e,a
 	ld a,b
 	and a
-	jr z,.8bitcopyamount
+	jr z,.eightbitcopyamount
 	ld a,c
 	and a ; multiple of $100
 	jr z, .expandloop ; if so, do not increment b because the first instance of dec c results in underflow
-.8bitcopyamount
+.eightbitcopyamount
 	inc b
 .expandloop
 	ld a,[de]
@@ -134,13 +134,13 @@ FillMemory:: ; 166e (0:166e)
 	push af
 	ld a,b
 	and a
-	jr z, .8bitcopyamount
+	jr z, .eightbitcopyamount
 	ld a,c
 	and a
-	jr z, .mulitpleof$100
-.8bitcopyamount
+	jr z, .mulitpleof0x100
+.eightbitcopyamount
 	inc b
-.multipleof$100
+.mulitpleof0x100
 	pop af
 .loop
 	ld [hli],a
diff --git a/home/overworld.asm b/home/overworld.asm
index b3008903..a0d52843 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -292,7 +292,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245)
 	ld c,$0a
 	call DelayFrames
 	jp EnterMap
-;.allPokemonFainted
+.allPokemonFainted
 ;	ld a,$ff
 ;	ld [W_ISINBATTLE],a
 ;	call RunMapScript
@@ -638,7 +638,7 @@ CheckMapConnections:: ; 05db (0:05db)
 	ld [wCurrentTileBlockMapViewPointer + 1],a
 .loadNewMap ; 06ce (0:06ce)
 ; load the connected map that was entered
-	ld hl,[wd430]
+	ld hl,wd430
 	set 4,[hl]
 	ld a,$2
 	ld [wd431],a
-- 
cgit v1.3.1-sl0p