pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

wNumActiveBattleAnims → wLastAnimObjectIndex

Browse Source 
This variable never decrements, it only increments to give each battle
animation a different, and incremental "index".
This commit is contained in:
mid-kid 2019-02-15 17:21:51 +01:00
parent 4154f191e0
commit ee86b36766
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/battle_anims/bg_effects.asm
View File

@ -416,7 +416,7 @@ BattleBGEffect_BattlerObj_1Row:
.zero .zero
call BGEffect_CheckFlyDigStatus call BGEffect_CheckFlyDigStatus
jr z, .not_flying_digging jr z, .not_flying_digging
ld hl, wNumActiveBattleAnims ld hl, wLastAnimObjectIndex
inc [hl] inc [hl]
call EndBattleBGEffect call EndBattleBGEffect
ret ret
@ -483,7 +483,7 @@ BattleBGEffect_BattlerObj_2Row:
.zero .zero
call BGEffect_CheckFlyDigStatus call BGEffect_CheckFlyDigStatus
jr z, .not_flying_digging jr z, .not_flying_digging
ld hl, wNumActiveBattleAnims ld hl, wLastAnimObjectIndex
inc [hl] inc [hl]
call EndBattleBGEffect call EndBattleBGEffect
ret ret

4
engine/battle_anims/core.asm
View File

@ -15,7 +15,7 @@ QueueBattleAnimation:
.done .done
ld c, l ld c, l
ld b, h ld b, h
ld hl, wNumActiveBattleAnims ld hl, wLastAnimObjectIndex
inc [hl] inc [hl]
call InitBattleAnimation call InitBattleAnimation
ret ret
@ -38,7 +38,7 @@ endr
ld d, h ld d, h
ld hl, BATTLEANIMSTRUCT_INDEX ld hl, BATTLEANIMSTRUCT_INDEX
add hl, bc add hl, bc
ld a, [wNumActiveBattleAnims] ld a, [wLastAnimObjectIndex]
ld [hli], a ; Index ld [hli], a ; Index
ld a, [de] ld a, [de]
inc de inc de

2
wram.asm
View File

@ -3045,7 +3045,7 @@ wBGEffect4:: battle_bg_effect wBGEffect4
wBGEffect5:: battle_bg_effect wBGEffect5 wBGEffect5:: battle_bg_effect wBGEffect5
wActiveBGEffectsEnd:: wActiveBGEffectsEnd::
wNumActiveBattleAnims:: db ; d40e wLastAnimObjectIndex:: db ; d40e
wBattleAnimFlags:: db ; d40f wBattleAnimFlags:: db ; d40f
wBattleAnimAddress:: dw ; d410 wBattleAnimAddress:: dw ; d410