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

7 files changed, 16 insertions, 16 deletions

diff --git a/engine/movie/credits.asm b/engine/movie/credits.asm
index a9b6efbd..bdd66e8e 100644
--- a/engine/movie/credits.asm
+++ b/engine/movie/credits.asm
@@ -60,7 +60,7 @@ DisplayCreditsMon:
 	add hl, bc ; go that far in the list of monsters and get the next one
 	ld a, [hl]
 	ld [wCurPartySpecies], a
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	hlcoord 8, 6
 	call GetMonHeader
 	call LoadFrontSpriteByMonIndex
diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm
index d7a47885..69463bfa 100644
--- a/engine/movie/evolution.asm
+++ b/engine/movie/evolution.asm
@@ -4,7 +4,7 @@ EvolveMon:
 	push bc
 	ld a, [wCurPartySpecies]
 	push af
-	ld a, [wd0b5]
+	ld a, [wCurSpecies]
 	push af
 	xor a
 	ld [wLowHealthAlarm], a
@@ -26,7 +26,7 @@ EvolveMon:
 	call EvolutionSetWholeScreenPalette
 	ld a, [wEvoNewSpecies]
 	ld [wCurPartySpecies], a
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	call Evolution_LoadPic
 	ld de, vFrontPic
 	ld hl, vBackPic
@@ -34,7 +34,7 @@ EvolveMon:
 	call CopyVideoData
 	ld a, [wEvoOldSpecies]
 	ld [wCurPartySpecies], a
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	call Evolution_LoadPic
 	ld a, $1
 	ldh [hAutoBGTransferEnabled], a
@@ -75,7 +75,7 @@ EvolveMon:
 	ld c, 0
 	call EvolutionSetWholeScreenPalette
 	pop af
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	pop af
 	ld [wCurPartySpecies], a
 	pop bc
diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm
index 2344dce3..a43ec5da 100644
--- a/engine/movie/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
@@ -102,7 +102,7 @@ HoFShowMonOrPlayer:
 	ldh [hSCX], a
 	ld a, [wHoFMonSpecies]
 	ld [wCurPartySpecies], a
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	ld [wBattleMonSpecies2], a
 	ld [wWholeScreenPaletteMonSpecies], a
 	ld a, [wHoFMonOrPlayer]
@@ -171,7 +171,7 @@ HoFDisplayMonInfo:
 	hlcoord 8, 7
 	call PrintLevelCommon
 	ld a, [wHoFMonSpecies]
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	hlcoord 3, 9
 	predef PrintMonType
 	ld a, [wHoFMonSpecies]
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
index ded8a7c3..44b236c8 100644
--- a/engine/movie/oak_speech/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
@@ -73,7 +73,7 @@ OakSpeech:
 	call GBFadeOutToWhite
 	call ClearScreen
 	ld a, NIDORINO
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	ld [wCurPartySpecies], a
 	call GetMonHeader
 	hlcoord 6, 4
diff --git a/engine/movie/title.asm b/engine/movie/title.asm
index b515a984..3c7ca27d 100644
--- a/engine/movie/title.asm
+++ b/engine/movie/title.asm
@@ -362,7 +362,7 @@ ClearBothBGMaps:
 
 LoadTitleMonSprite:
 	ld [wCurPartySpecies], a
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	hlcoord 5, 10
 	call GetMonHeader
 	jp LoadFrontSpriteByMonIndex
diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm
index a7ccb6b8..14a53a24 100644
--- a/engine/movie/trade.asm
+++ b/engine/movie/trade.asm
@@ -186,14 +186,14 @@ LoadTradingGFXAndMonNames:
 	xor a
 	ldh [hAutoBGTransferEnabled], a
 	ld a, [wTradedPlayerMonSpecies]
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	call GetMonName
 	ld hl, wNameBuffer
 	ld de, wStringBuffer
 	ld bc, NAME_LENGTH
 	call CopyData
 	ld a, [wTradedEnemyMonSpecies]
-	ld [wd11e], a
+	ld [wNamedObjectIndex], a
 	jp GetMonName
 
 Trade_LoadMonPartySpriteGfx:
@@ -728,7 +728,7 @@ Trade_CircleOAM3:
 ; a = species
 Trade_LoadMonSprite:
 	ld [wCurPartySpecies], a
-	ld [wd0b5], a
+	ld [wCurSpecies], a
 	ld [wWholeScreenPaletteMonSpecies], a
 	ld b, SET_PAL_POKEMON_WHOLE_SCREEN
 	ld c, 0
diff --git a/engine/movie/trade2.asm b/engine/movie/trade2.asm
index a564862b..d4a4b635 100644
--- a/engine/movie/trade2.asm
+++ b/engine/movie/trade2.asm
@@ -3,10 +3,10 @@ Trade_PrintPlayerMonInfoText:
 	ld de, Trade_MonInfoText
 	call PlaceString
 	ld a, [wTradedPlayerMonSpecies]
-	ld [wd11e], a
+	ld [wPokedexNum], a
 	predef IndexToPokedex
 	hlcoord 9, 0
-	ld de, wd11e
+	ld de, wPokedexNum
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	hlcoord 5, 2
@@ -25,10 +25,10 @@ Trade_PrintEnemyMonInfoText:
 	ld de, Trade_MonInfoText
 	call PlaceString
 	ld a, [wTradedEnemyMonSpecies]
-	ld [wd11e], a
+	ld [wPokedexNum], a
 	predef IndexToPokedex
 	hlcoord 9, 10
-	ld de, wd11e
+	ld de, wPokedexNum
 	lb bc, LEADING_ZEROES | 1, 3
 	call PrintNumber
 	hlcoord 5, 12