diff options
Diffstat (limited to 'engine/battle_anims/anim_commands.asm')
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 9bba60a3..6d4129fa 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -586,13 +586,13 @@ BattleAnimCmd_Obj: BattleAnimCmd_BGEffect: call GetBattleAnimByte - ld [wBattleAnimTemp0], a + ld [wBattleBGEffectTempID], a call GetBattleAnimByte - ld [wBattleAnimTemp1], a + ld [wBattleBGEffectTempJumptableIndex], a call GetBattleAnimByte - ld [wBattleAnimTemp2], a + ld [wBattleBGEffectTempTurn], a call GetBattleAnimByte - ld [wBattleAnimTemp3], a + ld [wBattleBGEffectTempParam], a call _QueueBGEffect ret @@ -642,14 +642,14 @@ BattleAnimCmd_5GFX: ld c, a ld hl, wBattleAnimTileDict xor a - ld [wBattleAnimTemp0], a + ld [wBattleAnimGFXTempTileID], a .loop - ld a, [wBattleAnimTemp0] + ld a, [wBattleAnimGFXTempTileID] cp (vTiles1 - vTiles0) / LEN_2BPP_TILE - BATTLEANIM_BASE_TILE ret nc call GetBattleAnimByte ld [hli], a - ld a, [wBattleAnimTemp0] + ld a, [wBattleAnimGFXTempTileID] ld [hli], a push bc push hl @@ -662,9 +662,9 @@ endr add hl, de ld a, [wBattleAnimByte] call LoadBattleAnimGFX - ld a, [wBattleAnimTemp0] + ld a, [wBattleAnimGFXTempTileID] add c - ld [wBattleAnimTemp0], a + ld [wBattleAnimGFXTempTileID], a pop hl pop bc dec c @@ -770,12 +770,12 @@ BattleAnimCmd_BattlerGFX_1Row: ld hl, vTiles0 tile ($80 - 6 - 7) ld de, vTiles2 tile $06 ; Enemy feet start tile ld a, 7 tiles ; Enemy pic height - ld [wBattleAnimTemp0], a + ld [wBattleAnimGFXTempPicHeight], a ld a, 7 ; Copy 7x1 tiles call .LoadFeet ld de, vTiles2 tile $31 ; Player head start tile ld a, 6 tiles ; Player pic height - ld [wBattleAnimTemp0], a + ld [wBattleAnimGFXTempPicHeight], a ld a, 6 ; Copy 6x1 tiles call .LoadFeet ret @@ -787,7 +787,7 @@ BattleAnimCmd_BattlerGFX_1Row: lb bc, BANK(@), 1 call Request2bpp pop de - ld a, [wBattleAnimTemp0] + ld a, [wBattleAnimGFXTempPicHeight] ld l, a ld h, 0 add hl, de @@ -824,12 +824,12 @@ BattleAnimCmd_BattlerGFX_2Row: ld hl, vTiles0 tile ($80 - 6 * 2 - 7 * 2) ld de, vTiles2 tile $05 ; Enemy feet start tile ld a, 7 tiles ; Enemy pic height - ld [wBattleAnimTemp0], a + ld [wBattleAnimGFXTempPicHeight], a ld a, 7 ; Copy 7x2 tiles call .LoadHead ld de, vTiles2 tile $31 ; Player head start tile ld a, 6 tiles ; Player pic height - ld [wBattleAnimTemp0], a + ld [wBattleAnimGFXTempPicHeight], a ld a, 6 ; Copy 6x2 tiles call .LoadHead ret @@ -841,7 +841,7 @@ BattleAnimCmd_BattlerGFX_2Row: lb bc, BANK(@), 2 call Request2bpp pop de - ld a, [wBattleAnimTemp0] + ld a, [wBattleAnimGFXTempPicHeight] ld l, a ld h, 0 add hl, de |