diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-07-29 19:56:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-29 19:56:54 -0400 |
| commit | 98e670f3637b5f845a91423ee2d624d2f1e331a6 (patch) | |
| tree | 20bacd2c3cd766eedddd636de59a99af1d662866 /engine/battle/effect_commands.asm | |
| parent | 2ec900d96c3b6020be0816151b9ad606c04114b5 (diff) | |
| parent | e346cc7b4152578106f7708363b41d076a3e8d52 (diff) | |
Merge pull request #548 from Rangi42/master
Add meaningful aliases for wd265
Diffstat (limited to 'engine/battle/effect_commands.asm')
| -rw-r--r-- | engine/battle/effect_commands.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 825ca9709..32cc65e35 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -2,7 +2,7 @@ DoPlayerTurn: call SetPlayerTurn ld a, [wBattlePlayerAction] - and a + and a ; BATTLEPLAYERACTION_USEMOVE? ret nz jr DoTurn @@ -1248,7 +1248,7 @@ BattleCommand_Stab: .go ld a, BATTLE_VARS_MOVE_TYPE call GetBattleVarAddr - ld [wTypeMatchup], a + ld [wCurType], a push hl push de @@ -1264,7 +1264,7 @@ BattleCommand_Stab: pop bc pop de - ld a, [wTypeMatchup] + ld a, [wCurType] cp b jr z, .stab cp c @@ -3583,7 +3583,7 @@ UpdateMoveData: ld a, BATTLE_VARS_MOVE call GetBattleVar - ld [wCurMove], a + ld [wCurSpecies], a ld [wNamedObjectIndexBuffer], a dec a |