thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 18:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Name some unnamed animation constants (#396)

Browse source
This commit is contained in:
Vortyne 2023-03-25 23:31:59 -04:00 committed by GitHub
parent a76ae055cc
commit 17eaf761e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
constants/move_constants.asm
View file

@ -178,14 +178,14 @@ DEF NUM_ATTACKS EQU const_value - 1
const SHOWPIC_ANIM const SHOWPIC_ANIM
const STATUS_AFFECTED_ANIM const STATUS_AFFECTED_ANIM
const ANIM_A8 const ANIM_A8
const ANIM_A9 const ENEMY_HUD_SHAKE_ANIM
const TRADE_BALL_DROP_ANIM const TRADE_BALL_DROP_ANIM
const TRADE_BALL_SHAKE_ANIM const TRADE_BALL_SHAKE_ANIM
const TRADE_BALL_TILT_ANIM const TRADE_BALL_TILT_ANIM
const TRADE_BALL_POOF_ANIM const TRADE_BALL_POOF_ANIM
const XSTATITEM_ANIM ; use X Attack/Defense/Speed/Special const XSTATITEM_ANIM ; use X Attack/Defense/Speed/Special
const ANIM_AF const XSTATITEM_DUPLICATE_ANIM
const ANIM_B0 const SHRINKING_SQUARE_ANIM
const ANIM_B1 const ANIM_B1
const ANIM_B2 const ANIM_B2
const ANIM_B3 const ANIM_B3
@ -197,18 +197,18 @@ DEF NUM_ATTACKS EQU const_value - 1
const ANIM_B9 const ANIM_B9
const BURN_PSN_ANIM ; Plays when a monster is burned or poisoned const BURN_PSN_ANIM ; Plays when a monster is burned or poisoned
const ANIM_BB const ANIM_BB
const ANIM_BC const SLP_PLAYER_ANIM
const SLP_ANIM ; sleeping monster const SLP_ANIM ; sleeping monster
const ANIM_BE const CONF_PLAYER_ANIM
const CONF_ANIM ; confused monster const CONF_ANIM ; confused monster
const ANIM_C0 const SLIDE_DOWN_ANIM
const TOSS_ANIM ; toss Poké Ball const TOSS_ANIM ; toss Poké Ball
const SHAKE_ANIM ; shaking Poké Ball when catching monster const SHAKE_ANIM ; shaking Poké Ball when catching monster
const POOF_ANIM ; puff of smoke const POOF_ANIM ; puff of smoke
const BLOCKBALL_ANIM ; trainer knocks away Poké Ball const BLOCKBALL_ANIM ; trainer knocks away Poké Ball
const GREATTOSS_ANIM ; toss Great Ball const GREATTOSS_ANIM ; toss Great Ball
const ULTRATOSS_ANIM ; toss Ultra Ball or Master Ball const ULTRATOSS_ANIM ; toss Ultra Ball or Master Ball
const ANIM_C7 const SHAKE_SCREEN_ANIM
const HIDEPIC_ANIM ; monster disappears const HIDEPIC_ANIM ; monster disappears
const ROCK_ANIM ; throw rock const ROCK_ANIM ; throw rock
const BAIT_ANIM ; throw bait const BAIT_ANIM ; throw bait

4
data/moves/animations.asm
View file

@ -192,7 +192,7 @@ AttackAnimationPointers:
dw SleepEnemyAnim dw SleepEnemyAnim
dw ConfusedPlayerAnim dw ConfusedPlayerAnim
dw ConfusedEnemyAnim dw ConfusedEnemyAnim
dw FaintAnim dw SlideDownAnim
dw BallTossAnim dw BallTossAnim
dw BallShakeAnim dw BallShakeAnim
dw BallPoofAnim dw BallPoofAnim
@ -1263,7 +1263,7 @@ BallBlockAnim:
battle_anim NO_MOVE, SUBANIM_0_BALL_BLOCK, 0, 3 battle_anim NO_MOVE, SUBANIM_0_BALL_BLOCK, 0, 3
db -1 ; end db -1 ; end
FaintAnim: SlideDownAnim:
battle_anim DIG, SE_SLIDE_MON_DOWN battle_anim DIG, SE_SLIDE_MON_DOWN
db -1 ; end db -1 ; end

4
engine/battle/core.asm
View file

@ -3327,7 +3327,7 @@ CheckPlayerStatusConditions:
; fast asleep ; fast asleep
xor a xor a
ld [wAnimationType], a ld [wAnimationType], a
ld a, SLP_ANIM - 1 ld a, SLP_PLAYER_ANIM
call PlayMoveAnimation call PlayMoveAnimation
ld hl, FastAsleepText ld hl, FastAsleepText
call PrintText call PrintText
@ -3411,7 +3411,7 @@ CheckPlayerStatusConditions:
call PrintText call PrintText
xor a xor a
ld [wAnimationType], a ld [wAnimationType], a
ld a, CONF_ANIM - 1 ld a, CONF_PLAYER_ANIM
call PlayMoveAnimation call PlayMoveAnimation
call BattleRandom call BattleRandom
cp 50 percent + 1 ; chance to hurt itself cp 50 percent + 1 ; chance to hurt itself

16
engine/battle/effects.asm
View file

@ -123,12 +123,12 @@ PoisonEffect:
dec de dec de
ldh a, [hWhoseTurn] ldh a, [hWhoseTurn]
and a and a
ld b, ANIM_C7 ld b, SHAKE_SCREEN_ANIM
ld hl, wPlayerBattleStatus3 ld hl, wPlayerBattleStatus3
ld a, [de] ld a, [de]
ld de, wPlayerToxicCounter ld de, wPlayerToxicCounter
jr nz, .ok jr nz, .ok
ld b, ANIM_A9 ld b, ENEMY_HUD_SHAKE_ANIM
ld hl, wEnemyBattleStatus3 ld hl, wEnemyBattleStatus3
ld de, wEnemyToxicCounter ld de, wEnemyToxicCounter
.ok .ok
@ -232,14 +232,14 @@ FreezeBurnParalyzeEffect:
ld a, 1 << PAR ld a, 1 << PAR
ld [wEnemyMonStatus], a ld [wEnemyMonStatus], a
call QuarterSpeedDueToParalysis ; quarter speed of affected mon call QuarterSpeedDueToParalysis ; quarter speed of affected mon
ld a, ANIM_A9 ld a, ENEMY_HUD_SHAKE_ANIM
call PlayBattleAnimation call PlayBattleAnimation
jp PrintMayNotAttackText ; print paralysis text jp PrintMayNotAttackText ; print paralysis text
.burn1 .burn1
ld a, 1 << BRN ld a, 1 << BRN
ld [wEnemyMonStatus], a ld [wEnemyMonStatus], a
call HalveAttackDueToBurn ; halve attack of affected mon call HalveAttackDueToBurn ; halve attack of affected mon
ld a, ANIM_A9 ld a, ENEMY_HUD_SHAKE_ANIM
call PlayBattleAnimation call PlayBattleAnimation
ld hl, BurnedText ld hl, BurnedText
jp PrintText jp PrintText
@ -247,7 +247,7 @@ FreezeBurnParalyzeEffect:
call ClearHyperBeam ; resets hyper beam (recharge) condition from target call ClearHyperBeam ; resets hyper beam (recharge) condition from target
ld a, 1 << FRZ ld a, 1 << FRZ
ld [wEnemyMonStatus], a ld [wEnemyMonStatus], a
ld a, ANIM_A9 ld a, ENEMY_HUD_SHAKE_ANIM
call PlayBattleAnimation call PlayBattleAnimation
ld hl, FrozenText ld hl, FrozenText
jp PrintText jp PrintText
@ -802,7 +802,7 @@ ThrashPetalDanceEffect:
inc a inc a
ld [de], a ; set thrash/petal dance counter to 2 or 3 at random ld [de], a ; set thrash/petal dance counter to 2 or 3 at random
ldh a, [hWhoseTurn] ldh a, [hWhoseTurn]
add ANIM_B0 add SHRINKING_SQUARE_ANIM
jp PlayBattleAnimation2 jp PlayBattleAnimation2
SwitchAndTeleportEffect: SwitchAndTeleportEffect:
@ -1002,7 +1002,7 @@ ChargeEffect:
jr z, .chargeEffect jr z, .chargeEffect
ld hl, wEnemyBattleStatus1 ld hl, wEnemyBattleStatus1
ld de, wEnemyMoveEffect ld de, wEnemyMoveEffect
ld b, ANIM_AF ld b, XSTATITEM_DUPLICATE_ANIM
.chargeEffect .chargeEffect
set CHARGING_UP, [hl] set CHARGING_UP, [hl]
ld a, [de] ld a, [de]
@ -1016,7 +1016,7 @@ ChargeEffect:
cp DIG cp DIG
jr nz, .notDigOrFly jr nz, .notDigOrFly
set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig) set INVULNERABLE, [hl] ; mon is now invulnerable to typical attacks (fly/dig)
ld b, ANIM_C0 ld b, SLIDE_DOWN_ANIM
.notDigOrFly .notDigOrFly
xor a xor a
ld [wAnimationType], a ld [wAnimationType], a

2
engine/battle/trainer_ai.asm
View file

@ -713,7 +713,7 @@ AIIncreaseStat:
ld a, [hl] ld a, [hl]
push af push af
push hl push hl
ld a, ANIM_AF ld a, XSTATITEM_DUPLICATE_ANIM
ld [hli], a ld [hli], a
ld [hl], b ld [hl], b
callfar StatModifierUpEffect callfar StatModifierUpEffect