diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 18 | ||||
| -rw-r--r-- | engine/battle_anims/bg_effects.asm | 32 | ||||
| -rw-r--r-- | engine/battle_anims/helpers.asm | 2 |
3 files changed, 26 insertions, 26 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 0d1c29da5..6cc2d6620 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -334,8 +334,8 @@ BattleAnimCommands:: dw BattleAnimCmd_IncObj dw BattleAnimCmd_SetObj dw BattleAnimCmd_IncBGEffect - dw BattleAnimCmd_EnemyFeetObj - dw BattleAnimCmd_PlayerHeadObj + dw BattleAnimCmd_BattlerGFX_1Row + dw BattleAnimCmd_BattlerGFX_2Row dw BattleAnimCmd_CheckPokeball dw BattleAnimCmd_Transform dw BattleAnimCmd_RaiseSub @@ -681,7 +681,7 @@ endr ld de, vTiles0 tile BATTLEANIM_BASE_TILE add hl, de ld a, [wBattleAnimByte] - call LoadBattleAnimObj + call LoadBattleAnimGFX ld a, [wBattleAnimTemp0] add c ld [wBattleAnimTemp0], a @@ -767,7 +767,7 @@ BattleAnimCmd_SetObj: ld [hl], a ret -BattleAnimCmd_EnemyFeetObj: +BattleAnimCmd_BattlerGFX_1Row: ld hl, wBattleAnimTileDict .loop ld a, [hl] @@ -778,11 +778,11 @@ BattleAnimCmd_EnemyFeetObj: jr .loop .okay - ld a, ANIM_GFX_PLAYER + ld a, ANIM_GFX_PLAYERHEAD ld [hli], a ld a, ($80 - 6 - 7) - BATTLEANIM_BASE_TILE ld [hli], a - ld a, ANIM_GFX_ENEMY + ld a, ANIM_GFX_ENEMYFEET ld [hli], a ld a, ($80 - 6) - BATTLEANIM_BASE_TILE ld [hl], a @@ -821,7 +821,7 @@ BattleAnimCmd_EnemyFeetObj: jr nz, .LoadFeet ret -BattleAnimCmd_PlayerHeadObj: +BattleAnimCmd_BattlerGFX_2Row: ld hl, wBattleAnimTileDict .loop ld a, [hl] @@ -832,11 +832,11 @@ BattleAnimCmd_PlayerHeadObj: jr .loop .okay - ld a, ANIM_GFX_PLAYER + ld a, ANIM_GFX_PLAYERHEAD ld [hli], a ld a, ($80 - 6 * 2 - 7 * 2) - BATTLEANIM_BASE_TILE ld [hli], a - ld a, ANIM_GFX_ENEMY + ld a, ANIM_GFX_ENEMYFEET ld [hli], a ld a, ($80 - 6 * 2) - BATTLEANIM_BASE_TILE ld [hl], a diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm index 28fe1bc6f..05d086f7c 100644 --- a/engine/battle_anims/bg_effects.asm +++ b/engine/battle_anims/bg_effects.asm @@ -96,8 +96,8 @@ BattleBGEffects: dw BattleBGEffect_Whirlpool dw BattleBGEffect_Teleport dw BattleBGEffect_NightShade - dw BattleBGEffect_FeetFollow - dw BattleBGEffect_HeadFollow + dw BattleBGEffect_BattlerObj_1Row + dw BattleBGEffect_BattlerObj_2Row dw BattleBGEffect_DoubleTeam dw BattleBGEffect_AcidArmor dw BattleBGEffect_RapidFlash @@ -403,7 +403,7 @@ BattleBGEffect_ShowMon: db 3, $00, 3 db -1 -BattleBGEffect_FeetFollow: +BattleBGEffect_BattlerObj_1Row: call BattleBGEffects_AnonJumptable .anon_dw dw .zero @@ -425,14 +425,14 @@ BattleBGEffect_FeetFollow: call BattleBGEffects_IncrementJumptable push bc call BGEffect_CheckBattleTurn - jr nz, .player_turn - ld a, ANIM_OBJ_PLAYERFEETFOLLOW + jr nz, .player_side + ld a, ANIM_OBJ_ENEMYFEET_1ROW ld [wBattleObjectTempID], a ld a, 16 * TILE_WIDTH + 4 jr .okay -.player_turn - ld a, ANIM_OBJ_ENEMYFEETFOLLOW +.player_side + ld a, ANIM_OBJ_PLAYERHEAD_1ROW ld [wBattleObjectTempID], a ld a, 6 * TILE_WIDTH .okay @@ -449,12 +449,12 @@ BattleBGEffect_FeetFollow: call BattleBGEffects_IncrementJumptable push bc call BGEffect_CheckBattleTurn - jr nz, .player_turn_2 + jr nz, .player_side_2 hlcoord 12, 6 lb bc, 1, 7 jr .okay2 -.player_turn_2 +.player_side_2 hlcoord 2, 6 lb bc, 1, 6 .okay2 @@ -470,7 +470,7 @@ BattleBGEffect_FeetFollow: call EndBattleBGEffect ret -BattleBGEffect_HeadFollow: +BattleBGEffect_BattlerObj_2Row: call BattleBGEffects_AnonJumptable .anon_dw dw .zero @@ -492,14 +492,14 @@ BattleBGEffect_HeadFollow: call BattleBGEffects_IncrementJumptable push bc call BGEffect_CheckBattleTurn - jr nz, .player_turn - ld a, ANIM_OBJ_PLAYERHEADFOLLOW + jr nz, .player_side + ld a, ANIM_OBJ_ENEMYFEET_2ROW ld [wBattleObjectTempID], a ld a, 16 * TILE_WIDTH + 4 jr .okay -.player_turn - ld a, ANIM_OBJ_ENEMYHEADFOLLOW +.player_side + ld a, ANIM_OBJ_PLAYERHEAD_2ROW ld [wBattleObjectTempID], a ld a, 6 * TILE_WIDTH .okay @@ -516,12 +516,12 @@ BattleBGEffect_HeadFollow: call BattleBGEffects_IncrementJumptable push bc call BGEffect_CheckBattleTurn - jr nz, .player_turn_2 + jr nz, .player_side_2 hlcoord 12, 5 lb bc, 2, 7 jr .okay2 -.player_turn_2 +.player_side_2 hlcoord 2, 6 lb bc, 2, 6 .okay2 diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm index 63177b1b1..4a7f2950c 100644 --- a/engine/battle_anims/helpers.asm +++ b/engine/battle_anims/helpers.asm @@ -100,7 +100,7 @@ GetBattleAnimOAMPointer: add hl, de ret -LoadBattleAnimObj: +LoadBattleAnimGFX: push hl ld l, a ld h, 0 |