diff options
Diffstat (limited to 'engine/battle/used_move_text.asm')
| -rwxr-xr-x | engine/battle/used_move_text.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm index 1b5aa564c..bab0ea834 100755 --- a/engine/battle/used_move_text.asm +++ b/engine/battle/used_move_text.asm @@ -46,7 +46,7 @@ UsedMoveText: ; 105db9 ; everything except 'instead' made redundant in localization ; check obedience - ld a, [AlreadyDisobeyed] + ld a, [wAlreadyDisobeyed] and a ld hl, UsedMove2Text ret nz @@ -71,7 +71,7 @@ UsedMove2Text: ; 105e0b start_asm UsedMoveText_CheckObedience: ; 105e10 ; check obedience - ld a, [AlreadyDisobeyed] + ld a, [wAlreadyDisobeyed] and a jr z, .GetMoveNameText ; print "instead," @@ -183,11 +183,11 @@ INCLUDE "data/moves/grammar.asm" UpdateUsedMoves: ; 105ed0 -; append move a to PlayerUsedMoves unless it has already been used +; append move a to wPlayerUsedMoves unless it has already been used push bc ; start of list - ld hl, PlayerUsedMoves + ld hl, wPlayerUsedMoves ; get move id ld b, a ; next count @@ -209,7 +209,7 @@ UpdateUsedMoves: ; 105ed0 ; if the list is full and the move hasn't already been used ; shift the list back one byte, deleting the first move used ; this can occur with struggle or a new learned move - ld hl, PlayerUsedMoves + 1 + ld hl, wPlayerUsedMoves + 1 ; 1 = 2 ld a, [hld] ld [hli], a @@ -223,7 +223,7 @@ UpdateUsedMoves: ; 105ed0 ld [hl], a ; 4 = new move ld a, b - ld [PlayerUsedMoves + 3], a + ld [wPlayerUsedMoves + 3], a jr .quit .add |