diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-07-29 16:04:38 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-07-29 16:04:38 -0400 |
| commit | 1d96a79a370e7fab5bf517ca1f2fd0fa90acbcac (patch) | |
| tree | 9cdf4c7e11b4bd439014f94accadcbe037c60584 | |
| parent | b5a9e83a94f54c43fedca004fbd7223d6f144fc0 (diff) | |
No wCurMove alias for wCurSpecies
| -rw-r--r-- | engine/battle/effect_commands.asm | 2 | ||||
| -rw-r--r-- | engine/events/move_deleter.asm | 2 | ||||
| -rw-r--r-- | engine/menus/start_menu.asm | 6 | ||||
| -rw-r--r-- | wram.asm | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index fa6e40be0..32cc65e35 100644 --- 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 diff --git a/engine/events/move_deleter.asm b/engine/events/move_deleter.asm index c889382c8..2f0df5162 100644 --- 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 diff --git a/engine/menus/start_menu.asm b/engine/menus/start_menu.asm index 3dd646a95..f6854740e 100644 --- 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 @@ -1320,9 +1320,7 @@ wcf5d:: dw wMonType:: db ; cf5f -wCurSpecies:: -wCurMove:: - db ; cf60 +wCurSpecies:: db ; cf60 wNamedObjectTypeBuffer:: db |