diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-11-22 12:32:24 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-11-22 12:32:24 +0100 |
| commit | 41f39211ca3448ee79a6c65757bd703f247442fd (patch) | |
| tree | 3a1fe8ca8b21d0284f91c60bd908104411538d54 /engine/battle_anims/bg_effects.asm | |
| parent | 2746288030ff3bd4febc43c1c9fe8a203272b927 (diff) | |
Identified another user of wBattleAnimTemp
QueueBattleAnimation loads an object using these wram addresses. Usually
populated by the anim_obj command, but in a couple of cases also
manually.
Diffstat (limited to 'engine/battle_anims/bg_effects.asm')
| -rw-r--r-- | engine/battle_anims/bg_effects.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 6aaa85189..28fe1bc6f 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -427,20 +427,20 @@ BattleBGEffect_FeetFollow: call BGEffect_CheckBattleTurn jr nz, .player_turn ld a, ANIM_OBJ_PLAYERFEETFOLLOW - ld [wBattleAnimTemp0], a - ld a, 16 * 8 + 4 + ld [wBattleObjectTempID], a + ld a, 16 * TILE_WIDTH + 4 jr .okay .player_turn ld a, ANIM_OBJ_ENEMYFEETFOLLOW - ld [wBattleAnimTemp0], a - ld a, 6 * 8 + ld [wBattleObjectTempID], a + ld a, 6 * TILE_WIDTH .okay - ld [wBattleAnimTemp1], a - ld a, 8 * 8 - ld [wBattleAnimTemp2], a + ld [wBattleObjectTempXCoord], a + ld a, 8 * TILE_WIDTH + ld [wBattleObjectTempYCoord], a xor a - ld [wBattleAnimTemp3], a + ld [wBattleObjectTemp0b], a call _QueueBattleAnimation pop bc ret @@ -494,20 +494,20 @@ BattleBGEffect_HeadFollow: call BGEffect_CheckBattleTurn jr nz, .player_turn ld a, ANIM_OBJ_PLAYERHEADFOLLOW - ld [wBattleAnimTemp0], a - ld a, 16 * 8 + 4 + ld [wBattleObjectTempID], a + ld a, 16 * TILE_WIDTH + 4 jr .okay .player_turn ld a, ANIM_OBJ_ENEMYHEADFOLLOW - ld [wBattleAnimTemp0], a - ld a, 6 * 8 + ld [wBattleObjectTempID], a + ld a, 6 * TILE_WIDTH .okay - ld [wBattleAnimTemp1], a - ld a, 8 * 8 - ld [wBattleAnimTemp2], a + ld [wBattleObjectTempXCoord], a + ld a, 8 * TILE_WIDTH + ld [wBattleObjectTempYCoord], a xor a - ld [wBattleAnimTemp3], a + ld [wBattleObjectTemp0b], a call _QueueBattleAnimation pop bc ret |