named more variables

engine/overworld/cinnabar_lab.asm

@@ -5,14 +5,14 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006)
 	ld [wCurrentMenuItem], a
 	ld a, A_BUTTON | B_BUTTON
 	ld [wMenuWatchedKeys], a
-	ld a, [wcd37]
+	ld a, [wFilteredBagItemsCount]
 	dec a
 	ld [wMaxMenuItem], a
 	ld a, 2
 	ld [wTopMenuItemY], a
 	ld a, 1
 	ld [wTopMenuItemX], a
-	ld a, [wcd37]
+	ld a, [wFilteredBagItemsCount]
 	dec a
 	ld bc, 2
 	ld hl, 3
@@ -29,9 +29,9 @@ GiveFossilToCinnabarLab: ; 61006 (18:5006)
 	call HandleMenuInput
 	bit 1, a ; pressed B?
 	jr nz, .cancelledGivingFossil
-	ld hl, wcc5b
+	ld hl, wFilteredBagItems
 	ld a, [wCurrentMenuItem]
-	ld d, $0
+	ld d, 0
 	ld e, a
 	add hl, de
 	ld a, [hl]
@@ -90,9 +90,9 @@ LabFossil_610bd: ; 610bd (18:50bd)
 
 PrintFossilsInBag: ; 610c2 (18:50c2)
 ; Prints each fossil in the player's bag on a separate line in the menu.
-	ld hl, wcc5b
+	ld hl, wFilteredBagItems
 	xor a
-	ld [hFossilCounter], a
+	ld [hItemCounter], a
 .loop
 	ld a, [hli]
 	cp $ff
@@ -101,12 +101,12 @@ PrintFossilsInBag: ; 610c2 (18:50c2)
 	ld [wd11e], a
 	call GetItemName
 	coord hl, 2, 2
-	ld a, [hFossilCounter]
+	ld a, [hItemCounter]
 	ld bc, SCREEN_WIDTH * 2
 	call AddNTimes
 	ld de, wcd6d
 	call PlaceString
-	ld hl, hFossilCounter
+	ld hl, hItemCounter
 	inc [hl]
 	pop hl
 	jr .loop

engine/overworld/hidden_items.asm

@@ -51,7 +51,7 @@ HiddenItemBagFullText: ; 76794 (1d:6794)
 
 HiddenCoins: ; 76799 (1d:6799)
 	ld b, COIN_CASE
-	predef IsItemInBag_
+	predef GetQuantityOfItemInBag
 	ld a, b
 	and a
 	ret z

engine/overworld/oaks_aide.asm

@@ -18,7 +18,7 @@ OaksAideScript: ; 0x59035
 .giveItem
 	ld hl, OaksAideHereYouGoText
 	call PrintText
-	ld a, [hOaksAideItemReward]
+	ld a, [hOaksAideRewardItem]
 	ld b, a
 	ld c, 1
 	call GiveItem