summaryrefslogtreecommitdiff
path: root/engine/battle_anims
diff options
context:
space:
mode:
Diffstat (limited to 'engine/battle_anims')
-rw-r--r--engine/battle_anims/anim_commands.asm17
-rw-r--r--engine/battle_anims/bg_effects.asm29
-rw-r--r--engine/battle_anims/core.asm5
-rw-r--r--engine/battle_anims/helpers.asm4
4 files changed, 0 insertions, 55 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm
index b30a42bf2..e68b7d774 100644
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -1,7 +1,6 @@
; Battle animation command interpreter.
PlayBattleAnim:
-
ld a, [rSVBK]
push af
@@ -15,7 +14,6 @@ PlayBattleAnim:
ret
_PlayBattleAnim:
-
ld c, 6
.wait
call BattleAnimDelayFrame
@@ -53,7 +51,6 @@ _PlayBattleAnim:
ret
BattleAnimRunScript:
-
ld a, [wFXAnimID + 1]
and a
jr nz, .hi_byte
@@ -97,7 +94,6 @@ BattleAnimRunScript:
ret
RunBattleAnimScript:
-
call ClearBattleAnims
.playframe
@@ -139,7 +135,6 @@ RunBattleAnimScript:
ret
BattleAnimClearHud:
-
call BattleAnimDelayFrame
call WaitTop
call ClearActorHud
@@ -152,7 +147,6 @@ BattleAnimClearHud:
ret
BattleAnimRestoreHuds:
-
call BattleAnimDelayFrame
call WaitTop
@@ -177,7 +171,6 @@ BattleAnimRestoreHuds:
ret
BattleAnimRequestPals:
-
ld a, [hCGB]
and a
ret z
@@ -207,7 +200,6 @@ BattleAnimDelayFrame:
ret
ClearActorHud:
-
ld a, [hBattleTurn]
and a
jr z, .player
@@ -240,9 +232,7 @@ Unreferenced_Functioncc220:
call BattleAnimDelayFrame
ret
-
BattleAnim_ClearCGB_OAMFlags:
-
ld a, [wBattleAnimFlags]
bit 3, a
jr z, .delete
@@ -333,7 +323,6 @@ RunBattleAnimCommand:
ld l, a
jp hl
-
BattleAnimCommands::
; entries correspond to macros/scripts/battle_anims.asm enumeration
dw BattleAnimCmd_Obj
@@ -385,7 +374,6 @@ BattleAnimCommands::
dw BattleAnimCmd_Call
dw BattleAnimCmd_Ret
-
BattleAnimCmd_EA:
BattleAnimCmd_EB:
BattleAnimCmd_EC:
@@ -780,7 +768,6 @@ BattleAnimCmd_SetObj:
ret
BattleAnimCmd_EnemyFeetObj:
-
ld hl, wBattleAnimTileDict
.loop
ld a, [hl]
@@ -835,7 +822,6 @@ BattleAnimCmd_EnemyFeetObj:
ret
BattleAnimCmd_PlayerHeadObj:
-
ld hl, wBattleAnimTileDict
.loop
ld a, [hl]
@@ -934,7 +920,6 @@ BattleAnimCmd_Transform:
ret
BattleAnimCmd_UpdateActorPic:
-
ld de, vTiles0 tile $00
ld a, [hBattleTurn]
and a
@@ -954,7 +939,6 @@ BattleAnimCmd_UpdateActorPic:
ret
BattleAnimCmd_RaiseSub:
-
ld a, [rSVBK]
push af
ld a, 1 ; unnecessary bankswitch?
@@ -1304,7 +1288,6 @@ endr
dw $0000, $0000
dw $0000, $0000
-
PlayHitSound:
ld a, [wNumHits]
cp $1
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index 89ffb0aa4..e5e186ab7 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -134,7 +134,6 @@ BattleBGEffects:
dw BattleBGEffect_WobbleMon
dw BattleBGEffect_35
-
BattleBGEffect_End:
call EndBattleBGEffect
ret
@@ -348,7 +347,6 @@ BattleBGEffect_HideMon:
dw BattleBGEffects_IncrementJumptable
dw .four
-
.zero
call BattleBGEffects_IncrementJumptable
push bc
@@ -415,7 +413,6 @@ BattleBGEffect_FeetFollow:
dw BattleBGEffects_IncrementJumptable
dw .five
-
.zero
call BGEffect_CheckFlyDigStatus
jr z, .not_flying_digging
@@ -483,7 +480,6 @@ BattleBGEffect_HeadFollow:
dw BattleBGEffects_IncrementJumptable
dw .five
-
.zero
call BGEffect_CheckFlyDigStatus
jr z, .not_flying_digging
@@ -554,7 +550,6 @@ BattleBGEffect_27:
dw BattleBGEffects_IncrementJumptable
dw .four
-
.zero
call BattleBGEffects_IncrementJumptable
call BGEffect_CheckBattleTurn
@@ -717,7 +712,6 @@ BattleBGEffect_RunPicResizeScript:
dw .restart
dw .end
-
.zero
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
@@ -915,7 +909,6 @@ BattleBGEffect_Surf:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
lb de, 2, 2
@@ -982,7 +975,6 @@ BattleBGEffect_Whirlpool:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1056,7 +1048,6 @@ BattleBGEffect_Psychic:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1094,7 +1085,6 @@ BattleBGEffect_Teleport:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1119,7 +1109,6 @@ BattleBGEffect_NightShade:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1150,7 +1139,6 @@ BattleBGEffect_DoubleTeam:
dw .four
dw .five
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1242,7 +1230,6 @@ BattleBGEffect_AcidArmor:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1305,7 +1292,6 @@ BattleBGEffect_Withdraw:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1355,7 +1341,6 @@ BattleBGEffect_Dig:
dw .two
dw .three
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1422,7 +1407,6 @@ BattleBGEffect_Tackle:
dw Tackle_BGEffect25_2d_two
dw .three
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1457,7 +1441,6 @@ BattleBGEffect_25:
dw Tackle_BGEffect25_2d_two
dw .three
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1585,7 +1568,6 @@ BattleBGEffect_2d:
dw Tackle_BGEffect25_2d_two
dw .three
-
.three
call BattleAnim_ResetLCDStatCustom
ret
@@ -1633,7 +1615,6 @@ BattleBGEffect_26:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1672,7 +1653,6 @@ BattleBGEffect_2c:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1727,7 +1707,6 @@ BattleBGEffect_28:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1770,7 +1749,6 @@ BattleBGEffect_BounceDown:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1928,7 +1906,6 @@ BattleBGEffect_2b:
dw .zero
dw .one
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -1969,7 +1946,6 @@ BattleBGEffect_1c:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
ld a, $e4
@@ -2196,7 +2172,6 @@ BattleBGEffect_VibrateMon:
dw .zero
dw .one
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -2242,7 +2217,6 @@ BattleBGEffect_WobbleMon:
dw .one
dw .two
-
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
@@ -2407,7 +2381,6 @@ BGEffect_RapidCyclePals:
dw .one_dmg
dw .two_dmg
-
.zero_dmg
call BattleBGEffects_IncrementJumptable
ld a, $e4
@@ -2472,7 +2445,6 @@ BGEffect_RapidCyclePals:
dw .three_cgb
dw .four_cgb
-
.zero_cgb
call BGEffect_CheckBattleTurn
jr nz, .player_turn_cgb
@@ -2932,4 +2904,3 @@ BattleBGEffects_Cosine:
callfar BattleAnim_Cosine_e
ld a, e
ret
-
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
index 20ab74e7b..0f3bb8488 100644
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -26,7 +26,6 @@ DeinitBattleAnimation:
ld [hl], $0
ret
-
InitBattleAnimation:
ld a, [wBattleAnimTemp0]
ld e, a
@@ -190,7 +189,6 @@ BattleAnimOAMUpdate:
scf
ret
-
InitBattleAnimBuffer:
ld hl, BATTLEANIMSTRUCT_01
add hl, bc
@@ -274,7 +272,6 @@ InitBattleAnimBuffer:
ld [wBattleAnimTempXOffset], a
ret
-
GetBattleAnimTileOffset:
push hl
push bc
@@ -302,8 +299,6 @@ _ExecuteBGEffects:
callfar ExecuteBGEffects
ret
-
_QueueBGEffect:
callfar QueueBGEffect
ret
-
diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm
index 09eb3479f..63177b1b1 100644
--- a/engine/battle_anims/helpers.asm
+++ b/engine/battle_anims/helpers.asm
@@ -72,7 +72,6 @@ GetBattleAnimFrame:
ld [hl], a
jr .loop
-
.GetPointer:
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
@@ -92,7 +91,6 @@ GetBattleAnimFrame:
add hl, de
ret
-
GetBattleAnimOAMPointer:
ld l, a
ld h, 0
@@ -102,7 +100,6 @@ GetBattleAnimOAMPointer:
add hl, de
ret
-
LoadBattleAnimObj:
push hl
ld l, a
@@ -123,4 +120,3 @@ LoadBattleAnimObj:
call DecompressRequest2bpp
pop bc
ret
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 20:53:00 +0000