Merge pull request #114 from YamaArashi/master

Commented SGB palettes and other things

1 files changed, 7 insertions, 8 deletions

diff --git a/scripts/lab4.asm b/scripts/lab4.asm
index f2c4d8d7..dab07824 100755
--- a/scripts/lab4.asm
+++ b/scripts/lab4.asm
@@ -5,12 +5,11 @@ Lab4TextPointers: ; 75d34 (1d:5d34)
 	dw Lab4Text1
 	dw Lab4Text2
 
-Lab4Script_75d38: ; 75d38 (1d:5d38)
+Lab4Script_GetFossilsInBag: ; 75d38 (1d:5d38)
 ; construct a list of all fossils in the player's bag
-
 	xor a
-	ld [wcd37], a
-	ld de, wcc5b
+	ld [wFilteredBagItemsCount], a
+	ld de, wFilteredBagItems
 	ld hl, FossilsList
 .loop
 	ld a, [hli]
@@ -20,7 +19,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38)
 	push de
 	ld [wd11e], a
 	ld b, a
-	predef IsItemInBag_
+	predef GetQuantityOfItemInBag
 	pop de
 	pop hl
 	ld a, b
@@ -32,7 +31,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38)
 	ld [de], a
 	inc de
 	push hl
-	ld hl, wcd37
+	ld hl, wFilteredBagItemsCount
 	inc [hl]
 	pop hl
 	jr .loop
@@ -53,8 +52,8 @@ Lab4Text1: ; 75d6c (1d:5d6c)
 	jr nz, .asm_75d96
 	ld hl, Lab4Text_75dc6
 	call PrintText
-	call Lab4Script_75d38
-	ld a, [wcd37]
+	call Lab4Script_GetFossilsInBag
+	ld a, [wFilteredBagItemsCount]
 	and a
 	jr z, .asm_75d8d
 	callba GiveFossilToCinnabarLab