Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync sprite and battle anim consts/labels (#1055)

Browse Source 
* Sync sprite and battle anim consts/labels

* Add `; 00` comments

* Renamed to `SpriteAnimFunc_` and `BattleAnimFunc_`
This commit is contained in:
vulcandth
2023-09-17 13:09:28 -05:00
committed by GitHub
parent b0ddb0758d
commit aba1f14044
37 changed files with 4148 additions and 4148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
engine/battle_anims/anim_commands.asm
View File

@@ -116,7 +116,7 @@ RunBattleAnimScript:
cp ROLLOUT
jr nz, .not_rollout
ld a, ANIM_BG_ROLLOUT
ld a, BATTLE_BG_EFFECT_ROLLOUT
ld b, NUM_BG_EFFECTS
ld de, BG_EFFECT_STRUCT_LENGTH
ld hl, wBGEffect1Function
@@ -705,7 +705,7 @@ endr
BattleAnimCmd_IncObj:
call GetBattleAnimByte
ld e, NUM_ANIM_OBJECTS
ld e, NUM_BATTLE_ANIM_STRUCTS
ld bc, wActiveAnimObjects
.loop
ld hl, BATTLEANIMSTRUCT_INDEX
@@ -755,7 +755,7 @@ BattleAnimCmd_IncBGEffect:
BattleAnimCmd_SetObj:
call GetBattleAnimByte
ld e, NUM_ANIM_OBJECTS
ld e, NUM_BATTLE_ANIM_STRUCTS
ld bc, wActiveAnimObjects
.loop
ld hl, BATTLEANIMSTRUCT_INDEX
@@ -790,11 +790,11 @@ BattleAnimCmd_BattlerGFX_1Row:
jr .loop
.okay
ld a, ANIM_GFX_PLAYERHEAD
ld a, BATTLE_ANIM_GFX_PLAYERHEAD
ld [hli], a
ld a, ($80 - 6 - 7) - BATTLEANIM_BASE_TILE
ld [hli], a
ld a, ANIM_GFX_ENEMYFEET
ld a, BATTLE_ANIM_GFX_ENEMYFEET
ld [hli], a
ld a, ($80 - 6) - BATTLEANIM_BASE_TILE
ld [hl], a
@@ -844,11 +844,11 @@ BattleAnimCmd_BattlerGFX_2Row:
jr .loop
.okay
ld a, ANIM_GFX_PLAYERHEAD
ld a, BATTLE_ANIM_GFX_PLAYERHEAD
ld [hli], a
ld a, ($80 - 6 * 2 - 7 * 2) - BATTLEANIM_BASE_TILE
ld [hli], a
ld a, ANIM_GFX_ENEMYFEET
ld a, BATTLE_ANIM_GFX_ENEMYFEET
ld [hli], a
ld a, ($80 - 6 * 2) - BATTLEANIM_BASE_TILE
ld [hl], a
@@ -1455,7 +1455,7 @@ BattleAnim_UpdateOAM_All:
ld a, 0
ld [wBattleAnimOAMPointerLo], a
ld hl, wActiveAnimObjects
ld e, NUM_ANIM_OBJECTS
ld e, NUM_BATTLE_ANIM_STRUCTS
.loop
ld a, [hl]
and a