Merge pull request #544 from Rangi42/master

Various fixes found while writing tutorials

1 files changed, 2 insertions, 49 deletions

diff --git a/home.asm b/home.asm
index 8f68511b4..27587d511 100644
--- a/home.asm
+++ b/home.asm
@@ -162,55 +162,8 @@ CallPointerAt::
 	rst Bankswitch
 	ret
 
-QueueScript::
-; Push pointer hl in the current bank to wQueuedScriptBank.
-	ld a, [hROMBank]
-
-FarQueueScript::
-; Push pointer a:hl to wQueuedScriptBank.
-	ld [wQueuedScriptBank], a
-	ld a, l
-	ld [wQueuedScriptAddr], a
-	ld a, h
-	ld [wQueuedScriptAddr + 1], a
-	ret
-
-StringCmp::
-; Compare c bytes at de and hl.
-; Return z if they all match.
-.loop
-	ld a, [de]
-	cp [hl]
-	ret nz
-	inc de
-	inc hl
-	dec c
-	jr nz, .loop
-	ret
-
-CompareLong::
-; Compare bc bytes at de and hl.
-; Return carry if they all match.
-
-	ld a, [de]
-	cp [hl]
-	jr nz, .Diff
-
-	inc de
-	inc hl
-	dec bc
-
-	ld a, b
-	or c
-	jr nz, CompareLong
-
-	scf
-	ret
-
-.Diff:
-	and a
-	ret
-
+INCLUDE "home/queue_script.asm"
+INCLUDE "home/compare.asm"
 INCLUDE "home/tilemap.asm"
 INCLUDE "home/hp_pals.asm"