Identify remaining uses of `wd0b5` and `wd11e` (#463)

7 files changed, 16 insertions, 16 deletions

diff --git a/scripts/CeladonMartRoof.asm b/scripts/CeladonMartRoof.asm
index b5960c81..d06fc4a2 100644
--- a/scripts/CeladonMartRoof.asm
+++ b/scripts/CeladonMartRoof.asm
@@ -13,15 +13,16 @@ CeladonMartRoofScript_GetDrinksInBag:
 	jr z, .done
 	push hl
 	push de
-	ld [wd11e], a
+	ld [wTempByteValue], a
 	ld b, a
 	predef GetQuantityOfItemInBag
 	pop de
 	pop hl
 	ld a, b
 	and a
-	jr z, .loop ; if the item isn't in the bag
-	ld a, [wd11e]
+	jr z, .loop
+	; A drink is in the bag
+	ld a, [wTempByteValue]
 	ld [de], a
 	inc de
 	push hl
@@ -192,7 +193,7 @@ CeladonMartRoofScript_PrintDrinksInBag:
 	cp $ff
 	ret z
 	push hl
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetItemName
 	hlcoord 2, 2
 	ldh a, [hItemCounter]
diff --git a/scripts/ChampionsRoom.asm b/scripts/ChampionsRoom.asm
index efa66680..46814138 100644
--- a/scripts/ChampionsRoom.asm
+++ b/scripts/ChampionsRoom.asm
@@ -281,7 +281,7 @@ ChampionsRoomOakText:
 ChampionsRoomOakCongratulatesPlayerText:
 	text_asm
 	ld a, [wPlayerStarter]
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetMonName
 	ld hl, .Text
 	call PrintText
diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm
index 4a2ff51f..e5928144 100644
--- a/scripts/CinnabarLabFossilRoom.asm
+++ b/scripts/CinnabarLabFossilRoom.asm
@@ -18,7 +18,7 @@ Lab4Script_GetFossilsInBag:
 	jr z, .done
 	push hl
 	push de
-	ld [wd11e], a
+	ld [wTempByteValue], a
 	ld b, a
 	predef GetQuantityOfItemInBag
 	pop de
@@ -26,9 +26,8 @@ Lab4Script_GetFossilsInBag:
 	ld a, b
 	and a
 	jr z, .loop
-
-	; A fossil's in the bag
-	ld a, [wd11e]
+	; A fossil is in the bag
+	ld a, [wTempByteValue]
 	ld [de], a
 	inc de
 	push hl
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm
index e89e0ee8..89d6ef80 100644
--- a/scripts/OaksLab.asm
+++ b/scripts/OaksLab.asm
@@ -322,7 +322,7 @@ OaksLabRivalChoosesStarterScript:
 	ld a, [wRivalStarterTemp]
 	ld [wRivalStarter], a
 	ld [wCurPartySpecies], a
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetMonName
 	ld a, OAKSLAB_RIVAL
 	ldh [hSpriteIndex], a
@@ -825,7 +825,7 @@ OaksLabBulbasaurPokeBallText:
 
 OaksLabSelectedPokeBallScript:
 	ld [wCurPartySpecies], a
-	ld [wd11e], a
+	ld [wPokedexNum], a
 	ld a, b
 	ld [wSpriteIndex], a
 	CheckEvent EVENT_GOT_STARTER
@@ -899,7 +899,7 @@ OaksLabMonChoiceMenu:
 	jr nz, OaksLabMonChoiceEnd
 	ld a, [wCurPartySpecies]
 	ld [wPlayerStarter], a
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetMonName
 	ld a, [wSpriteIndex]
 	cp OAKSLAB_CHARMANDER_POKE_BALL
@@ -927,7 +927,7 @@ OaksLabMonChoiceMenu:
 	ld a, 5
 	ld [wCurEnemyLevel], a
 	ld a, [wCurPartySpecies]
-	ld [wd11e], a
+	ld [wPokedexNum], a
 	call AddPartyMon
 	ld hl, wStatusFlags4
 	set BIT_GOT_STARTER, [hl]
diff --git a/scripts/Route11Gate2F.asm b/scripts/Route11Gate2F.asm
index 9c223c87..bc1e2e90 100644
--- a/scripts/Route11Gate2F.asm
+++ b/scripts/Route11Gate2F.asm
@@ -24,7 +24,7 @@ Route11Gate2FOaksAideText:
 	ldh [hOaksAideRequirement], a
 	ld a, ITEMFINDER
 	ldh [hOaksAideRewardItem], a
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetItemName
 	ld h, d
 	ld l, e
diff --git a/scripts/Route15Gate2F.asm b/scripts/Route15Gate2F.asm
index ad1434dc..831b66e6 100644
--- a/scripts/Route15Gate2F.asm
+++ b/scripts/Route15Gate2F.asm
@@ -14,7 +14,7 @@ Route15Gate2FOaksAideText:
 	ldh [hOaksAideRequirement], a
 	ld a, EXP_ALL
 	ldh [hOaksAideRewardItem], a
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetItemName
 	ld hl, wNameBuffer
 	ld de, wOaksAideRewardItemName
diff --git a/scripts/Route2Gate.asm b/scripts/Route2Gate.asm
index 8522a149..795b210e 100644
--- a/scripts/Route2Gate.asm
+++ b/scripts/Route2Gate.asm
@@ -14,7 +14,7 @@ Route2GateOaksAideText:
 	ldh [hOaksAideRequirement], a
 	ld a, HM_FLASH
 	ldh [hOaksAideRewardItem], a
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetItemName
 	ld hl, wNameBuffer
 	ld de, wOaksAideRewardItemName