No wCurMove alias for wCurSpecies

2024-11-16 11:27:33 -08:00 · 2018-07-29 16:04:38 -04:00 · 2018-07-29 16:04:38 -04:00 · 1d96a79a37
commit 1d96a79a37
parent b5a9e83a94
4 changed files with 6 additions and 8 deletions
--- a/engine/battle/effect_commands.asm
+++ b/engine/battle/effect_commands.asm
@ -3583,7 +3583,7 @@ UpdateMoveData:

 	ld a, BATTLE_VARS_MOVE
 	call GetBattleVar
-	ld [wCurMove], a
+	ld [wCurSpecies], a
 	ld [wNamedObjectIndexBuffer], a

 	dec a
--- a/engine/events/move_deleter.asm
+++ b/engine/events/move_deleter.asm
@ -27,7 +27,7 @@ MoveDeletion:
 	jr c, .declined
 	ld a, [wMenuCursorY]
 	push af
-	ld a, [wCurMove]
+	ld a, [wCurSpecies]
 	ld [wNamedObjectIndexBuffer], a
 	call GetMoveName
 	ld hl, .ConfirmDeleteText
--- a/engine/menus/start_menu.asm
+++ b/engine/menus/start_menu.asm
@ -1724,7 +1724,7 @@ PrepareToPlaceMoveData:
 	ld b, $0
 	add hl, bc
 	ld a, [hl]
-	ld [wCurMove], a
+	ld [wCurSpecies], a
 	hlcoord 1, 12
 	lb bc, 5, 18
 	jp ClearBox
@ -1741,11 +1741,11 @@ PlaceMoveData:
 	hlcoord 12, 12
 	ld de, String_MoveAtk
 	call PlaceString
-	ld a, [wCurMove]
+	ld a, [wCurSpecies]
 	ld b, a
 	hlcoord 2, 12
 	predef PrintMoveType
-	ld a, [wCurMove]
+	ld a, [wCurSpecies]
 	dec a
 	ld hl, Moves + MOVE_POWER
 	ld bc, MOVE_LENGTH
--- a/wram.asm
+++ b/wram.asm
@ -1320,9 +1320,7 @@ wcf5d:: dw

 wMonType:: db ; cf5f

-wCurSpecies::
-wCurMove::
-	db ; cf60
+wCurSpecies:: db ; cf60

 wNamedObjectTypeBuffer:: db