Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATTLEANIMSTRUCT_0B -> BATTLEANIMSTRUCT_PARAM 

This structure member is used for storing the parameter passed to
`anim_obj`.
This commit is contained in:
mid-kid 2019-02-06 08:07:11 +01:00
parent 4fe0d93d4c
commit bfedd89308
6 changed files with 111 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/battle_anim_constants.asm
View File

@ -11,7 +11,7 @@
const BATTLEANIMSTRUCT_YCOORD
const BATTLEANIMSTRUCT_XOFFSET
const BATTLEANIMSTRUCT_YOFFSET
const BATTLEANIMSTRUCT_0B
const BATTLEANIMSTRUCT_PARAM
const BATTLEANIMSTRUCT_DURATION
const BATTLEANIMSTRUCT_FRAME
const BATTLEANIMSTRUCT_ANON_JT_INDEX

2
engine/battle_anims/anim_commands.asm
View File

@ -601,7 +601,7 @@ BattleAnimCmd_Obj:
call GetBattleAnimByte
ld [wBattleObjectTempYCoord], a
call GetBattleAnimByte
ld [wBattleObjectTemp0b], a
ld [wBattleObjectTempParam], a
call QueueBattleAnimation
ret

4
engine/battle_anims/bg_effects.asm
View File

@ -440,7 +440,7 @@ BattleBGEffect_BattlerObj_1Row:
ld a, 8 * TILE_WIDTH
ld [wBattleObjectTempYCoord], a
xor a
ld [wBattleObjectTemp0b], a
ld [wBattleObjectTempParam], a
call _QueueBattleAnimation
pop bc
ret
@ -507,7 +507,7 @@ BattleBGEffect_BattlerObj_2Row:
ld a, 8 * TILE_WIDTH
ld [wBattleObjectTempYCoord], a
xor a
ld [wBattleObjectTemp0b], a
ld [wBattleObjectTempParam], a
call _QueueBattleAnimation
pop bc
ret

4
engine/battle_anims/core.asm
View File

@ -65,8 +65,8 @@ endr
xor a
ld [hli], a ; X Offset
ld [hli], a ; Y Offset
ld a, [wBattleObjectTemp0b]
ld [hli], a ; 0b
ld a, [wBattleObjectTempParam]
ld [hli], a ; Param
xor a
ld [hli], a ; 0c
dec a

208
engine/battle_anims/functions.asm
View File

@ -130,7 +130,7 @@ BattleAnimFunction_ThrowFromPlayerToEnemy:
ld a, [hl]
dec [hl]
; Get ???, which is the amplitude of the sine function
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld d, [hl]
call BattleAnim_Sine
@ -190,7 +190,7 @@ BattleAnimFunction_03:
dw .one
.zero
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
bit 7, [hl]
ld a, $0
@ -200,7 +200,7 @@ BattleAnimFunction_03:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $7f
@ -209,7 +209,7 @@ BattleAnimFunction_03:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld d, [hl]
push af
@ -244,7 +244,7 @@ BattleAnimFunction_01:
ld a, [hl]
cp $84
ret nc
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
call Functionce70a
@ -256,7 +256,7 @@ BattleAnimFunction_02:
ld a, [hl]
cp $84
jr nc, .asm_cd158
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
call Functionce70a
@ -460,7 +460,7 @@ BattleAnimFunction_10:
dw .three
dw .four
.zero
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
swap a
@ -476,7 +476,7 @@ BattleAnimFunction_10:
ld a, [hl]
cp $88
ret nc
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
call Functionce70a
@ -526,7 +526,7 @@ BattleAnimFunction_07:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
sub [hl]
jr z, .done
@ -587,7 +587,7 @@ BattleAnimFunction_08:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@ -598,7 +598,7 @@ BattleAnimFunction_08:
ret
.loop_back
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
@ -630,7 +630,7 @@ BattleAnimFunction_08:
ret
.SetCoords:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@ -638,7 +638,7 @@ BattleAnimFunction_08:
add hl, bc
add [hl]
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@ -663,7 +663,7 @@ BattleAnimFunction_09:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $0
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@ -680,7 +680,7 @@ BattleAnimFunction_09:
ret
.done_one
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
swap a
@ -714,7 +714,7 @@ BattleAnimFunction_0A:
dw .eight
dw .nine
.zero
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
@ -827,7 +827,7 @@ BattleAnimFunction_RazorLeaf:
ld [hl], a
ld a, BATTLEANIMFRAMESET_17
call ReinitBattleAnimFrameset
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
bit 6, [hl]
ret z
@ -837,7 +837,7 @@ BattleAnimFunction_RazorLeaf:
ret
.sine_cosine
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $3f
@ -887,7 +887,7 @@ BattleAnimFunction_RazorLeaf:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
bit 6, [hl]
jr nz, .decrease
@ -944,7 +944,7 @@ BattleAnimFunction_RazorLeaf:
ret
Functioncd557:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
bit 7, a
@ -987,7 +987,7 @@ BattleAnimFunction_4E:
dw .zero
dw .one
.zero
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $40
@ -1011,7 +1011,7 @@ BattleAnimFunction_4E:
ret
.sine_cosine
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $3f
@ -1061,7 +1061,7 @@ BattleAnimFunction_0C:
and a
jr z, .next
dec [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
call Functionce70a
@ -1103,7 +1103,7 @@ BattleAnimFunction_0C:
ld a, [hl]
cp $20
ret c
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
@ -1146,7 +1146,7 @@ BattleAnimFunction_0D:
ret
.one
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld e, [hl]
ld hl, BATTLEANIMSTRUCT_YCOORD
@ -1220,7 +1220,7 @@ BattleAnimFunction_0E:
Functioncd6ea:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, BATTLEANIMFRAMESET_24
add [hl] ; offset
@ -1349,14 +1349,14 @@ BattleAnimFunction_14:
Functioncd7ab:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@ -1366,7 +1366,7 @@ Functioncd7ab:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld [hl], $1
Functioncd7d2:
@ -1398,7 +1398,7 @@ Functioncd7d2:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
xor $1
@ -1447,7 +1447,7 @@ Functioncd835:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
bit 7, [hl]
jr nz, .asm_cd852
@ -1461,7 +1461,7 @@ Functioncd835:
add hl, bc
ld [hl], $30
.asm_cd858
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $7f
@ -1470,7 +1470,7 @@ Functioncd860:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld d, [hl]
call BattleAnim_Sine
@ -1520,7 +1520,7 @@ BattleAnimFunction_17:
Functioncd8ab:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
bit 7, [hl]
jr nz, .asm_cd8be
@ -1534,7 +1534,7 @@ Functioncd8ab:
add hl, bc
ld [hl], $30
.asm_cd8c4
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $7f
@ -1544,7 +1544,7 @@ Functioncd8cc:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld d, [hl]
call BattleAnim_Sine
@ -1592,7 +1592,7 @@ Functioncd907:
inc hl
ld [hl], $0
Functioncd913:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0F
@ -1646,7 +1646,7 @@ BattleAnimFunction_19:
Functioncd961:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld [hl], $0
Functioncd96a:
@ -1696,7 +1696,7 @@ Functioncd99a:
sra a
sra a
sra a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
add [hl]
ld hl, BATTLEANIMSTRUCT_YOFFSET
@ -1713,7 +1713,7 @@ Functioncd99a:
ld a, [hl]
sub $8
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and a
@ -1735,7 +1735,7 @@ Functioncd99a:
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_XOFFSET
@ -1767,7 +1767,7 @@ BattleAnimFunction_1C:
ret
.asm_cda17
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@ -1870,7 +1870,7 @@ Functioncda8d:
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld d, [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld h, [hl]
ld a, h
@ -2044,7 +2044,7 @@ Functioncdb9f:
ld [hl], $28
inc hl
ld [hl], $10
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
@ -2235,7 +2235,7 @@ BattleAnimFunction_1E:
ret
.asm_cdcb6
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld d, [hl]
ld hl, BATTLEANIMSTRUCT_YOFFSET
@ -2255,7 +2255,7 @@ Functioncdcca:
ldh a, [hBattleTurn]
and a
jr z, .asm_cdcd9
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
xor $ff
@ -2266,7 +2266,7 @@ Functioncdcca:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $8
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, BATTLEANIMFRAMESET_59
add [hl]
@ -2299,7 +2299,7 @@ Functioncdcfe:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and a
@ -2328,14 +2328,14 @@ BattleAnimFunction_22:
Functioncdd31:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $3f
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $80
@ -2346,7 +2346,7 @@ Functioncdd31:
ret
Functioncdd4f:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
swap a
@ -2402,7 +2402,7 @@ Functioncdd97:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $80
@ -2411,13 +2411,13 @@ Functioncdd97:
add hl, bc
add [hl]
call ReinitBattleAnimFrameset
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $7f
ld [hl], a
Functioncddbc:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $10
@ -2435,7 +2435,7 @@ Functioncddbc:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@ -2466,12 +2466,12 @@ BattleAnimFunction_24:
Functioncde02:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
add BATTLEANIMFRAMESET_63
call ReinitBattleAnimFrameset
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld e, [hl]
ld d, 0
@ -2544,7 +2544,7 @@ BattleAnimFunction_27:
Functioncde72:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and a
@ -2553,7 +2553,7 @@ Functioncde72:
add hl, bc
set 6, [hl]
.asm_cde83
add BATTLEANIMFRAMESET_6A
add BATTLEANIMFRAMESET_6A ; BATTLEANIMFRAMESET_6B BATTLEANIMFRAMESET_6C
call ReinitBattleAnimFrameset
Functioncde88:
ret
@ -2569,7 +2569,7 @@ Functioncde90:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $0
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld e, [hl]
ld a, e
@ -2606,7 +2606,7 @@ Functioncdebf:
ret
.asm_cdec9
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0F
@ -2739,7 +2739,7 @@ Functioncdf60:
ret
BattleAnimFunction_34:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $18
@ -2761,7 +2761,7 @@ BattleAnimFunction_34:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
inc [hl]
inc [hl]
@ -2781,7 +2781,7 @@ BattleAnimFunction_34:
ret
BattleAnimFunction_3C:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $18
@ -2803,7 +2803,7 @@ BattleAnimFunction_3C:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
inc [hl]
inc [hl]
@ -2889,7 +2889,7 @@ BattleAnimFunction_Horn:
dw .two
dw Functionce09e
.zero:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
@ -2955,7 +2955,7 @@ BattleAnimFunction_2C:
dw Functionce0dd
Functionce0ce:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
@ -2992,7 +2992,7 @@ Functionce0f8:
ret
.asm_ce105
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
call Functionce70a
@ -3028,7 +3028,7 @@ Functionce12a:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
and [hl]
jr nz, .asm_ce149
@ -3050,7 +3050,7 @@ Functionce12a:
ret
BattleAnimFunction_2F:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0F
@ -3068,7 +3068,7 @@ BattleAnimFunction_2F:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
inc [hl]
ld a, [hl]
@ -3078,7 +3078,7 @@ BattleAnimFunction_2F:
add hl, bc
dec [hl]
.asm_ce189
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $3
@ -3109,7 +3109,7 @@ BattleAnimFunction_2F:
ret
BattleAnimFunction_42:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@ -3162,7 +3162,7 @@ Functionce1ee:
add hl, bc
ld [hl], a
Functionce1fb:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $30
@ -3173,7 +3173,7 @@ Functionce1fb:
ld hl, BATTLEANIMSTRUCT_YCOORD
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
add $8
@ -3182,7 +3182,7 @@ Functionce1fb:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
inc [hl]
ret
@ -3195,7 +3195,7 @@ BattleAnimFunction_31:
Functionce22d:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $10
@ -3203,7 +3203,7 @@ Functionce22d:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $10
@ -3303,7 +3303,7 @@ Unknown_ce2c8:
db $ff, $ff, $00, $00
BattleAnimFunction_33:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $18
@ -3317,7 +3317,7 @@ BattleAnimFunction_33:
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@ -3413,14 +3413,14 @@ BattleAnimFunction_37:
Functionce366:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $7f
add BATTLEANIMFRAMESET_81
call ReinitBattleAnimFrameset
Functionce375:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
bit 7, [hl]
jr nz, .asm_ce383
@ -3498,7 +3498,7 @@ BattleAnimFunction_3A:
ret
.asm_ce3df
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $8
@ -3506,7 +3506,7 @@ BattleAnimFunction_3A:
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
add $2
@ -3525,7 +3525,7 @@ BattleAnimFunction_3B:
dw Functionce412
Functionce406:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_XCOORD
@ -3539,7 +3539,7 @@ Functionce412:
ret
BattleAnimFunction_3D:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $18
@ -3556,7 +3556,7 @@ BattleAnimFunction_3D:
add hl, bc
sra a
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@ -3574,7 +3574,7 @@ Functionce443:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $28
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@ -3582,7 +3582,7 @@ Functionce443:
add hl, bc
add [hl]
call ReinitBattleAnimFrameset
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
@ -3597,7 +3597,7 @@ Functionce465:
dec [hl]
add $8
ld d, a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
push af
@ -3635,7 +3635,7 @@ BattleAnimFunction_40:
Functionce4a3:
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, BATTLEANIMFRAMESET_24
add [hl]
@ -3671,7 +3671,7 @@ Functionce4b0:
ret
BattleAnimFunction_41:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and a
@ -3695,7 +3695,7 @@ BattleAnimFunction_41:
ld a, [hl]
and $1f
ret nz
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
srl [hl]
ret
@ -3709,7 +3709,7 @@ BattleAnimFunction_43:
inc [hl]
inc [hl]
ld d, a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
push af
@ -3731,7 +3731,7 @@ BattleAnimFunction_43:
ret
BattleAnimFunction_44:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld e, [hl]
ld hl, BATTLEANIMSTRUCT_0F
@ -3768,7 +3768,7 @@ BattleAnimFunction_45:
Functionce564:
ld d, $18
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@ -3788,7 +3788,7 @@ Functionce577:
ld d, a
add $8
ld [hl], a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
jr asm_ce58f
@ -3830,7 +3830,7 @@ Functionce5b3:
BattleAnimFunction_47:
ld d, $50
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@ -3880,7 +3880,7 @@ BattleAnimFunction_49:
dw Functionce618
Functionce5f9:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and a
@ -3929,7 +3929,7 @@ BattleAnimFunction_4A:
dw Functionce672
Functionce63a:
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
@ -3995,7 +3995,7 @@ BattleAnimFunction_4B:
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld e, [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld l, a
@ -4021,7 +4021,7 @@ BattleAnimFunction_4B:
BattleAnimFunction_4C:
ld d, $18
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@ -4035,7 +4035,7 @@ BattleAnimFunction_4F:
ld a, [hl]
inc [hl]
srl a
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
add [hl]
call Functionce6f1
@ -4048,7 +4048,7 @@ BattleAnimFunction_4D:
cp $20
jr nc, .asm_ce6ed
inc [hl]
ld hl, BATTLEANIMSTRUCT_0B
ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld d, [hl]
call BattleAnim_Sine

2
wram.asm
View File

@ -3055,7 +3055,7 @@ NEXTU ; d419
wBattleObjectTempID:: db
wBattleObjectTempXCoord:: db
wBattleObjectTempYCoord:: db
wBattleObjectTemp0b:: db
wBattleObjectTempParam:: db
NEXTU ; d419
wBattleAnimTempOAMFlags:: db