pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

No wCurMove alias for wCurSpecies

Browse Source
This commit is contained in:
Rangi 2018-07-29 16:04:38 -04:00
parent b5a9e83a94
commit 1d96a79a37
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/effect_commands.asm
View File

@ -3583,7 +3583,7 @@ UpdateMoveData:
ld a, BATTLE_VARS_MOVE ld a, BATTLE_VARS_MOVE
call GetBattleVar call GetBattleVar
ld [wCurMove], a ld [wCurSpecies], a
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
dec a dec a

2
engine/events/move_deleter.asm
View File

@ -27,7 +27,7 @@ MoveDeletion:
jr c, .declined jr c, .declined
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
push af push af
ld a, [wCurMove] ld a, [wCurSpecies]
ld [wNamedObjectIndexBuffer], a ld [wNamedObjectIndexBuffer], a
call GetMoveName call GetMoveName
ld hl, .ConfirmDeleteText ld hl, .ConfirmDeleteText

6
engine/menus/start_menu.asm
View File

@ -1724,7 +1724,7 @@ PrepareToPlaceMoveData:
ld b, $0 ld b, $0
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [wCurMove], a ld [wCurSpecies], a
hlcoord 1, 12 hlcoord 1, 12
lb bc, 5, 18 lb bc, 5, 18
jp ClearBox jp ClearBox
@ -1741,11 +1741,11 @@ PlaceMoveData:
hlcoord 12, 12 hlcoord 12, 12
ld de, String_MoveAtk ld de, String_MoveAtk
call PlaceString call PlaceString
ld a, [wCurMove] ld a, [wCurSpecies]
ld b, a ld b, a
hlcoord 2, 12 hlcoord 2, 12
predef PrintMoveType predef PrintMoveType
ld a, [wCurMove] ld a, [wCurSpecies]
dec a dec a
ld hl, Moves + MOVE_POWER ld hl, Moves + MOVE_POWER
ld bc, MOVE_LENGTH ld bc, MOVE_LENGTH

4
wram.asm
View File

@ -1320,9 +1320,7 @@ wcf5d:: dw
wMonType:: db ; cf5f wMonType:: db ; cf5f
wCurSpecies:: wCurSpecies:: db ; cf60
wCurMove::
db ; cf60
wNamedObjectTypeBuffer:: db wNamedObjectTypeBuffer:: db