ref: 4819a54b164268fed7a7f36a3bf4bd4d1f727178
parent: b791198f74e55ff6a96d33784d9661854dbca113
parent: ffeae953ea2eab16253c37443103d39b340490d0
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Sat Feb 9 13:04:03 EST 2019
Merge pull request #598 from mid-kid/temp BATTLEANIMSTRUCT_0B -> BATTLEANIMSTRUCT_PARAM
--- a/constants/battle_anim_constants.asm
+++ b/constants/battle_anim_constants.asm
@@ -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
--- a/engine/battle_anims/anim_commands.asm
+++ b/engine/battle_anims/anim_commands.asm
@@ -601,7 +601,7 @@
call GetBattleAnimByte
ld [wBattleObjectTempYCoord], a
call GetBattleAnimByte
- ld [wBattleObjectTemp0b], a
+ ld [wBattleObjectTempParam], a
call QueueBattleAnimation
ret
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -440,7 +440,7 @@
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 @@
ld a, 8 * TILE_WIDTH
ld [wBattleObjectTempYCoord], a
xor a
- ld [wBattleObjectTemp0b], a
+ ld [wBattleObjectTempParam], a
call _QueueBattleAnimation
pop bc
ret
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
@@ -65,8 +65,8 @@
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
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
@@ -130,7 +130,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
ret
.loop_back
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
@@ -630,7 +630,7 @@
ret
.SetCoords:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@@ -638,7 +638,7 @@
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 @@
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 @@
ret
.done_one
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
swap a
@@ -714,7 +714,7 @@
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 @@
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 @@
ret
.sine_cosine
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $3f
@@ -887,7 +887,7 @@
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 @@
ret
Functioncd557:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
bit 7, a
@@ -987,7 +987,7 @@
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 @@
ret
.sine_cosine
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $3f
@@ -1061,7 +1061,7 @@
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 @@
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 @@
ret
.one
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld e, [hl]
ld hl, BATTLEANIMSTRUCT_YCOORD
@@ -1220,10 +1220,10 @@
Functioncd6ea:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, BATTLEANIMFRAMESET_24
- add [hl] ; offset
+ add [hl] ; BATTLEANIMFRAMESET_25 BATTLEANIMFRAMESET_26
call ReinitBattleAnimFrameset
Functioncd6f7:
@@ -1349,7 +1349,7 @@
Functioncd7ab:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
@@ -1356,7 +1356,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
@@ -1482,13 +1482,15 @@
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld a, [hl]
- inc a
+ inc a ; BATTLEANIMFRAMESET_3B
+ ; BATTLEANIMFRAMESET_A1
jr .reinit
.load_no_inc
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
- ld a, [hl]
+ ld a, [hl] ; BATTLEANIMFRAMESET_3A
+ ; BATTLEANIMFRAMESET_A0
.reinit
call ReinitBattleAnimFrameset
ld hl, BATTLEANIMSTRUCT_0F
@@ -1520,7 +1522,7 @@
Functioncd8ab:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
bit 7, [hl]
jr nz, .asm_cd8be
@@ -1534,7 +1536,7 @@
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 +1546,7 @@
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
@@ -1553,11 +1555,11 @@
ld [hl], a
bit 7, a
jr nz, .asm_cd8e6
- ld a, $3d
+ ld a, BATTLEANIMFRAMESET_3D
jr .asm_cd8e8
.asm_cd8e6
- ld a, $3c
+ ld a, BATTLEANIMFRAMESET_3C
.asm_cd8e8
call ReinitBattleAnimFrameset
ld hl, BATTLEANIMSTRUCT_0F
@@ -1592,7 +1594,7 @@
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 +1648,7 @@
Functioncd961:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld [hl], $0
Functioncd96a:
@@ -1696,7 +1698,7 @@
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 +1715,7 @@
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 +1737,7 @@
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 +1769,7 @@
ret
.asm_cda17
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f
@@ -1797,7 +1799,8 @@
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld a, [hl]
- inc a
+ inc a ; BATTLEANIMFRAMESET_53
+ ; BATTLEANIMFRAMESET_55
call ReinitBattleAnimFrameset
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -1870,7 +1873,7 @@
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 +2047,7 @@
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 +2238,7 @@
ret
.asm_cdcb6
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld d, [hl]
ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -2255,7 +2258,7 @@
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,10 +2269,10 @@
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]
+ add [hl] ; BATTLEANIMFRAMESET_5A BATTLEANIMFRAMESET_5B
call ReinitBattleAnimFrameset
ret
@@ -2299,7 +2302,7 @@
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,7 +2331,7 @@
Functioncdd31:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $3f
@@ -2335,18 +2338,18 @@
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
rlca
ld [hl], a
- add BATTLEANIMFRAMESET_5D
+ add BATTLEANIMFRAMESET_5D ; BATTLEANIMFRAMESET_5E
call ReinitBattleAnimFrameset
ret
Functioncdd4f:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
swap a
@@ -2402,7 +2405,7 @@
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
@@ -2409,15 +2412,16 @@
rlca
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
- add [hl]
+ add [hl] ; BATTLEANIMFRAMESET_61 BATTLEANIMFRAMESET_62
+ ; BATTLEANIMFRAMESET_9C BATTLEANIMFRAMESET_9D
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 +2439,7 @@
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]
@@ -2446,13 +2450,15 @@
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
- inc a
+ inc a ; BATTLEANIMFRAMESET_62
+ ; BATTLEANIMFRAMESET_9D
jr .asm_cddf5
.asm_cddf0
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
- ld a, [hl]
+ ld a, [hl] ; BATTLEANIMFRAMESET_61
+ ; BATTLEANIMFRAMESET_9C
.asm_cddf5
call ReinitBattleAnimFrameset
ret
@@ -2466,12 +2472,12 @@
Functioncde02:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
- add BATTLEANIMFRAMESET_63
+ add BATTLEANIMFRAMESET_63 ; BATTLEANIMFRAMESET_64 BATTLEANIMFRAMESET_65
call ReinitBattleAnimFrameset
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld e, [hl]
ld d, 0
@@ -2544,7 +2550,7 @@
Functioncde72:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and a
@@ -2553,7 +2559,7 @@
add hl, bc
set 6, [hl]
.asm_cde83
- add BATTLEANIMFRAMESET_6A
+ add BATTLEANIMFRAMESET_6A ; BATTLEANIMFRAMESET_6B BATTLEANIMFRAMESET_6C
call ReinitBattleAnimFrameset
Functioncde88:
ret
@@ -2569,7 +2575,7 @@
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 +2612,7 @@
ret
.asm_cdec9
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0F
@@ -2739,7 +2745,7 @@
ret
BattleAnimFunction_34:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $18
@@ -2761,7 +2767,7 @@
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 +2787,7 @@
ret
BattleAnimFunction_3C:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $18
@@ -2803,7 +2809,7 @@
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 +2895,7 @@
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 +2961,7 @@
dw Functionce0dd
Functionce0ce:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
@@ -2992,7 +2998,7 @@
ret
.asm_ce105
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
call Functionce70a
@@ -3028,7 +3034,7 @@
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 +3056,7 @@
ret
BattleAnimFunction_2F:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_0F
@@ -3068,7 +3074,7 @@
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 +3084,7 @@
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 +3115,7 @@
ret
BattleAnimFunction_42:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@@ -3162,7 +3168,7 @@
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 +3179,7 @@
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 +3188,7 @@
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 +3201,7 @@
Functionce22d:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $10
@@ -3203,7 +3209,7 @@
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 +3309,7 @@
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 +3323,7 @@
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 +3419,14 @@
Functionce366:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $7f
- add BATTLEANIMFRAMESET_81
+ add BATTLEANIMFRAMESET_81 ; BATTLEANIMFRAMESET_82 BATTLEANIMFRAMESET_83
call ReinitBattleAnimFrameset
Functionce375:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
bit 7, [hl]
jr nz, .asm_ce383
@@ -3498,7 +3504,7 @@
ret
.asm_ce3df
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $8
@@ -3506,7 +3512,7 @@
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 +3531,7 @@
dw Functionce412
Functionce406:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld hl, BATTLEANIMSTRUCT_XCOORD
@@ -3539,7 +3545,7 @@
ret
BattleAnimFunction_3D:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
ld d, $18
@@ -3556,7 +3562,7 @@
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,15 +3580,16 @@
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
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
- add [hl]
+ add [hl] ; BATTLEANIMFRAMESET_8F BATTLEANIMFRAMESET_90 BATTLEANIMFRAMESET_91
+ ; BATTLEANIMFRAMESET_93 BATTLEANIMFRAMESET_94 BATTLEANIMFRAMESET_95
call ReinitBattleAnimFrameset
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and $f0
@@ -3597,7 +3604,7 @@
dec [hl]
add $8
ld d, a
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
push af
@@ -3635,10 +3642,10 @@
Functionce4a3:
call BattleAnim_IncAnonJumptableIndex
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, BATTLEANIMFRAMESET_24
- add [hl]
+ add [hl] ; BATTLEANIMFRAMESET_25 BATTLEANIMFRAMESET_26
call ReinitBattleAnimFrameset
Functionce4b0:
ld hl, BATTLEANIMSTRUCT_YOFFSET
@@ -3671,7 +3678,7 @@
ret
BattleAnimFunction_41:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and a
@@ -3695,7 +3702,7 @@
ld a, [hl]
and $1f
ret nz
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
srl [hl]
ret
@@ -3709,7 +3716,7 @@
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 +3738,7 @@
ret
BattleAnimFunction_44:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld e, [hl]
ld hl, BATTLEANIMSTRUCT_0F
@@ -3768,7 +3775,7 @@
Functionce564:
ld d, $18
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@@ -3788,7 +3795,7 @@
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 +3837,7 @@
BattleAnimFunction_47:
ld d, $50
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@@ -3880,7 +3887,7 @@
dw Functionce618
Functionce5f9:
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
and a
@@ -3929,7 +3936,7 @@
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 +4002,7 @@
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 +4028,7 @@
BattleAnimFunction_4C:
ld d, $18
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
ld a, [hl]
inc [hl]
@@ -4035,7 +4042,7 @@
ld a, [hl]
inc [hl]
srl a
- ld hl, BATTLEANIMSTRUCT_0B
+ ld hl, BATTLEANIMSTRUCT_PARAM
add hl, bc
add [hl]
call Functionce6f1
@@ -4048,7 +4055,7 @@
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
--- a/wram.asm
+++ b/wram.asm
@@ -3067,7 +3067,7 @@
wBattleObjectTempID:: db
wBattleObjectTempXCoord:: db
wBattleObjectTempYCoord:: db
-wBattleObjectTemp0b:: db
+wBattleObjectTempParam:: db
NEXTU ; d419
wBattleAnimTempOAMFlags:: db