diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 19:32:30 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-16 19:32:30 -0400 |
| commit | bc116a0db0857ef49ba4a65bf98b9b8339315c01 (patch) | |
| tree | d753b2bcbe162b9aa416a3fbf3007884bfbe5aa4 /engine/battle_anims/anim_commands.asm | |
| parent | 356836b1cc479381d5494dbaee40c6a6345c0b43 (diff) | |
Harmonize engine/{battle, battle_anims, events, games} with pokecrystal
Diffstat (limited to 'engine/battle_anims/anim_commands.asm')
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index a60a2645..5061197c 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -870,18 +870,18 @@ BattleAnimCmd_Transform: and a jr z, .player - ld a, [wTempBattleMonSpecies] ; TempBattleMonSpecies - ld [wCurPartySpecies], a ; CurPartySpecies - ld hl, wBattleMonDVs ; BattleMonDVs + ld a, [wTempBattleMonSpecies] + ld [wCurPartySpecies], a + ld hl, wBattleMonDVs predef GetUnownLetter ld de, vTiles2 tile $00 predef GetMonFrontpic jr .done .player - ld a, [wTempEnemyMonSpecies] ; TempEnemyMonSpecies - ld [wCurPartySpecies], a ; CurPartySpecies - ld hl, wEnemyMonDVs ; EnemyMonDVs + ld a, [wTempEnemyMonSpecies] + ld [wCurPartySpecies], a + ld hl, wEnemyMonDVs predef GetUnownLetter ld de, vTiles2 tile $31 predef GetMonBackpic @@ -892,7 +892,7 @@ BattleAnimCmd_Transform: ret BattleAnimCmd_RaiseSub: - xor a ; sScratch + xor a ; BANK(sScratch) call OpenSRAM GetSubstitutePic: ; used only for BANK(GetSubstitutePic) @@ -1050,7 +1050,7 @@ BattleAnimCmd_BeatUp: .done pop af - ld [wCurPartySpecies], a ; CurPartySpecies + ld [wCurPartySpecies], a ld b, SCGB_BATTLE_COLORS call GetSGBLayout ret |