diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-07-28 19:27:34 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-07-29 00:25:52 -0400 |
| commit | 9dec80b07e3638c722b9768a1ca0184edea20392 (patch) | |
| tree | fdd5e227f20540b838ec45d282e40b083ae56c72 /engine/battle/effect_commands.asm | |
| parent | 2ec900d96c3b6020be0816151b9ad606c04114b5 (diff) | |
Add meaningful aliases for wd265
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
Diffstat (limited to 'engine/battle/effect_commands.asm')
| -rw-r--r-- | engine/battle/effect_commands.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index 825ca9709..fa6e40be0 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 |