ref: 3893feb835ef4959b77148668da90aaed3189b00
parent: ddc05ec8dd36eb88d48a5dab258f4daae85eadc3
author: PikalaxALT <[email protected]>
date: Wed Dec 23 09:00:29 EST 2015
Battle Anim Object struct constants
--- a/battle/anim_commands.asm
+++ b/battle/anim_commands.asm
@@ -77,7 +77,7 @@
call BattleAnimRestoreHuds
.disabled
- ld a, [wcfca]
+ ld a, [wNumHits]
and a
jr z, .done
@@ -92,7 +92,7 @@
.hi_byte
call WaitSFX
- call Functioncc881
+ call PlayHitSound
call RunBattleAnimScript
.done
@@ -191,13 +191,13 @@
ld a, [rBGP]
ld b, a
- ld a, [wcfc7]
+ ld a, [wBGP]
cp b
call nz, Functioncc91a
ld a, [rOBP0]
ld b, a
- ld a, [wcfc8]
+ ld a, [wOBP0]
cp b
call nz, Functioncc94b
ret
@@ -625,6 +625,7 @@
ret
BattleAnimCmd_Obj: ; cc41f (33:441f)
+; index, ???, ???, ???
call GetBattleAnimByte
ld [BattleAnimTemps], a
call GetBattleAnimByte
@@ -650,17 +651,17 @@
BattleAnimCmd_BGP: ; cc457 (33:4457)
call GetBattleAnimByte
- ld [wcfc7], a
+ ld [wBGP], a
ret
BattleAnimCmd_OBP0: ; cc45e (33:445e)
call GetBattleAnimByte
- ld [wcfc8], a
+ ld [wOBP0], a
ret
BattleAnimCmd_OBP1: ; cc465 (33:4465)
call GetBattleAnimByte
- ld [wcfc9], a
+ ld [wOBP1], a
ret
BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
@@ -670,7 +671,7 @@
jr z, .not_sgb
ld a, $f0
.not_sgb
- ld [wcfc8], a
+ ld [wOBP0], a
ret
BattleAnimCmd_ClearObjs: ; cc479 (33:4479)
@@ -691,10 +692,10 @@
ld a, [BattleAnimByte]
and $f
ld c, a
- ld hl, w5_d300
+ ld hl, wBattleAnimTileDict
xor a
ld [BattleAnimTemps], a
-.asm_cc492
+.loop
ld a, [BattleAnimTemps]
cp $4f
ret nc
@@ -719,7 +720,7 @@
pop hl
pop bc
dec c
- jr nz, .asm_cc492
+ jr nz, .loop
ret
BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
@@ -797,7 +798,7 @@
BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
- ld hl, w5_d300
+ ld hl, wBattleAnimTileDict
.asm_cc52f
ld a, [hl]
and a
@@ -853,7 +854,7 @@
BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
- ld hl, w5_d300
+ ld hl, wBattleAnimTileDict
.asm_cc581
ld a, [hl]
and a
@@ -1249,7 +1250,7 @@
and 3
ld e, a
ld d, 0
- ld hl, Datacc871
+ ld hl, .CryData
rept 4
add hl, de
endr
@@ -1266,7 +1267,7 @@
ld a, $f0
ld [CryTracks], a ; CryTracks
ld a, [BattleMonSpecies] ; BattleMonSpecies
- jr .asm_cc834
+ jr .done_cry_tracks
.enemy
ld a, $0f
@@ -1273,7 +1274,7 @@
ld [CryTracks], a ; CryTracks
ld a, [EnemyMonSpecies] ; EnemyMon
-.asm_cc834
+.done_cry_tracks
push hl
call LoadCryHeader
pop hl
@@ -1320,17 +1321,17 @@
ret
; cc871 (33:4871)
-Datacc871: ; cc871
+.CryData: ; cc871
; +pitch, +length
- dw 0, $c0
- dw 0, $40
- dw 0, $00
- dw 0, $00
+ dw $0000, $00c0
+ dw $0000, $0040
+ dw $0000, $0000
+ dw $0000, $0000
; cc881
-Functioncc881: ; cc881
- ld a, [wcfca]
+PlayHitSound: ; cc881
+ ld a, [wNumHits]
cp $1
jr z, .okay
cp $4
@@ -1366,17 +1367,17 @@
ld a, %11110000
.sgb
- ld [wcfc8], a
+ ld [wOBP0], a
ld a, %11100100
- ld [wcfc7], a
- ld [wcfc9], a
+ ld [wBGP], a
+ ld [wOBP1], a
ret
.cgb
ld a, %11100100
- ld [wcfc7], a
- ld [wcfc8], a
- ld [wcfc9], a
+ ld [wBGP], a
+ ld [wOBP0], a
+ ld [wOBP1], a
call DmgToCgbBGPals
lb de, %11100100, %11100100
call DmgToCgbObjPals
@@ -1412,9 +1413,9 @@
Functioncc8f6: ; cc8f6
call WaitTop
ld a, %11100100
- ld [wcfc7], a
- ld [wcfc8], a
- ld [wcfc9], a
+ ld [wBGP], a
+ ld [wOBP0], a
+ ld [wOBP1], a
call DmgToCgbBGPals
lb de, %11100100, %11100100
call DmgToCgbObjPals
--- a/battle/anim_objects.asm
+++ b/battle/anim_objects.asm
@@ -7,7 +7,7 @@
ld a, [hl]
and a
jr z, .done
- ld bc, $18
+ ld bc, BATTLEANIMSTRUCT_LENGTH
add hl, bc
dec e
jr nz, .loop
@@ -17,13 +17,13 @@
.done
ld c, l
ld b, h
- ld hl, w5_d40e
+ ld hl, wNumActiveBattleAnims
inc [hl]
- call Functioncc9c4
+ call InitBattleAnimation
ret
-Functioncc9bd: ; cc9bd
- ld hl, $0
+DeinitBattleAnimation: ; cc9bd
+ ld hl, BATTLEANIMSTRUCT_INDEX
add hl, bc
ld [hl], $0
ret
@@ -30,7 +30,7 @@
; cc9c4
-Functioncc9c4: ; cc9c4 (33:49c4)
+InitBattleAnimation: ; cc9c4 (33:49c4)
ld a, [BattleAnimTemps]
ld e, a
ld d, 0
@@ -40,26 +40,16 @@
endr
ld e, l
ld d, h
- ld hl, $0
+ ld hl, BATTLEANIMSTRUCT_INDEX
add hl, bc
- ld a, [w5_d40e]
+ ld a, [wNumActiveBattleAnims]
ld [hli], a
+rept 5
ld a, [de]
inc de
ld [hli], a
+endr
ld a, [de]
- inc de
- ld [hli], a
- ld a, [de]
- inc de
- ld [hli], a
- ld a, [de]
- inc de
- ld [hli], a
- ld a, [de]
- inc de
- ld [hli], a
- ld a, [de]
call Functionccb31
ld [hli], a
ld a, [BattleAnimTemps + 1]
@@ -184,7 +174,7 @@
jr .asm_ccaa5
.asm_ccaa2
- call Functioncc9bd
+ call DeinitBattleAnimation
.asm_ccaa5
and a
@@ -198,7 +188,7 @@
; ccaaa
Functionccaaa: ; ccaaa
- ld hl, $1
+ ld hl, BATTLEANIMSTRUCT_01
add hl, bc
ld a, [hl]
and $80
@@ -205,15 +195,15 @@
ld [BattleAnimTemps], a
xor a
ld [BattleAnimTemps + 7], a
- ld hl, $5
+ ld hl, BATTLEANIMSTRUCT_05
add hl, bc
ld a, [hl]
ld [BattleAnimTemps + 8], a
- ld hl, $2
+ ld hl, BATTLEANIMSTRUCT_02
add hl, bc
ld a, [hl]
ld [BattleAnimTemps + 1], a
- ld hl, $6
+ ld hl, BATTLEANIMSTRUCT_06
add hl, bc
ld a, [hli]
ld [BattleAnimTemps + 2], a
@@ -228,13 +218,13 @@
ld a, [hBattleTurn]
and a
ret z
- ld hl, $1
+ ld hl, BATTLEANIMSTRUCT_01
add hl, bc
ld a, [hl]
ld [BattleAnimTemps], a
bit 0, [hl]
ret z
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hli]
ld d, a
@@ -285,22 +275,22 @@
Functionccb31: ; ccb31 (33:4b31)
push hl
push bc
- ld hl, w5_d300
+ ld hl, wBattleAnimTileDict
ld b, a
- ld c, $5
-.asm_ccb39
+ ld c, 10 / 2
+.loop
ld a, [hli]
cp b
- jr z, .asm_ccb44
+ jr z, .load
inc hl
dec c
- jr nz, .asm_ccb39
+ jr nz, .loop
xor a
- jr .asm_ccb45
+ jr .done
-.asm_ccb44
+.load
ld a, [hl]
-.asm_ccb45
+.done
pop bc
pop hl
ret
@@ -318,198 +308,198 @@
; ccb56 (33:4b56)
BattleAnimObjects: ; ccb56
- db $01, $ff, $00, $00, $02, $01
- db $01, $ff, $01, $00, $02, $01
- db $01, $ff, $02, $00, $02, $01
- db $01, $90, $00, $00, $02, $01
- db $01, $90, $01, $00, $02, $01
- db $01, $90, $02, $00, $02, $01
- db $01, $ff, $03, $00, $02, $01
- db $01, $ff, $04, $1b, $02, $01
- db $01, $ff, $05, $00, $02, $01
- db $01, $ff, $06, $00, $02, $01
- db $01, $90, $07, $09, $02, $01
- db $01, $aa, $10, $10, $04, $03
- db $01, $90, $0e, $04, $04, $03
- db $01, $90, $0f, $03, $04, $03
- db $01, $90, $10, $08, $04, $03
- db $01, $90, $0f, $0a, $04, $03
- db $01, $90, $11, $03, $04, $03
- db $01, $90, $12, $08, $06, $0a
- db $01, $90, $13, $00, $06, $0a
- db $01, $90, $14, $01, $06, $0a
- db $21, $78, $16, $0b, $05, $06
- db $00, $00, $09, $12, $04, $0b
- db $00, $00, $09, $13, $04, $0b
- db $01, $90, $18, $00, $04, $08
- db $01, $ff, $18, $00, $04, $08
- db $01, $90, $1d, $06, $02, $0c
- db $01, $b4, $1f, $38, $02, $0c
- db $01, $90, $08, $00, $02, $07
- db $01, $a0, $08, $00, $02, $07
- db $01, $ff, $19, $07, $07, $09
- db $01, $ff, $1a, $07, $07, $09
- db $01, $b0, $1b, $36, $07, $09
- db $01, $b0, $84, $36, $06, $21
- db $01, $90, $21, $0c, $06, $0d
- db $00, $00, $23, $0d, $06, $0d
- db $01, $90, $24, $0e, $02, $0e
- db $61, $80, $27, $0f, $06, $04
- db $01, $b4, $2a, $00, $06, $04
- db $01, $40, $2b, $11, $05, $0f
- db $61, $98, $2c, $00, $03, $10
- db $61, $98, $2d, $09, $03, $10
- db $01, $b8, $2e, $00, $06, $0a
- db $01, $b8, $2f, $00, $06, $0a
- db $01, $b8, $30, $14, $07, $11
- db $01, $90, $21, $14, $03, $0d
- db $21, $b0, $31, $00, $03, $05
- db $21, $b0, $32, $00, $03, $05
- db $21, $b0, $33, $00, $03, $05
- db $21, $90, $34, $15, $03, $05
- db $21, $90, $36, $00, $03, $05
- db $21, $90, $37, $03, $02, $08
- db $21, $90, $38, $00, $03, $05
- db $21, $90, $39, $03, $02, $08
- db $21, $90, $3a, $16, $02, $02
- db $01, $90, $3c, $17, $02, $02
- db $21, $ff, $3e, $00, $02, $02
- db $21, $ff, $3f, $00, $02, $02
- db $21, $ff, $40, $00, $02, $02
- db $21, $ff, $41, $00, $02, $02
- db $21, $ff, $42, $00, $02, $02
- db $01, $88, $43, $18, $05, $12
- db $01, $88, $44, $00, $05, $12
- db $21, $b8, $45, $19, $02, $13
- db $21, $ff, $46, $00, $02, $14
- db $21, $ff, $47, $00, $02, $14
- db $21, $ff, $48, $1a, $02, $14
- db $21, $ff, $49, $1a, $02, $14
- db $21, $98, $4a, $01, $02, $14
- db $21, $80, $4b, $00, $03, $11
- db $01, $88, $4c, $1c, $05, $12
- db $21, $b0, $4d, $1d, $02, $15
- db $01, $b0, $51, $1e, $03, $11
- db $21, $ff, $52, $1f, $05, $16
- db $21, $ff, $54, $1f, $05, $16
- db $21, $68, $56, $20, $05, $06
- db $21, $90, $59, $21, $02, $0e
- db $21, $90, $5c, $02, $02, $17
- db $01, $90, $5d, $22, $03, $11
- db $61, $88, $5f, $00, $03, $10
- db $61, $88, $2d, $09, $03, $10
- db $21, $88, $60, $00, $03, $18
- db $21, $80, $60, $00, $02, $18
- db $21, $50, $61, $23, $03, $19
- db $01, $80, $63, $24, $02, $19
- db $01, $80, $66, $25, $02, $19
- db $01, $50, $1c, $00, $02, $0c
- db $21, $a8, $67, $26, $07, $1a
- db $21, $a8, $68, $00, $07, $1a
- db $21, $90, $69, $01, $02, $1a
- db $21, $90, $6d, $28, $03, $19
- db $21, $90, $6a, $27, $02, $1b
- db $00, $00, $6f, $29, $02, $1c
- db $21, $48, $70, $29, $02, $1c
- db $21, $48, $6f, $29, $02, $1c
- db $21, $78, $6f, $2a, $02, $1c
- db $61, $90, $71, $2b, $02, $1d
- db $61, $90, $72, $2c, $02, $1d
- db $01, $48, $73, $2d, $04, $1e
- db $01, $90, $74, $06, $02, $15
- db $01, $ff, $75, $2e, $07, $19
- db $21, $90, $4a, $02, $02, $14
- db $01, $80, $30, $2f, $02, $11
- db $01, $78, $76, $2a, $04, $23
- db $01, $80, $77, $30, $02, $1f
- db $01, $90, $77, $02, $02, $1f
- db $01, $ff, $77, $00, $02, $1f
- db $01, $80, $78, $08, $03, $23
- db $21, $90, $79, $00, $02, $1f
- db $01, $ff, $7a, $31, $03, $11
- db $01, $88, $7a, $31, $03, $11
- db $21, $88, $7b, $32, $02, $20
- db $21, $98, $7c, $00, $02, $04
- db $21, $80, $7d, $00, $02, $18
- db $01, $80, $21, $2f, $06, $0d
- db $01, $b0, $7e, $33, $03, $12
- db $01, $80, $7f, $2f, $02, $08
- db $21, $a0, $6f, $34, $02, $1c
- db $21, $a0, $74, $35, $02, $15
- db $21, $b0, $80, $33, $02, $14
- db $01, $88, $81, $37, $02, $11
- db $01, $88, $85, $00, $02, $22
- db $01, $88, $86, $00, $02, $22
- db $01, $90, $87, $39, $02, $1f
- db $01, $80, $30, $3a, $03, $11
- db $21, $90, $34, $00, $03, $05
- db $a1, $88, $88, $3b, $06, $13
- db $01, $80, $76, $25, $04, $23
- db $01, $98, $10, $34, $04, $03
- db $01, $a8, $0f, $3c, $04, $03
- db $21, $68, $89, $29, $02, $1f
- db $21, $b0, $8a, $00, $02, $1f
- db $21, $80, $8c, $00, $02, $1f
- db $21, $50, $8d, $00, $03, $1f
- db $01, $40, $24, $40, $02, $0e
- db $21, $a8, $8e, $41, $04, $1f
- db $21, $88, $8f, $3e, $02, $1f
- db $21, $88, $93, $3e, $02, $1f
- db $21, $90, $97, $3d, $02, $1f
- db $21, $90, $78, $3d, $03, $23
- db $01, $ff, $99, $2e, $02, $19
- db $21, $a0, $74, $02, $02, $15
- db $21, $a0, $99, $35, $04, $19
- db $21, $70, $8b, $3f, $02, $1f
- db $01, $90, $15, $08, $02, $0a
- db $01, $90, $11, $02, $04, $03
- db $01, $80, $7f, $42, $02, $08
- db $01, $90, $9a, $00, $02, $1b
- db $21, $a0, $9b, $35, $04, $23
- db $21, $80, $9c, $23, $02, $25
- db $21, $80, $9d, $25, $02, $25
- db $21, $80, $9c, $00, $02, $25
- db $21, $80, $9e, $00, $06, $25
- db $61, $80, $9f, $3a, $05, $23
- db $21, $80, $a0, $16, $02, $23
- db $21, $70, $78, $43, $03, $23
- db $21, $c0, $a2, $01, $02, $25
- db $21, $40, $a3, $44, $03, $24
- db $01, $80, $a4, $00, $02, $24
- db $01, $80, $a5, $00, $03, $24
- db $01, $88, $43, $45, $04, $12
- db $21, $ff, $a6, $00, $02, $02
- db $21, $ff, $a7, $00, $02, $02
- db $21, $00, $b4, $4a, $07, $0f
- db $21, $90, $a8, $02, $03, $05
- db $21, $40, $9c, $11, $02, $25
- db $61, $90, $a9, $46, $02, $23
- db $00, $00, $24, $47, $02, $0e
- db $01, $80, $aa, $00, $02, $24
- db $21, $b8, $ab, $48, $02, $13
- db $21, $90, $ac, $44, $02, $13
- db $01, $a8, $05, $00, $02, $01
- db $01, $90, $24, $43, $02, $0e
- db $01, $88, $ad, $00, $06, $17
- db $01, $a8, $ae, $49, $02, $01
- db $21, $90, $af, $01, $03, $11
- db $21, $00, $b0, $4a, $02, $04
- db $00, $00, $70, $4b, $04, $1c
- db $01, $88, $b1, $4c, $02, $19
- db $01, $b8, $19, $4d, $07, $09
- db $61, $98, $b3, $00, $03, $27
- db $61, $98, $74, $04, $06, $15
- db $21, $ff, $19, $4e, $07, $09
- db $01, $90, $73, $08, $04, $1e
- db $01, $ff, $89, $4f, $04, $1f
- db $00, $00, $b5, $00, $00, $28
- db $00, $00, $b6, $00, $01, $29
- db $00, $00, $b7, $00, $00, $28
- db $00, $00, $b8, $00, $01, $29
+ db $01, $ff, $00, $00, $02, $01 ; 00
+ db $01, $ff, $01, $00, $02, $01 ; 01
+ db $01, $ff, $02, $00, $02, $01 ; 02
+ db $01, $90, $00, $00, $02, $01 ; 03
+ db $01, $90, $01, $00, $02, $01 ; 04
+ db $01, $90, $02, $00, $02, $01 ; 05
+ db $01, $ff, $03, $00, $02, $01 ; 06
+ db $01, $ff, $04, $1b, $02, $01 ; 07
+ db $01, $ff, $05, $00, $02, $01 ; 08
+ db $01, $ff, $06, $00, $02, $01 ; 09
+ db $01, $90, $07, $09, $02, $01 ; 0a
+ db $01, $aa, $10, $10, $04, $03 ; 0b
+ db $01, $90, $0e, $04, $04, $03 ; 0c
+ db $01, $90, $0f, $03, $04, $03 ; 0d
+ db $01, $90, $10, $08, $04, $03 ; 0e
+ db $01, $90, $0f, $0a, $04, $03 ; 0f
+ db $01, $90, $11, $03, $04, $03 ; 10
+ db $01, $90, $12, $08, $06, $0a ; 11
+ db $01, $90, $13, $00, $06, $0a ; 12
+ db $01, $90, $14, $01, $06, $0a ; 13
+ db $21, $78, $16, $0b, $05, $06 ; 14
+ db $00, $00, $09, $12, $04, $0b ; 15
+ db $00, $00, $09, $13, $04, $0b ; 16
+ db $01, $90, $18, $00, $04, $08 ; 17
+ db $01, $ff, $18, $00, $04, $08 ; 18
+ db $01, $90, $1d, $06, $02, $0c ; 19
+ db $01, $b4, $1f, $38, $02, $0c ; 1a
+ db $01, $90, $08, $00, $02, $07 ; 1b
+ db $01, $a0, $08, $00, $02, $07 ; 1c
+ db $01, $ff, $19, $07, $07, $09 ; 1d
+ db $01, $ff, $1a, $07, $07, $09 ; 1e
+ db $01, $b0, $1b, $36, $07, $09 ; 1f
+ db $01, $b0, $84, $36, $06, $21 ; 20
+ db $01, $90, $21, $0c, $06, $0d ; 21
+ db $00, $00, $23, $0d, $06, $0d ; 22
+ db $01, $90, $24, $0e, $02, $0e ; 23
+ db $61, $80, $27, $0f, $06, $04 ; 24
+ db $01, $b4, $2a, $00, $06, $04 ; 25
+ db $01, $40, $2b, $11, $05, $0f ; 26
+ db $61, $98, $2c, $00, $03, $10 ; 27
+ db $61, $98, $2d, $09, $03, $10 ; 28
+ db $01, $b8, $2e, $00, $06, $0a ; 29
+ db $01, $b8, $2f, $00, $06, $0a ; 2a
+ db $01, $b8, $30, $14, $07, $11 ; 2b
+ db $01, $90, $21, $14, $03, $0d ; 2c
+ db $21, $b0, $31, $00, $03, $05 ; 2d
+ db $21, $b0, $32, $00, $03, $05 ; 2e
+ db $21, $b0, $33, $00, $03, $05 ; 2f
+ db $21, $90, $34, $15, $03, $05 ; 30
+ db $21, $90, $36, $00, $03, $05 ; 31
+ db $21, $90, $37, $03, $02, $08 ; 32
+ db $21, $90, $38, $00, $03, $05 ; 33
+ db $21, $90, $39, $03, $02, $08 ; 34
+ db $21, $90, $3a, $16, $02, $02 ; 35
+ db $01, $90, $3c, $17, $02, $02 ; 36
+ db $21, $ff, $3e, $00, $02, $02 ; 37
+ db $21, $ff, $3f, $00, $02, $02 ; 38
+ db $21, $ff, $40, $00, $02, $02 ; 39
+ db $21, $ff, $41, $00, $02, $02 ; 3a
+ db $21, $ff, $42, $00, $02, $02 ; 3b
+ db $01, $88, $43, $18, $05, $12 ; 3c
+ db $01, $88, $44, $00, $05, $12 ; 3d
+ db $21, $b8, $45, $19, $02, $13 ; 3e
+ db $21, $ff, $46, $00, $02, $14 ; 3f
+ db $21, $ff, $47, $00, $02, $14 ; 40
+ db $21, $ff, $48, $1a, $02, $14 ; 41
+ db $21, $ff, $49, $1a, $02, $14 ; 42
+ db $21, $98, $4a, $01, $02, $14 ; 43
+ db $21, $80, $4b, $00, $03, $11 ; 44
+ db $01, $88, $4c, $1c, $05, $12 ; 45
+ db $21, $b0, $4d, $1d, $02, $15 ; 46
+ db $01, $b0, $51, $1e, $03, $11 ; 47
+ db $21, $ff, $52, $1f, $05, $16 ; 48
+ db $21, $ff, $54, $1f, $05, $16 ; 49
+ db $21, $68, $56, $20, $05, $06 ; 4a
+ db $21, $90, $59, $21, $02, $0e ; 4b
+ db $21, $90, $5c, $02, $02, $17 ; 4c
+ db $01, $90, $5d, $22, $03, $11 ; 4d
+ db $61, $88, $5f, $00, $03, $10 ; 4e
+ db $61, $88, $2d, $09, $03, $10 ; 4f
+ db $21, $88, $60, $00, $03, $18 ; 50
+ db $21, $80, $60, $00, $02, $18 ; 51
+ db $21, $50, $61, $23, $03, $19 ; 52
+ db $01, $80, $63, $24, $02, $19 ; 53
+ db $01, $80, $66, $25, $02, $19 ; 54
+ db $01, $50, $1c, $00, $02, $0c ; 55
+ db $21, $a8, $67, $26, $07, $1a ; 56
+ db $21, $a8, $68, $00, $07, $1a ; 57
+ db $21, $90, $69, $01, $02, $1a ; 58
+ db $21, $90, $6d, $28, $03, $19 ; 59
+ db $21, $90, $6a, $27, $02, $1b ; 5a
+ db $00, $00, $6f, $29, $02, $1c ; 5b
+ db $21, $48, $70, $29, $02, $1c ; 5c
+ db $21, $48, $6f, $29, $02, $1c ; 5d
+ db $21, $78, $6f, $2a, $02, $1c ; 5e
+ db $61, $90, $71, $2b, $02, $1d ; 5f
+ db $61, $90, $72, $2c, $02, $1d ; 60
+ db $01, $48, $73, $2d, $04, $1e ; 61
+ db $01, $90, $74, $06, $02, $15 ; 62
+ db $01, $ff, $75, $2e, $07, $19 ; 63
+ db $21, $90, $4a, $02, $02, $14 ; 64
+ db $01, $80, $30, $2f, $02, $11 ; 65
+ db $01, $78, $76, $2a, $04, $23 ; 66
+ db $01, $80, $77, $30, $02, $1f ; 67
+ db $01, $90, $77, $02, $02, $1f ; 68
+ db $01, $ff, $77, $00, $02, $1f ; 69
+ db $01, $80, $78, $08, $03, $23 ; 6a
+ db $21, $90, $79, $00, $02, $1f ; 6b
+ db $01, $ff, $7a, $31, $03, $11 ; 6c
+ db $01, $88, $7a, $31, $03, $11 ; 6d
+ db $21, $88, $7b, $32, $02, $20 ; 6e
+ db $21, $98, $7c, $00, $02, $04 ; 6f
+ db $21, $80, $7d, $00, $02, $18 ; 70
+ db $01, $80, $21, $2f, $06, $0d ; 71
+ db $01, $b0, $7e, $33, $03, $12 ; 72
+ db $01, $80, $7f, $2f, $02, $08 ; 73
+ db $21, $a0, $6f, $34, $02, $1c ; 74
+ db $21, $a0, $74, $35, $02, $15 ; 75
+ db $21, $b0, $80, $33, $02, $14 ; 76
+ db $01, $88, $81, $37, $02, $11 ; 77
+ db $01, $88, $85, $00, $02, $22 ; 78
+ db $01, $88, $86, $00, $02, $22 ; 79
+ db $01, $90, $87, $39, $02, $1f ; 7a
+ db $01, $80, $30, $3a, $03, $11 ; 7b
+ db $21, $90, $34, $00, $03, $05 ; 7c
+ db $a1, $88, $88, $3b, $06, $13 ; 7d
+ db $01, $80, $76, $25, $04, $23 ; 7e
+ db $01, $98, $10, $34, $04, $03 ; 7f
+ db $01, $a8, $0f, $3c, $04, $03 ; 80
+ db $21, $68, $89, $29, $02, $1f ; 81
+ db $21, $b0, $8a, $00, $02, $1f ; 82
+ db $21, $80, $8c, $00, $02, $1f ; 83
+ db $21, $50, $8d, $00, $03, $1f ; 84
+ db $01, $40, $24, $40, $02, $0e ; 85
+ db $21, $a8, $8e, $41, $04, $1f ; 86
+ db $21, $88, $8f, $3e, $02, $1f ; 87
+ db $21, $88, $93, $3e, $02, $1f ; 88
+ db $21, $90, $97, $3d, $02, $1f ; 89
+ db $21, $90, $78, $3d, $03, $23 ; 8a
+ db $01, $ff, $99, $2e, $02, $19 ; 8b
+ db $21, $a0, $74, $02, $02, $15 ; 8c
+ db $21, $a0, $99, $35, $04, $19 ; 8d
+ db $21, $70, $8b, $3f, $02, $1f ; 8e
+ db $01, $90, $15, $08, $02, $0a ; 8f
+ db $01, $90, $11, $02, $04, $03 ; 90
+ db $01, $80, $7f, $42, $02, $08 ; 91
+ db $01, $90, $9a, $00, $02, $1b ; 92
+ db $21, $a0, $9b, $35, $04, $23 ; 93
+ db $21, $80, $9c, $23, $02, $25 ; 94
+ db $21, $80, $9d, $25, $02, $25 ; 95
+ db $21, $80, $9c, $00, $02, $25 ; 96
+ db $21, $80, $9e, $00, $06, $25 ; 97
+ db $61, $80, $9f, $3a, $05, $23 ; 98
+ db $21, $80, $a0, $16, $02, $23 ; 99
+ db $21, $70, $78, $43, $03, $23 ; 9a
+ db $21, $c0, $a2, $01, $02, $25 ; 9b
+ db $21, $40, $a3, $44, $03, $24 ; 9c
+ db $01, $80, $a4, $00, $02, $24 ; 9d
+ db $01, $80, $a5, $00, $03, $24 ; 9e
+ db $01, $88, $43, $45, $04, $12 ; 9f
+ db $21, $ff, $a6, $00, $02, $02 ; a0
+ db $21, $ff, $a7, $00, $02, $02 ; a1
+ db $21, $00, $b4, $4a, $07, $0f ; a2
+ db $21, $90, $a8, $02, $03, $05 ; a3
+ db $21, $40, $9c, $11, $02, $25 ; a4
+ db $61, $90, $a9, $46, $02, $23 ; a5
+ db $00, $00, $24, $47, $02, $0e ; a6
+ db $01, $80, $aa, $00, $02, $24 ; a7
+ db $21, $b8, $ab, $48, $02, $13 ; a8
+ db $21, $90, $ac, $44, $02, $13 ; a9
+ db $01, $a8, $05, $00, $02, $01 ; aa
+ db $01, $90, $24, $43, $02, $0e ; ab
+ db $01, $88, $ad, $00, $06, $17 ; ac
+ db $01, $a8, $ae, $49, $02, $01 ; ad
+ db $21, $90, $af, $01, $03, $11 ; ae
+ db $21, $00, $b0, $4a, $02, $04 ; af
+ db $00, $00, $70, $4b, $04, $1c ; b0
+ db $01, $88, $b1, $4c, $02, $19 ; b1
+ db $01, $b8, $19, $4d, $07, $09 ; b2
+ db $61, $98, $b3, $00, $03, $27 ; b3
+ db $61, $98, $74, $04, $06, $15 ; b4
+ db $21, $ff, $19, $4e, $07, $09 ; b5
+ db $01, $90, $73, $08, $04, $1e ; b6
+ db $01, $ff, $89, $4f, $04, $1f ; b7
+ db $00, $00, $b5, $00, $00, $28 ; b8
+ db $00, $00, $b6, $00, $01, $29 ; b9
+ db $00, $00, $b7, $00, $00, $28 ; ba
+ db $00, $00, $b8, $00, $01, $29 ; bb
; ccfbe
Functionccfbe: ; ccfbe
- ld hl, $4
+ ld hl, BATTLEANIMSTRUCT_04
add hl, bc
ld e, [hl]
ld d, 0
@@ -525,86 +515,86 @@
; ccfce
.Jumptable: ; ccfce (33:4fce)
- dw Functioncd06e
- dw Functioncd12a
- dw Functioncd146
- dw Functioncd0e3
- dw Functioncd0a6
- dw Functioncd081
- dw Functioncd079
- dw Functioncd2be
- dw Functioncd306
- dw Functioncd3ae
- dw Functioncd3f2
- dw Functioncd478
- dw Functioncd5e9
- dw Functioncd66a
- dw Functioncd6e3
- dw Functioncd71a
- dw Functioncd284
- dw Functioncd777
- dw Functioncd15c
- dw Functioncd212
- dw Functioncd7a4
- dw Functioncd80c
- dw Functioncd824
- dw Functioncd89a
- dw Functioncd900
- dw Functioncd954
- dw Functioncdafa
- dw Functioncdb06
- dw Functioncda0a
- dw Functioncdb80
- dw Functioncdca6
- dw Functioncda31
- dw Functioncda4d
- dw Functioncdcc3
- dw Functioncdd2a
- dw Functioncdd90
- dw Functioncddf9
- dw Functioncde28
- dw Functioncde54
- dw Functioncde6b
- dw Functioncde89
- dw Functioncdedd
- dw Functioncdf59
- dw Functionce063
- dw Functionce0c5
- dw Functioncdf1b
- dw Functionce10e
- dw Functionce15c
- dw Functionce1e7
- dw Functionce226
- dw Functionce255
- dw Functionce2cc
- dw Functioncdf8c
- dw Functionce00b
- dw Functionce2fd
- dw Functionce35f
- dw Functionce389
- dw Functionce3b4
- dw Functionce3d2
- dw Functionce3ff
- dw Functioncdfcb
- dw Functionce416
- dw Functionce43a
- dw Functioncdad6
- dw Functionce49c
- dw Functionce4dc
- dw Functionce1b0
- dw Functionce508
- dw Functionce532
- dw Functionce55b
- dw Functionce593
- dw Functionce5b4
- dw Functionce5dc
- dw Functionce5ee
- dw Functionce62f
- dw Functionce688
- dw Functionce6b3
- dw Functionce6d2
- dw Functioncd58a
- dw Functionce6bf
+ dw Functioncd06e ; 00
+ dw Functioncd12a ; 01
+ dw Functioncd146 ; 02
+ dw Functioncd0e3 ; 03
+ dw Functioncd0a6 ; 04
+ dw Functioncd081 ; 05
+ dw Functioncd079 ; 06
+ dw Functioncd2be ; 07
+ dw Functioncd306 ; 08
+ dw Functioncd3ae ; 09
+ dw Functioncd3f2 ; 0a
+ dw Functioncd478 ; 0b
+ dw Functioncd5e9 ; 0c
+ dw Functioncd66a ; 0d
+ dw Functioncd6e3 ; 0e
+ dw Functioncd71a ; 0f
+ dw Functioncd284 ; 10
+ dw Functioncd777 ; 11
+ dw Functioncd15c ; 12
+ dw Functioncd212 ; 13
+ dw Functioncd7a4 ; 14
+ dw Functioncd80c ; 15
+ dw Functioncd824 ; 16
+ dw Functioncd89a ; 17
+ dw Functioncd900 ; 18
+ dw Functioncd954 ; 19
+ dw Functioncdafa ; 1a
+ dw Functioncdb06 ; 1b
+ dw Functioncda0a ; 1c
+ dw Functioncdb80 ; 1d
+ dw Functioncdca6 ; 1e
+ dw Functioncda31 ; 1f
+ dw Functioncda4d ; 20
+ dw Functioncdcc3 ; 21
+ dw Functioncdd2a ; 22
+ dw Functioncdd90 ; 23
+ dw Functioncddf9 ; 24
+ dw Functioncde28 ; 25
+ dw Functioncde54 ; 26
+ dw Functioncde6b ; 27
+ dw Functioncde89 ; 28
+ dw Functioncdedd ; 29
+ dw Functioncdf59 ; 2a
+ dw Functionce063 ; 2b
+ dw Functionce0c5 ; 2c
+ dw Functioncdf1b ; 2d
+ dw Functionce10e ; 2e
+ dw Functionce15c ; 2f
+ dw Functionce1e7 ; 30
+ dw Functionce226 ; 31
+ dw Functionce255 ; 32
+ dw Functionce2cc ; 33
+ dw Functioncdf8c ; 34
+ dw Functionce00b ; 35
+ dw Functionce2fd ; 36
+ dw Functionce35f ; 37
+ dw Functionce389 ; 38
+ dw Functionce3b4 ; 39
+ dw Functionce3d2 ; 3a
+ dw Functionce3ff ; 3b
+ dw Functioncdfcb ; 3c
+ dw Functionce416 ; 3d
+ dw Functionce43a ; 3e
+ dw Functioncdad6 ; 3f
+ dw Functionce49c ; 40
+ dw Functionce4dc ; 41
+ dw Functionce1b0 ; 42
+ dw Functionce508 ; 43
+ dw Functionce532 ; 44
+ dw Functionce55b ; 45
+ dw Functionce593 ; 46
+ dw Functionce5b4 ; 47
+ dw Functionce5dc ; 48
+ dw Functionce5ee ; 49
+ dw Functionce62f ; 4a
+ dw Functionce688 ; 4b
+ dw Functionce6b3 ; 4c
+ dw Functionce6d2 ; 4d
+ dw Functioncd58a ; 4e
+ dw Functionce6bf ; 4f
Functioncd06e: ; cd06e (33:506e)
call BattleAnim_AnonJumptable
@@ -613,7 +603,7 @@
dw Functioncd075
Functioncd075: ; cd075 (33:5075)
- call Functioncc9bd
+ call DeinitBattleAnimation
Functioncd078: ; cd078 (33:5078)
ret
@@ -621,11 +611,11 @@
Functioncd079: ; cd079 (33:5079)
call Functioncd081
ret c
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd081: ; cd081 (33:5081)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $88
@@ -632,18 +622,18 @@
ret nc
add $2
ld [hl], a
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
dec [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
dec [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld d, [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
scf
@@ -650,21 +640,21 @@
ret
Functioncd0a6: ; cd0a6 (33:50a6)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $88
jr c, .asm_cd0b3
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cd0b3
add $2
ld [hl], a
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
dec [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
rept 4
@@ -674,13 +664,13 @@
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
sra a
sra a
@@ -697,7 +687,7 @@
Functioncd0ea: ; cd0ea (33:50ea)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
bit 7, [hl]
ld a, $0
@@ -704,10 +694,10 @@
jr z, .asm_cd0f9
ld a, $20
.asm_cd0f9
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $7f
@@ -714,25 +704,25 @@
ld [hl], a
Functioncd106: ; cd106 (33:5106)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld d, [hl]
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
ret
@@ -744,16 +734,16 @@
dw Functioncd131
Functioncd131: ; cd131 (33:5131)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd135: ; cd135 (33:5135)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $84
ret nc
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
call Functionce70a
@@ -760,12 +750,12 @@
ret
Functioncd146: ; cd146 (33:5146)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $84
jr nc, .asm_cd158
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
call Functionce70a
@@ -772,7 +762,7 @@
ret
.asm_cd158
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd15c: ; cd15c (33:515c)
@@ -799,10 +789,10 @@
Functioncd17e: ; cd17e (33:517e)
call Functioncd081
ret c
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
add [hl]
ld [hl], a
@@ -815,7 +805,7 @@
call Functionce72c
ld a, $9
call Functionce7bf
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $0
inc hl
@@ -822,15 +812,15 @@
ld [hl], $10
Functioncd1a7: ; cd1a7 (33:51a7)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hli]
ld d, [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
dec a
@@ -838,8 +828,8 @@
and $1f
ret nz
ld [hl], a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
sub $4
ld [hl], a
@@ -852,7 +842,7 @@
Functioncd1d2: ; cd1d2 (33:51d2)
ld a, $d
call Functionce7bf
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
dec [hl]
@@ -864,20 +854,20 @@
ld a, $a
call Functionce7bf
call Functionce72c
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], $20
Functioncd1ee: ; cd1ee (33:51ee)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hli]
ld d, [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
dec a
@@ -890,7 +880,7 @@
ret
Functioncd20e: ; cd20e (33:520e)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd212: ; cd212 (33:5212)
@@ -906,7 +896,7 @@
ret
Functioncd222: ; cd222 (33:5222)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $70
@@ -918,7 +908,7 @@
call Functionce72c
Functioncd232: ; cd232 (33:5232)
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
cp $80
@@ -925,7 +915,7 @@
jr nc, .asm_cd245
add $4
ld [hl], a
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
rept 2
dec [hl]
@@ -933,7 +923,7 @@
ret
.asm_cd245
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd249: ; cd249 (33:5249)
@@ -989,23 +979,23 @@
dw Functioncd2bd
Functioncd291: ; cd291 (33:5291)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
swap a
and $f
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], a
ret
Functioncd2a0: ; cd2a0 (33:52a0)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $88
ret nc
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
call Functionce70a
@@ -1012,7 +1002,7 @@
ret
Functioncd2b1: ; cd2b1 (33:52b1)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd2b5: ; cd2b5 (33:52b5)
@@ -1031,7 +1021,7 @@
Functioncd2c5: ; cd2c5 (33:52c5)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $30
inc hl
@@ -1038,38 +1028,38 @@
ld [hl], $48
Functioncd2d1: ; cd2d1 (33:52d1)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hli]
ld d, [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
ld a, [hl]
and $3f
ret nz
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $20
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
sub [hl]
jr z, .asm_cd302
jr c, .asm_cd302
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], a
ret
.asm_cd302
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd306: ; cd306 (33:5306)
@@ -1081,7 +1071,7 @@
dw Functioncd37d
Functioncd311: ; cd311 (33:5311)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $80
@@ -1094,17 +1084,17 @@
Functioncd321: ; cd321 (33:5321)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $0
Functioncd32a: ; cd32a (33:532a)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
cp $40
jr nc, .asm_cd363
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $18
@@ -1111,22 +1101,22 @@
call BattleAnim_Cosine
sub $18
sra a
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $18
call BattleAnim_Sine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
add [hl]
ld [hl], a
@@ -1133,7 +1123,7 @@
ret
.asm_cd363
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f0
@@ -1144,7 +1134,7 @@
and $f
or d
ld [hl], a
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
dec [hl]
ret
@@ -1153,12 +1143,12 @@
call Functionce72c
Functioncd37d: ; cd37d (33:537d)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $b0
jr c, .asm_cd38a
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cd38a
@@ -1166,21 +1156,21 @@
ret
Functioncd38e: ; cd38e (33:538e)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
add [hl]
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f
ld e, a
srl e
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
.asm_cd3a9
dec [hl]
@@ -1197,19 +1187,19 @@
Functioncd3b7: ; cd3b7 (33:53b7)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $0
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
Functioncd3cc: ; cd3cc (33:53cc)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
and a
@@ -1218,15 +1208,15 @@
ret
.asm_cd3d6
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
swap a
and $f
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld a, [hl]
xor $ff
@@ -1235,7 +1225,7 @@
ret
Functioncd3ee: ; cd3ee (33:53ee)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd3f2: ; cd3f2 (33:53f2)
@@ -1253,10 +1243,10 @@
dw Functioncd458
Functioncd409: ; cd409 (33:5409)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], a
cp $7
@@ -1266,7 +1256,7 @@
ret
Functioncd41d: ; cd41d (33:541d)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $88
@@ -1273,7 +1263,7 @@
jr nc, .asm_cd42f
add $2
ld [hl], a
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
dec [hl]
ret
@@ -1284,7 +1274,7 @@
call Functionce7bf
Functioncd437: ; cd437 (33:5437)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $10
@@ -1291,48 +1281,48 @@
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
ret
Functioncd458: ; cd458 (33:5458)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd45c: ; cd45c (33:545c)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
dec [hl]
ret
Functioncd462: ; cd462 (33:5462)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
inc [hl]
Functioncd467: ; cd467 (33:5467)
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
dec [hl]
ret
Functioncd46d: ; cd46d (33:546d)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
inc [hl]
Functioncd472: ; cd472 (33:5472)
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
inc [hl]
@@ -1354,12 +1344,12 @@
Functioncd48d: ; cd48d (33:548d)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $40
Functioncd496: ; cd496 (33:5496)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
cp $30
@@ -1366,40 +1356,40 @@
jr nc, .asm_cd4bc
call Functionce72c
xor a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hli], a
ld [hl], a
ld a, $17
call Functionce7bf
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
bit 6, [hl]
ret z
- ld hl, $d
+ ld hl, BATTLEANIMSTRUCT_0D
add hl, bc
ld [hl], $5
ret
.asm_cd4bc
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $3f
ld d, a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
dec [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
call Functioncd557
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld h, [hl]
ld l, a
@@ -1406,51 +1396,51 @@
add hl, de
ld e, l
ld d, h
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld [hl], d
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], e
ret
Functioncd4ee: ; cd4ee (33:54ee)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $20
jr nz, .asm_cd4fb
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cd4fb
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $10
call BattleAnim_Sine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
bit 6, [hl]
jr nz, .asm_cd519
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
jr .asm_cd51e
.asm_cd519
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
dec [hl]
.asm_cd51e
ld de, $80
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld h, [hl]
ld l, a
@@ -1457,11 +1447,11 @@
add hl, de
ld e, l
ld d, h
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], d
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], e
ret
@@ -1468,7 +1458,7 @@
Functioncd53a: ; cd53a (33:553a)
ld a, $16
call Functionce7bf
- ld hl, $1
+ ld hl, BATTLEANIMSTRUCT_01
add hl, bc
res 5, [hl]
@@ -1477,7 +1467,7 @@
ret
Functioncd549: ; cd549 (33:5549)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $c0
@@ -1487,7 +1477,7 @@
ret
Functioncd557: ; cd557 (33:5557)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
bit 7, a
@@ -1531,7 +1521,7 @@
dw Functioncd5aa
Functioncd591: ; cd591 (33:5591)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $40
@@ -1538,41 +1528,41 @@
rlca
rlca
add $19
- ld hl, $3
+ ld hl, BATTLEANIMSTRUCT_03
add hl, bc
ld [hl], a
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $40
Functioncd5aa: ; cd5aa (33:55aa)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
cp $30
jr nc, .asm_cd5b7
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cd5b7
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $3f
ld d, a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
dec [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
call Functioncd557
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld h, [hl]
ld l, a
@@ -1579,11 +1569,11 @@
add hl, de
ld e, l
ld d, h
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld [hl], d
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], e
ret
@@ -1596,18 +1586,18 @@
Functioncd5f2: ; cd5f2 (33:55f2)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $c
Functioncd5fb: ; cd5fb (33:55fb)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
and a
jr z, .asm_cd60d
dec [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
call Functionce70a
@@ -1615,7 +1605,7 @@
.asm_cd60d
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $0
ld a, $22
@@ -1622,15 +1612,15 @@
call Functionce7bf
Functioncd61b: ; cd61b (33:561b)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $98
jr nc, .asm_cd63f
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld h, [hl]
ld l, a
@@ -1638,28 +1628,28 @@
add hl, de
ld e, l
ld d, h
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], e
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld [hl], d
.asm_cd63f
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
cp $20
ret c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f0
ld e, a
ld d, $ff
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld h, [hl]
ld l, a
@@ -1666,10 +1656,10 @@
add hl, de
ld e, l
ld d, h
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], e
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld [hl], d
ret
@@ -1694,10 +1684,10 @@
ret
Functioncd687: ; cd687 (33:5687)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld e, [hl]
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
cp e
@@ -1710,27 +1700,27 @@
.asm_cd69b
dec a
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $10
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
add [hl]
sub $10
ret c
ld [hLCDStatCustom + 1], a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld a, [hl]
inc a
and $7
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
rept 2
inc [hl]
@@ -1740,7 +1730,7 @@
ret
Functioncd6c6: ; cd6c6 (33:56c6)
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
cp $70
@@ -1751,7 +1741,7 @@
ld [hLCDStatCustom + 2], a
Functioncd6d6: ; cd6d6 (33:56d6)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
asm_cd6da: ; cd6da (33:56da)
@@ -1772,7 +1762,7 @@
Functioncd6ea: ; cd6ea (33:56ea)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, $24
add [hl]
@@ -1779,24 +1769,24 @@
call Functionce7bf
Functioncd6f7: ; cd6f7 (33:56f7)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $b8
jr c, .asm_cd704
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cd704
ld a, $2
call Functionce70a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
dec [hl]
ld d, $8
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
ret
@@ -1813,7 +1803,7 @@
call Functionce72c
Functioncd728: ; cd728 (33:5728)
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
cp $30
@@ -1820,13 +1810,13 @@
jr c, .asm_cd747
ld a, $2
call Functionce70a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
dec [hl]
ld d, $8
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
ret
@@ -1835,13 +1825,13 @@
call Functionce72c
ld a, $28
call Functionce7bf
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], $0
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld [hl], $30
- ld hl, $1
+ ld hl, BATTLEANIMSTRUCT_01
add hl, bc
ld a, [hl]
and $1
@@ -1848,7 +1838,7 @@
ld [hl], a
Functioncd763: ; cd763 (33:5763)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $18
@@ -1865,17 +1855,17 @@
ret
Functioncd777: ; cd777 (33:5777)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $38
jr c, .asm_cd784
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cd784
ld a, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld l, [hl]
ld h, a
@@ -1883,13 +1873,13 @@
add hl, de
ld e, l
ld d, h
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], e
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], d
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld a, [hl]
xor $10
@@ -1904,14 +1894,14 @@
Functioncd7ab: ; cd7ab (33:57ab)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f0
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f
@@ -1918,50 +1908,50 @@
sla a
sla a
sla a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld [hl], $1
Functioncd7d2: ; cd7d2 (33:57d2)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
and a
jr nz, .asm_cd7de
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cd7de
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
inc [hl]
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld d, [hl]
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
xor $1
ld [hl], a
ret z
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
dec [hl]
ret
@@ -1982,7 +1972,7 @@
ret
Functioncd820: ; cd820 (33:5820)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd824: ; cd824 (33:5824)
@@ -1998,27 +1988,27 @@
Functioncd835: ; cd835 (33:5835)
call Functionce72c
- ld hl, $3
+ ld hl, BATTLEANIMSTRUCT_03
add hl, bc
ld a, [hl]
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
bit 7, [hl]
jr nz, .asm_cd852
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $10
jr .asm_cd858
.asm_cd852
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $30
.asm_cd858
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $7f
@@ -2025,31 +2015,31 @@
ld [hl], a
Functioncd860: ; cd860 (33:5860)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld d, [hl]
call BattleAnim_Sine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
bit 7, a
jr nz, .asm_cd87e
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
inc a
jr .asm_cd883
.asm_cd87e
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
.asm_cd883
call Functionce7bf
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
ld a, [hl]
@@ -2061,7 +2051,7 @@
ret
Functioncd893: ; cd893 (33:5893)
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], $1
ret
@@ -2079,21 +2069,21 @@
Functioncd8ab: ; cd8ab (33:58ab)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
bit 7, [hl]
jr nz, .asm_cd8be
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $10
jr .asm_cd8c4
.asm_cd8be
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $30
.asm_cd8c4
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $7f
@@ -2100,14 +2090,14 @@
ld [hl], a
Functioncd8cc: ; cd8cc (33:58cc)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld d, [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
bit 7, a
@@ -2119,7 +2109,7 @@
ld a, $3c
.asm_cd8e8
call Functionce7bf
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
rept 2
inc [hl]
@@ -2133,7 +2123,7 @@
ret
Functioncd8f9: ; cd8f9 (33:58f9)
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], $1
ret
@@ -2146,7 +2136,7 @@
Functioncd907: ; cd907 (33:5907)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $28
inc hl
@@ -2153,47 +2143,47 @@
ld [hl], $0
Functioncd913: ; cd913 (33:5913)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld d, [hl]
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
and a
jr z, .asm_cd950
ld d, a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld e, [hl]
ld hl, hPushOAM ; $ff80
add hl, de
ld e, l
ld d, h
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], e
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], d
ret
.asm_cd950
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncd954: ; cd954 (33:5954)
@@ -2207,7 +2197,7 @@
Functioncd961: ; cd961 (33:5961)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld [hl], $0
@@ -2216,7 +2206,7 @@
ret
Functioncd96e: ; cd96e (33:596e)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $88
@@ -2225,23 +2215,23 @@
ret
Functioncd97b: ; cd97b (33:597b)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $b8
jr c, asm_cd988
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
asm_cd988: ; cd988 (33:5988)
call Functioncd99a
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
inc [hl]
ld a, [hl]
and $1
ret nz
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
dec [hl]
ret
@@ -2248,7 +2238,7 @@
Functioncd99a: ; cd99a (33:599a)
call Functioncd9f4
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
push af
@@ -2258,24 +2248,24 @@
sra a
sra a
sra a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
add [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
sub $8
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and a
@@ -2287,20 +2277,20 @@
ld [hl], a
and $7
ret nz
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
inc [hl]
ret
.asm_cd9e2
xor a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld [hl], a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hli], a
ld [hl], a
@@ -2307,8 +2297,8 @@
ret
Functioncd9f4: ; cd9f4 (33:59f4)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld e, [hl]
ld d, 0
ld hl, Unknown_cda01
@@ -2323,27 +2313,27 @@
; cda0a
Functioncda0a: ; cda0a (33:5a0a)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $30
jr nc, .asm_cda17
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cda17
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f
ld e, a
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
sub e
ld [hl], a
srl e
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
.asm_cda2c
inc [hl]
@@ -2359,13 +2349,13 @@
dw Functioncda4c
Functioncda3a: ; cda3a (33:5a3a)
- ld hl, $3
+ ld hl, BATTLEANIMSTRUCT_03
add hl, bc
ld a, [hl]
inc a
call Functionce7bf
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $8
@@ -2382,14 +2372,14 @@
Functioncda58: ; cda58 (33:5a58)
call Functionce72c
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], $40
ret
Functioncda62: ; cda62 (33:5a62)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
cp $20
jr c, .asm_cda6f
@@ -2404,8 +2394,8 @@
ret
Functioncda7a: ; cda7a (33:5a7a)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
and a
jr z, .asm_cda84
@@ -2424,7 +2414,7 @@
dec [hl]
ld d, $20
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
@@ -2432,13 +2422,13 @@
ld a, [hl]
add $2
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld e, [hl]
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld d, [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld h, [hl]
ld a, h
@@ -2452,18 +2442,18 @@
add hl, de
ld e, l
ld d, h
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], e
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld [hl], d
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
and $1
ret nz
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
dec [hl]
ret
@@ -2477,14 +2467,14 @@
Functioncdadf: ; cdadf (33:5adf)
call Functionce72c
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], $40
ret
Functioncdae9: ; cdae9 (33:5ae9)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
cp $20
jr c, .asm_cdaf6
@@ -2499,7 +2489,7 @@
Functioncdafa: ; cdafa (33:5afa)
call Functioncd0e3
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
add $f
@@ -2519,12 +2509,12 @@
ret
Functioncdb14: ; cdb14 (33:5b14)
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
cp $30
jr c, .asm_cdb24
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], $0
ret
@@ -2535,7 +2525,7 @@
ret
Functioncdb28: ; cdb28 (33:5b28)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $98
@@ -2543,19 +2533,19 @@
rept 2
inc [hl]
endr
- ld hl, $1
+ ld hl, BATTLEANIMSTRUCT_01
add hl, bc
set 0, [hl]
ld hl, SPRITEANIMSTRUCT_ANIM_SEQ_ID
add hl, bc
ld [hl], $90
- ld hl, $d
+ ld hl, BATTLEANIMSTRUCT_0D
add hl, bc
ld [hl], $0
- ld hl, $c
+ ld hl, BATTLEANIMSTRUCT_0C
add hl, bc
ld [hl], $2
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
dec [hl]
ret
@@ -2562,18 +2552,18 @@
Functioncdb50: ; cdb50 (33:5b50)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $2c
- ld hl, $d
+ ld hl, BATTLEANIMSTRUCT_0D
add hl, bc
ld [hl], $0
- ld hl, $c
+ ld hl, BATTLEANIMSTRUCT_0C
add hl, bc
ld [hl], $80
Functioncdb65: ; cdb65 (33:5b65)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $98
@@ -2581,13 +2571,13 @@
rept 2
inc [hl]
endr
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
inc [hl]
ld d, $8
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
ret
@@ -2611,21 +2601,21 @@
dw Functioncdc74
Functioncdb9f: ; cdb9f (33:5b9f)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $28
inc hl
ld [hl], $10
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], a
ret
Functioncdbb3: ; cdbb3 (33:5bb3)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $40
@@ -2636,7 +2626,7 @@
ret
Functioncdbc1: ; cdbc1 (33:5bc1)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $4b
@@ -2647,7 +2637,7 @@
ret
Functioncdbcf: ; cdbcf (33:5bcf)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $88
@@ -2654,8 +2644,8 @@
jr nc, .asm_cdbe6
and $f
jr nz, asm_cdbfa
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], $10
call Functionce72c
ret
@@ -2666,8 +2656,8 @@
ret
Functioncdbeb: ; cdbeb (33:5beb)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
and a
jr z, .asm_cdbf5
@@ -2675,17 +2665,17 @@
ret
.asm_cdbf5
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
dec [hl]
asm_cdbfa: ; cdbfa (33:5bfa)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
inc [hl]
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld d, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld e, [hl]
ld hl, hPushOAM ; $ff80
@@ -2692,16 +2682,16 @@
add hl, de
ld e, l
ld d, h
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld [hl], d
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], e
ret
Functioncdc1a: ; cdc1a (33:5c1a)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncdc1e: ; cdc1e (33:5c1e)
@@ -2711,7 +2701,7 @@
ret
Functioncdc27: ; cdc27 (33:5c27)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
rept 2
@@ -2719,7 +2709,7 @@
endr
ld d, $2
call BattleAnim_Sine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
ret
@@ -2727,7 +2717,7 @@
Functioncdc39: ; cdc39 (33:5c39)
ld a, $50
call Functionce7bf
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], $4
call Functionce72c
@@ -2737,21 +2727,21 @@
ld a, $4f
call Functionce7bf
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $40
ret
Functioncdc57: ; cdc57 (33:5c57)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $20
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
cp $30
@@ -2766,31 +2756,31 @@
ret
Functioncdc75: ; cdc75 (33:5c75)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hli]
ld d, [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
ld a, [hl]
and $3f
ret nz
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $20
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
sub $8
ld [hl], a
ret nz
xor a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hli], a
ld [hl], a
@@ -2798,7 +2788,7 @@
ret
Functioncdca6: ; cdca6 (33:5ca6)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
and a
@@ -2805,14 +2795,14 @@
jr z, .asm_cdcb6
cp $d8
jr nc, .asm_cdcb6
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_cdcb6
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld d, [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
sub d
@@ -2829,7 +2819,7 @@
ld a, [hBattleTurn]
and a
jr z, .asm_cdcd9
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
xor $ff
@@ -2837,10 +2827,10 @@
ld [hl], a
.asm_cdcd9
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $8
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, $59
add [hl]
@@ -2848,7 +2838,7 @@
ret
Functioncdced: ; cdced (33:5ced)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
and a
@@ -2858,12 +2848,12 @@
ret
.asm_cdcfa
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncdcfe: ; cdcfe (33:5cfe)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
rept 2
inc [hl]
@@ -2871,10 +2861,10 @@
ld d, $10
call BattleAnim_Sine
ld d, a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and a
@@ -2881,13 +2871,13 @@
jr z, .asm_cdd20
dec a
ret z
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], d
ret
.asm_cdd20
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, d
xor $ff
@@ -2903,14 +2893,14 @@
Functioncdd31: ; cdd31 (33:5d31)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $3f
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $80
@@ -2921,44 +2911,44 @@
ret
Functioncdd4f: ; cdd4f (33:5d4f)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
swap a
ld d, a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
inc [hl]
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $80
ret nc
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
and $3
jr nz, .asm_cdd87
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
dec [hl]
.asm_cdd87
and $1
ret nz
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
inc [hl]
ret
@@ -2971,22 +2961,22 @@
Functioncdd97: ; cdd97 (33:5d97)
call Functionce72c
- ld hl, $3
+ ld hl, BATTLEANIMSTRUCT_03
add hl, bc
ld a, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $80
rlca
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
add [hl]
call Functionce7bf
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $7f
@@ -2993,7 +2983,7 @@
ld [hl], a
Functioncddbc: ; cddbc (33:5dbc)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $10
@@ -3002,16 +2992,16 @@
call BattleAnim_Sine
sra a
sra a
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
inc [hl]
@@ -3019,7 +3009,7 @@
jr z, .asm_cddf0
and $1f
ret nz
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
inc a
@@ -3026,7 +3016,7 @@
jr .asm_cddf5
.asm_cddf0
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
.asm_cddf5
@@ -3042,12 +3032,12 @@
Functioncde02: ; cde02 (33:5e02)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
add $63
call Functionce7bf
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld e, [hl]
ld d, 0
@@ -3054,7 +3044,7 @@
ld hl, Unknown_cde25
add hl, de
ld a, [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
@@ -3062,7 +3052,7 @@
ret
Functioncde21: ; cde21 (33:5e21)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
; cde25 (33:5e25)
@@ -3072,7 +3062,7 @@
; cde28
Functioncde28: ; cde28 (33:5e28)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
rept 2
@@ -3080,29 +3070,29 @@
endr
ld d, $4
call BattleAnim_Sine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld d, [hl]
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld e, [hl]
ld hl, $ffa0
add hl, de
ld e, l
ld d, h
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], d
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], e
ret
Functioncde54: ; cde54 (33:5e54)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
rept 2
@@ -3110,10 +3100,10 @@
endr
ld d, $10
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
inc [hl]
ret
@@ -3126,12 +3116,12 @@
Functioncde72: ; cde72 (33:5e72)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and a
jr nz, .asm_cde83
- ld hl, $1
+ ld hl, BATTLEANIMSTRUCT_01
add hl, bc
set 6, [hl]
.asm_cde83
@@ -3149,10 +3139,10 @@
Functioncde90: ; cde90 (33:5e90)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $0
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld e, [hl]
ld a, e
@@ -3159,7 +3149,7 @@
and $70
swap a
ld [hl], a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld a, e
and $80
@@ -3180,7 +3170,7 @@
ret
Functioncdebf: ; cdebf (33:5ebf)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
and a
@@ -3189,13 +3179,13 @@
ret
.asm_cdec9
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld a, [hl]
xor $ff
@@ -3204,7 +3194,7 @@
ret
Functioncdedd: ; cdedd (33:5edd)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $18
@@ -3214,26 +3204,26 @@
sra a
sra a
sra a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
add [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
ld a, [hl]
and $7
ret nz
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
cp $28
jr nc, .asm_cdf17
@@ -3241,11 +3231,11 @@
ret
.asm_cdf17
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncdf1b: ; cdf1b (33:5f1b)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $18
@@ -3255,26 +3245,26 @@
sra a
sra a
sra a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
add [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
ld a, [hl]
and $3
ret nz
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
cp $28
jr nc, .asm_cdf55
@@ -3282,7 +3272,7 @@
ret
.asm_cdf55
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncdf59: ; cdf59 (33:5f59)
@@ -3292,27 +3282,27 @@
dw Functioncdedd
Functioncdf60: ; cdf60 (33:5f60)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $84
jr nc, .asm_cdf88
inc [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
inc [hl]
ld d, $18
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
and $1
ret nz
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
dec [hl]
ret
@@ -3322,7 +3312,7 @@
ret
Functioncdf8c: ; cdf8c (33:5f8c)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $18
@@ -3332,19 +3322,19 @@
sra a
sra a
sra a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
add [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
rept 2
inc [hl]
@@ -3352,8 +3342,8 @@
ld a, [hl]
and $7
ret nz
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
cp $e8
jr z, .asm_cdfc7
@@ -3361,11 +3351,11 @@
ret
.asm_cdfc7
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functioncdfcb: ; cdfcb (33:5fcb)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $18
@@ -3375,19 +3365,19 @@
sra a
sra a
sra a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
add [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
rept 2
inc [hl]
@@ -3395,8 +3385,8 @@
ld a, [hl]
and $3
ret nz
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
cp $d0
jr z, .asm_ce007
@@ -3406,7 +3396,7 @@
ret
.asm_ce007
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce00b: ; ce00b (33:600b)
@@ -3418,15 +3408,15 @@
Functionce014: ; ce014 (33:6014)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $34
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], $10
Functionce023: ; ce023 (33:6023)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $6c
@@ -3436,11 +3426,11 @@
.asm_ce02d
ld a, $2
call Functionce70a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld d, [hl]
call BattleAnim_Sine
bit 7, a
@@ -3448,10 +3438,10 @@
xor $ff
inc a
.asm_ce046
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
sub $4
@@ -3459,13 +3449,13 @@
and $1f
cp $20
ret nz
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
srl [hl]
ret
Functionce05f: ; ce05f (33:605f)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce063: ; ce063 (33:6063)
@@ -3477,22 +3467,22 @@
dw Functionce09e
Functionce06e: ; ce06e (33:606e)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], a
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
ret
Functionce083: ; ce083 (33:6083)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $58
@@ -3502,34 +3492,34 @@
ret
Functionce091: ; ce091 (33:6091)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
cp $20
jr c, Functionce09e
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce09e: ; ce09e (33:609e)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
ld d, $8
call BattleAnim_Sine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
sra a
xor $ff
inc a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
add [hl]
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld [hl], a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
add $8
ld [hl], a
@@ -3543,29 +3533,29 @@
dw Functionce0dd
Functionce0ce: ; ce0ce (33:60ce)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f0
swap a
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], a
ret
Functionce0dd: ; ce0dd (33:60dd)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
ld d, $10
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
bit 7, a
jr z, .asm_ce0f0
ld [hl], a
.asm_ce0f0
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
sub $4
@@ -3572,16 +3562,16 @@
ld [hl], a
Functionce0f8: ; ce0f8 (33:60f8)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $84
jr c, .asm_ce105
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_ce105
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
call Functionce70a
@@ -3595,44 +3585,44 @@
Functionce115: ; ce115 (33:6115)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $28
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
sub $28
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], a
Functionce12a: ; ce12a (33:612a)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hli]
ld d, [hl]
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
and [hl]
jr nz, .asm_ce149
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
dec [hl]
.asm_ce149
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
inc [hl]
ld a, [hl]
and $3f
ret nz
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $20
inc hl
@@ -3640,47 +3630,47 @@
ret
Functionce15c: ; ce15c (33:615c)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld d, [hl]
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
inc [hl]
ld a, [hl]
and $1
jr nz, .asm_ce189
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
dec [hl]
.asm_ce189
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $3
jr nz, .asm_ce197
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
inc [hl]
.asm_ce197
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
cp $5a
jr nc, .asm_ce1aa
@@ -3695,34 +3685,34 @@
ret
.asm_ce1ac
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce1b0: ; ce1b0 (33:61b0)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
inc [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld d, [hl]
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
inc [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
cp $40
jr nc, .asm_ce1df
@@ -3734,7 +3724,7 @@
dec [hl]
and a
ret nz
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce1e7: ; ce1e7 (33:61e7)
@@ -3745,35 +3735,35 @@
Functionce1ee: ; ce1ee (33:61ee)
call Functionce72c
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], a
Functionce1fb: ; ce1fb (33:61fb)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $30
call BattleAnim_Sine
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
add [hl]
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
add $8
ld d, $30
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
inc [hl]
ret
@@ -3786,24 +3776,24 @@
Functionce22d: ; ce22d (33:622d)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $10
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $10
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld [hl], $f
Functionce254: ; ce254 (33:6254)
@@ -3828,7 +3818,7 @@
.asm_ce26c
ld a, $cc
.asm_ce26e
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], a
ret
@@ -3839,7 +3829,7 @@
Functionce278: ; ce278 (33:6278)
call Functionce29f
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $84
@@ -3850,7 +3840,7 @@
Functionce289: ; ce289 (33:6289)
call Functionce29f
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $d0
@@ -3860,12 +3850,12 @@
ret
.asm_ce29b
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce29f: ; ce29f (33:629f)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
and $7
inc [hl]
@@ -3883,10 +3873,10 @@
.asm_ce2b9
add hl, de
ld a, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
and [hl]
- ld [wcfc8], a
+ ld [wOBP0], a
ret
; ce2c4 (33:62c4)
@@ -3898,7 +3888,7 @@
; ce2cc
Functionce2cc: ; ce2cc (33:62cc)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $18
@@ -3906,23 +3896,23 @@
sra a
sra a
sra a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
add [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
inc [hl]
ld d, $18
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
rept 2
dec [hl]
endr
@@ -3936,13 +3926,13 @@
dw Functionce34c
Functionce306: ; ce306 (33:6306)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $e0
jr nz, .asm_ce319
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $2
ret
@@ -3949,7 +3939,7 @@
.asm_ce319
ld d, a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld e, [hl]
ld hl, hPushOAM ; $ff80
@@ -3956,17 +3946,17 @@
add hl, de
ld e, l
ld d, h
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], d
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], e
ret
Functionce330: ; ce330 (33:6330)
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
and a
jr z, .asm_ce33a
@@ -3975,13 +3965,13 @@
.asm_ce33a
ld [hl], $4
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
xor $ff
inc a
ld [hl], a
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
add [hl]
ld [hl], a
@@ -3988,7 +3978,7 @@
ret
Functionce34c: ; ce34c (33:634c)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $84
@@ -3998,7 +3988,7 @@
ret
.asm_ce35b
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce35f: ; ce35f (33:635f)
@@ -4009,7 +3999,7 @@
Functionce366: ; ce366 (33:6366)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $7f
@@ -4017,17 +4007,17 @@
call Functionce7bf
Functionce375: ; ce375 (33:6375)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
bit 7, [hl]
jr nz, .asm_ce383
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
inc [hl]
ret
.asm_ce383
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
dec [hl]
ret
@@ -4041,13 +4031,13 @@
Functionce392: ; ce392 (33:6392)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $c
ret
Functionce39c: ; ce39c (33:639c)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
and a
@@ -4061,13 +4051,13 @@
call Functionce7bf
Functionce3ae: ; ce3ae (33:63ae)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
dec [hl]
ret
Functionce3b4: ; ce3b4 (33:63b4)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
rept 2
@@ -4076,36 +4066,36 @@
push af
ld d, $2
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop af
ld d, $8
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
ret
Functionce3d2: ; ce3d2 (33:63d2)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $20
jr c, .asm_ce3df
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
.asm_ce3df
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $8
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
add $2
@@ -4112,7 +4102,7 @@
ld [hl], a
and $7
ret nz
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
inc [hl]
ret
@@ -4124,10 +4114,10 @@
dw Functionce412
Functionce406: ; ce406 (33:6406)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
add [hl]
ld [hl], a
@@ -4134,11 +4124,11 @@
ret
Functionce412: ; ce412 (33:6412)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce416: ; ce416 (33:6416)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld d, $18
@@ -4145,17 +4135,17 @@
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
sra a
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
inc [hl]
@@ -4170,18 +4160,18 @@
Functionce443: ; ce443 (33:6443)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $28
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f
- ld hl, $3
+ ld hl, BATTLEANIMSTRUCT_03
add hl, bc
add [hl]
call Functionce7bf
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and $f0
@@ -4189,7 +4179,7 @@
ld [hl], a
Functionce465: ; ce465 (33:6465)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
and a
@@ -4197,19 +4187,19 @@
dec [hl]
add $8
ld d, a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
ret
@@ -4219,13 +4209,13 @@
call Functionce72c
Functionce490: ; ce490 (33:6490)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
dec [hl]
and a
ret nz
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce49c: ; ce49c (33:649c)
@@ -4236,7 +4226,7 @@
Functionce4a3: ; ce4a3 (33:64a3)
call Functionce72c
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, $24
add [hl]
@@ -4243,43 +4233,43 @@
call Functionce7bf
Functionce4b0: ; ce4b0 (33:64b0)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $38
jr nc, .asm_ce4d8
inc [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
inc [hl]
ld d, $18
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
ld a, [hl]
and $1
ret nz
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
dec [hl]
ret
.asm_ce4d8
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce4dc: ; ce4dc (33:64dc)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and a
ret z
ld d, a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
inc [hl]
@@ -4289,21 +4279,21 @@
xor $ff
inc a
.asm_ce4f4
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
and $1f
ret nz
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
srl [hl]
ret
Functionce508: ; ce508 (33:6508)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
cp $10
@@ -4312,32 +4302,32 @@
inc [hl]
endr
ld d, a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
ret
.asm_ce52e
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce532: ; ce532 (33:6532)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld e, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld d, [hl]
ld a, e
@@ -4351,13 +4341,13 @@
push af
push de
call BattleAnim_Sine
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
ret
@@ -4371,7 +4361,7 @@
Functionce564: ; ce564 (33:6564)
ld d, $18
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
inc [hl]
@@ -4379,12 +4369,12 @@
Functionce56e: ; ce56e (33:656e)
call Functionce72c
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $18
Functionce577: ; ce577 (33:6577)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
cp $80
@@ -4392,13 +4382,13 @@
ld d, a
add $8
ld [hl], a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
jr asm_ce58f
.asm_ce58b
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
asm_ce58f: ; ce58f (33:658f)
@@ -4412,17 +4402,17 @@
dw Functionce59a
Functionce59a: ; ce59a (33:659a)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld a, [hl]
cp $30
jr c, .asm_ce5b0
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
rept 2
dec [hl]
endr
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
rept 2
inc [hl]
@@ -4430,7 +4420,7 @@
ret
.asm_ce5b0
- call Functioncc9bd
+ call DeinitBattleAnimation
Functionce5b3: ; ce5b3 (33:65b3)
ret
@@ -4437,7 +4427,7 @@
Functionce5b4: ; ce5b4 (33:65b4)
ld d, $50
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
rept 2
@@ -4448,23 +4438,23 @@
call BattleAnim_Sine
sra a
sra a
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
add [hl]
inc [hl]
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
ret
Functionce5dc: ; ce5dc (33:65dc)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $d0
@@ -4475,7 +4465,7 @@
ret
.asm_ce5ea
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce5ee: ; ce5ee (33:65ee)
@@ -4487,18 +4477,18 @@
dw Functionce618
Functionce5f9: ; ce5f9 (33:65f9)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
and a
jr nz, asm_ce61c
call Functionce72c
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], $ec
Functionce60a: ; ce60a (33:660a)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $4
@@ -4509,7 +4499,7 @@
ret
Functionce618: ; ce618 (33:6618)
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
asm_ce61c: ; ce61c (33:661c)
@@ -4517,7 +4507,7 @@
call Functionce72c
Functionce622: ; ce622 (33:6622)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
cp $d8
@@ -4536,10 +4526,10 @@
dw Functionce672
Functionce63a: ; ce63a (33:663a)
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld [hl], a
call Functionce72c
@@ -4546,7 +4536,7 @@
ret
Functionce648: ; ce648 (33:6648)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
add $4
@@ -4555,7 +4545,7 @@
xor a
.asm_ce654
ld [hl], a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
rept 2
inc [hl]
@@ -4563,7 +4553,7 @@
ret
Functionce65c: ; ce65c (33:665c)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
add $4
@@ -4572,7 +4562,7 @@
xor a
.asm_ce668
ld [hl], a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld a, [hl]
add $8
@@ -4580,7 +4570,7 @@
ret
Functionce672: ; ce672 (33:6672)
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld a, [hl]
add $4
@@ -4589,7 +4579,7 @@
xor a
.asm_ce67e
ld [hl], a
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld a, [hl]
add $4
@@ -4597,13 +4587,13 @@
ret
Functionce688: ; ce688 (33:6688)
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld d, [hl]
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld e, [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
ld l, a
@@ -4619,10 +4609,10 @@
add hl, de
ld e, l
ld d, h
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
ld [hl], d
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], e
ret
@@ -4629,7 +4619,7 @@
Functionce6b3: ; ce6b3 (33:66b3)
ld d, $18
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
inc [hl]
@@ -4638,12 +4628,12 @@
Functionce6bf: ; ce6bf (33:66bf)
ld d, $18
- ld hl, $10
- add hl, bc
+ ld hl, BATTLEANIMSTRUCT_10
+ ADD HL, BC
ld a, [hl]
inc [hl]
srl a
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
add [hl]
call Functionce6f1
@@ -4650,25 +4640,25 @@
ret
Functionce6d2: ; ce6d2 (33:66d2)
- ld hl, $f
+ ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld a, [hl]
cp $20
jr nc, .asm_ce6ed
inc [hl]
- ld hl, $b
+ ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld d, [hl]
call BattleAnim_Sine
xor $ff
inc a
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
ret
.asm_ce6ed
- call Functioncc9bd
+ call DeinitBattleAnimation
ret
Functionce6f1: ; ce6f1 (33:66f1)
@@ -4677,13 +4667,13 @@
call BattleAnim_Sine
sra a
sra a
- ld hl, $a
+ ld hl, BATTLEANIMSTRUCT_0A
add hl, bc
ld [hl], a
pop de
pop af
call BattleAnim_Cosine
- ld hl, $9
+ ld hl, BATTLEANIMSTRUCT_09
add hl, bc
ld [hl], a
ret
@@ -4691,12 +4681,12 @@
Functionce70a: ; ce70a (33:670a)
and $f
ld e, a
- ld hl, $7
+ ld hl, BATTLEANIMSTRUCT_07
add hl, bc
add [hl]
ld [hl], a
srl e
- ld hl, $8
+ ld hl, BATTLEANIMSTRUCT_08
add hl, bc
.asm_ce719
dec [hl]
@@ -4706,7 +4696,7 @@
BattleAnim_AnonJumptable: ; ce71e (33:671e)
pop de
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
ld l, [hl]
ld h, $0
@@ -4718,7 +4708,7 @@
jp [hl]
Functionce72c: ; ce72c (33:672c)
- ld hl, $e
+ ld hl, BATTLEANIMSTRUCT_0E
add hl, bc
inc [hl]
ret
@@ -4801,13 +4791,13 @@
; ce7bf
Functionce7bf: ; ce7bf (33:67bf)
- ld hl, $3
+ ld hl, BATTLEANIMSTRUCT_03
add hl, bc
ld [hl], a
- ld hl, $c
+ ld hl, BATTLEANIMSTRUCT_0C
add hl, bc
ld [hl], $0
- ld hl, $d
+ ld hl, BATTLEANIMSTRUCT_0D
add hl, bc
ld [hl], $ff
ret
@@ -4814,7 +4804,7 @@
Functionce7d1: ; ce7d1
.asm_ce7d1
- ld hl, $c
+ ld hl, BATTLEANIMSTRUCT_0C
add hl, bc
ld a, [hl]
and a
@@ -4826,7 +4816,7 @@
jr .asm_ce7fd
.asm_ce7e1
- ld hl, $d
+ ld hl, BATTLEANIMSTRUCT_0D
add hl, bc
inc [hl]
call Functionce823
@@ -4839,7 +4829,7 @@
ld a, [hl]
push hl
and $3f
- ld hl, $c
+ ld hl, BATTLEANIMSTRUCT_0C
add hl, bc
ld [hl], a
pop hl
@@ -4854,10 +4844,10 @@
.asm_ce807
xor a
- ld hl, $c
+ ld hl, BATTLEANIMSTRUCT_0C
add hl, bc
ld [hl], a
- ld hl, $d
+ ld hl, BATTLEANIMSTRUCT_0D
add hl, bc
rept 2
dec [hl]
@@ -4866,11 +4856,11 @@
.asm_ce815
xor a
- ld hl, $c
+ ld hl, BATTLEANIMSTRUCT_0C
add hl, bc
ld [hl], a
dec a
- ld hl, $d
+ ld hl, BATTLEANIMSTRUCT_0D
add hl, bc
ld [hl], a
jr .asm_ce7d1
@@ -4878,7 +4868,7 @@
; ce823
Functionce823: ; ce823
- ld hl, $3
+ ld hl, BATTLEANIMSTRUCT_03
add hl, bc
ld e, [hl]
ld d, 0
@@ -4889,7 +4879,7 @@
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, $d
+ ld hl, BATTLEANIMSTRUCT_0D
add hl, bc
ld l, [hl]
ld h, $0
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -218,7 +218,7 @@
ld h, 0
add hl, de
ld a, [hl]
- ld [wcfc7], a
+ ld [wBGP], a
ret
BattleBGEffect_WhiteHues: ; c812d (32:412d)
@@ -225,7 +225,7 @@
ld de, Unknown_c813d
call Functionc8d57
jr c, .asm_c8139
- ld [wcfc7], a
+ ld [wBGP], a
ret
.asm_c8139
@@ -242,7 +242,7 @@
ld de, Unknown_c8151
call Functionc8d57
jr c, .asm_c814d
- ld [wcfc7], a
+ ld [wBGP], a
ret
.asm_c814d
@@ -259,8 +259,8 @@
ld de, Unknown_c8168
call Functionc8d57
jr c, .asm_c8164
- ld [wcfc7], a
- ld [wcfc9], a
+ ld [wBGP], a
+ ld [wOBP1], a
ret
.asm_c8164
@@ -282,7 +282,7 @@
ld de, Unknown_c8188
.asm_c817e
call Functionc8d57
- ld [wcfc8], a
+ ld [wOBP0], a
ret
; c8185 (32:4185)
@@ -304,7 +304,7 @@
ld de, Unknown_c81a2
.asm_c8198
call Functionc8d57
- ld [wcfc8], a
+ ld [wOBP0], a
ret
; c819f (32:419f)
@@ -320,7 +320,7 @@
BattleBGEffect_08: ; c81a5 (32:41a5)
ld de, Unknown_c81af
call Functionc8d57
- ld [wcfc7], a
+ ld [wBGP], a
ret
; c81af (32:41af)
@@ -412,7 +412,7 @@
Functionc8223: ; c8223 (32:4223)
call Functionc9042
jr z, .asm_c8230
- ld hl, w5_d40e
+ ld hl, wNumActiveBattleAnims
inc [hl]
call EndBattleBGEffect
ret
@@ -478,7 +478,7 @@
Functionc8290: ; c8290 (32:4290)
call Functionc9042
jr z, .asm_c829d
- ld hl, w5_d40e
+ ld hl, wNumActiveBattleAnims
inc [hl]
call EndBattleBGEffect
ret
@@ -2002,7 +2002,7 @@
ld hl, Unknown_c8bd8
add hl, de
ld a, [hli]
- ld [wcfc9], a
+ ld [wOBP1], a
ld d, a
ld e, [hl]
ld bc, $2f30
@@ -2013,7 +2013,7 @@
ld d, [hl]
inc hl
ld a, [hl]
- ld [wcfc9], a
+ ld [wOBP1], a
ld e, a
ld bc, $3728
.asm_c8b5b
@@ -2024,8 +2024,8 @@
Functionc8b60: ; c8b60 (32:4b60)
call Functionc8f19
ld a, $e4
- ld [wcfc7], a
- ld [wcfc9], a
+ ld [wBGP], a
+ ld [wOBP1], a
ret
Functionc8b6c: ; c8b6c (32:4b6c)
@@ -2733,8 +2733,8 @@
ld [hLCDStatCustom], a
ld a, $e4
ld [rBGP], a
- ld [wcfc7], a
- ld [wcfc9], a
+ ld [wBGP], a
+ ld [wOBP1], a
ld [hLCDStatCustom + 1], a
ld [hLCDStatCustom + 2], a
call Functionc8eca
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -421,7 +421,7 @@
bit SUBSTATUS_CONFUSED, a
ret nz
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_CONFUSED
call Call_PlayBattleAnim_OnlyIfVisible
call SwitchTurnCore
@@ -1098,7 +1098,7 @@
pop de
xor a
- ld [wcfca], a
+ ld [wNumHits], a
call Call_PlayBattleAnim_OnlyIfVisible
call GetEighthMaxHP
ld de, PlayerToxicCount
@@ -1138,7 +1138,7 @@
call SwitchTurnCore
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_SAP
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar
@@ -1163,7 +1163,7 @@
bit SUBSTATUS_NIGHTMARE, [hl]
jr z, .not_nightmare
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_IN_NIGHTMARE
call Call_PlayBattleAnim_OnlyIfVisible
call GetQuarterMaxHP
@@ -1181,7 +1181,7 @@
jr z, .not_cursed
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_IN_NIGHTMARE
call Call_PlayBattleAnim_OnlyIfVisible
call GetQuarterMaxHP
@@ -1325,7 +1325,7 @@
call SwitchTurnCore
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
predef PlayBattleAnim
call SwitchTurnCore
@@ -1827,7 +1827,7 @@
call SwitchTurnCore
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_IN_SANDSTORM
call Call_PlayBattleAnim
call SwitchTurnCore
@@ -3761,7 +3761,7 @@
call GetMonFrontpic
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [wKickCounter], a
call SetEnemyTurn
ld de, ANIM_SEND_OUT_MON
@@ -4267,7 +4267,7 @@
ld [wEnemyWrapCount], a
call SetPlayerTurn
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [wKickCounter], a
ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim
@@ -4460,7 +4460,7 @@
push af
xor a
ld [hBattleTurn], a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_RETURN_MON
call Call_PlayBattleAnim
pop af
@@ -4593,7 +4593,7 @@
ld [FXAnimIDLo], a
call SwitchTurnCore
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
predef PlayBattleAnim
call SwitchTurnCore
@@ -8761,7 +8761,7 @@
ld [wFailedToFlee], a
ld [wNumFleeAttempts], a
ld [wForcedSwitch], a
- ld [wd0d8], a
+ ld [wPartyMenuCursor], a
ld [wKeyItemsPocketCursor], a
ld [wItemsPocketCursor], a
ld [wd0d2], a
@@ -9591,7 +9591,7 @@
jr nc, .not_shiny
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld a, 1
ld [hBattleTurn], a
ld a, 1
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -172,7 +172,7 @@
jr z, .woke_up
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_SLP
call FarPlayBattleAnimation
jr .fast_asleep
@@ -276,7 +276,7 @@
ld hl, IsConfusedText
call StdBattleTextBox
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_CONFUSED
call FarPlayBattleAnimation
@@ -305,7 +305,7 @@
ld hl, InLoveWithText
call StdBattleTextBox
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_IN_LOVE
call FarPlayBattleAnimation
@@ -420,7 +420,7 @@
ld hl, FastAsleepText
call StdBattleTextBox
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_SLP
call FarPlayBattleAnimation
jr .fast_asleep
@@ -521,7 +521,7 @@
call StdBattleTextBox
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_CONFUSED
call FarPlayBattleAnimation
@@ -542,7 +542,7 @@
call BattleCommand_DamageCalc
call BattleCommand_LowerSub
xor a
- ld [wcfca], a
+ ld [wNumHits], a
; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION
@@ -567,7 +567,7 @@
ld hl, InLoveWithText
call StdBattleTextBox
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld de, ANIM_IN_LOVE
call FarPlayBattleAnimation
@@ -656,7 +656,7 @@
call BattleCommand_LowerSub
xor a
- ld [wcfca], a
+ ld [wNumHits], a
; Flicker the monster pic unless flying or underground.
ld de, ANIM_HIT_CONFUSION
@@ -2071,7 +2071,7 @@
jr c, .mimic_anims
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
inc a
ld [wKickCounter], a
@@ -2125,7 +2125,7 @@
ld a, BATTLEANIM_PLAYER_DAMAGE
.got_rollout_count
- ld [wcfca], a
+ ld [wNumHits], a
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_MULTI_HIT
@@ -2177,7 +2177,7 @@
pop af
jp z, PlayFXAnimID
xor a
- ld [wcfca], a
+ ld [wNumHits], a
jp PlayFXAnimID
; 34fd1
@@ -2208,7 +2208,7 @@
BattleCommand_StatUpDownAnim: ; 34feb
- ld [wcfca], a
+ ld [wNumHits], a
xor a
ld [wKickCounter], a
ld a, BATTLE_VARS_MOVE_ANIM
@@ -2241,7 +2241,7 @@
jp c, BattleCommand_RaiseSubNoAnim
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
ld a, $2
ld [wKickCounter], a
@@ -2599,7 +2599,7 @@
call BattleCommand_SwitchTurn
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
inc a
ld [wKickCounter], a
@@ -5254,7 +5254,7 @@
; burntarget
xor a
- ld [wcfca], a
+ ld [wNumHits], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@@ -5324,7 +5324,7 @@
; freezetarget
xor a
- ld [wcfca], a
+ ld [wNumHits], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@@ -5379,7 +5379,7 @@
; paralyzetarget
xor a
- ld [wcfca], a
+ ld [wNumHits], a
call CheckSubstituteOpp
ret nz
ld a, BATTLE_VARS_STATUS_OPP
@@ -6549,7 +6549,7 @@
.run_away
call UpdateBattleMonInParty
xor a
- ld [wcfca], a
+ ld [wNumHits], a
inc a
ld [wForcedSwitch], a
ld [wKickCounter], a
@@ -6617,7 +6617,7 @@
.wild_force_flee
call UpdateBattleMonInParty
xor a
- ld [wcfca], a
+ ld [wNumHits], a
inc a
ld [wForcedSwitch], a
call SetBattleDraw
@@ -6710,7 +6710,7 @@
.wild_succeed_playeristarget
call UpdateBattleMonInParty
xor a
- ld [wcfca], a
+ ld [wNumHits], a
inc a
ld [wForcedSwitch], a
call SetBattleDraw
@@ -7141,7 +7141,7 @@
call BattleCommand_LowerSub
xor a
- ld [wcfca], a
+ ld [wNumHits], a
inc a
ld [wKickCounter], a
call LoadMoveAnim
@@ -7713,7 +7713,7 @@
jr c, .mobile
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
ld [wKickCounter], a
ld a, SUBSTITUTE
@@ -8234,7 +8234,7 @@
call CheckHiddenOpponent
jp nz, Function372d2
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
ld a, $1
ld [wKickCounter], a
@@ -8352,7 +8352,7 @@
call BattleCommand_RaiseSubNoAnim
.after_anim
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
ld a, $2
ld [wKickCounter], a
@@ -8546,7 +8546,7 @@
BattleCommand_SelfDestruct: ; 37380
callba MobileFn_10610d
ld a, BATTLEANIM_PLAYER_DAMAGE
- ld [wcfca], a
+ ld [wNumHits], a
ld c, 3
call DelayFrames
ld a, BATTLE_VARS_STATUS
@@ -9773,7 +9773,7 @@
ld a, BATTLEANIM_PLAYER_DAMAGE
.player
- ld [wcfca], a
+ ld [wNumHits], a
jp PlayUserBattleAnim
; 37e36
@@ -9781,7 +9781,7 @@
LoadMoveAnim: ; 37e36
xor a
- ld [wcfca], a
+ ld [wNumHits], a
ld [FXAnimIDHi], a
ld a, BATTLE_VARS_MOVE_ANIM
@@ -9819,7 +9819,7 @@
ld a, d
ld [FXAnimIDHi], a
xor a
- ld [wcfca], a
+ ld [wNumHits], a
push hl
push de
--- a/constants/battle_constants.asm
+++ b/constants/battle_constants.asm
@@ -374,3 +374,30 @@
const WIN
const LOSE
const DRAW
+
+ const_def
+ const BATTLEANIMSTRUCT_INDEX
+ const BATTLEANIMSTRUCT_01
+ const BATTLEANIMSTRUCT_02
+ const BATTLEANIMSTRUCT_03
+ const BATTLEANIMSTRUCT_04
+ const BATTLEANIMSTRUCT_05
+ const BATTLEANIMSTRUCT_06
+ const BATTLEANIMSTRUCT_07
+ const BATTLEANIMSTRUCT_08
+ const BATTLEANIMSTRUCT_09
+ const BATTLEANIMSTRUCT_0A
+ const BATTLEANIMSTRUCT_0B
+ const BATTLEANIMSTRUCT_0C
+ const BATTLEANIMSTRUCT_0D
+ const BATTLEANIMSTRUCT_0E
+ const BATTLEANIMSTRUCT_0F
+ const BATTLEANIMSTRUCT_10
+ const BATTLEANIMSTRUCT_11
+ const BATTLEANIMSTRUCT_12
+ const BATTLEANIMSTRUCT_13
+ const BATTLEANIMSTRUCT_14
+ const BATTLEANIMSTRUCT_15
+ const BATTLEANIMSTRUCT_16
+ const BATTLEANIMSTRUCT_17
+BATTLEANIMSTRUCT_LENGTH EQU const_value
--- a/constants/move_constants.asm
+++ b/constants/move_constants.asm
@@ -287,7 +287,7 @@
const ANIM_SHAKE ; $114
const ANIM_HIT_CONFUSION ; $115
-; wcfca uses offsets from ANIM_MISS
+; wNumHits uses offsets from ANIM_MISS
const_def
const BATTLEANIM_NONE
const BATTLEANIM_ENEMY_DAMAGE
--- a/engine/battle_start.asm
+++ b/engine/battle_start.asm
@@ -1,11 +1,11 @@
Predef_StartBattle: ; 8c20f
call Function8c26d
ld a, [rBGP]
- ld [wcfc7], a
+ ld [wBGP], a
ld a, [rOBP0]
- ld [wcfc8], a
+ ld [wOBP0], a
ld a, [rOBP1]
- ld [wcfc9], a
+ ld [wOBP1], a
call DelayFrame
ld hl, hVBlank
ld a, [hl]
@@ -35,7 +35,7 @@
ld [rSVBK], a
ld a, %11111111
- ld [wcfc7], a
+ ld [wBGP], a
call DmgToCgbBGPals
call DelayFrame
xor a
@@ -278,7 +278,7 @@
ld a, [hl]
cp %00000001
jr z, .done
- ld [wcfc7], a
+ ld [wBGP], a
call DmgToCgbBGPals
and a
ret
--- a/engine/party_menu.asm
+++ b/engine/party_menu.asm
@@ -678,7 +678,7 @@
xor a
ld [wSwitchMon], a
ld de, PartyMenuAttributes
- call InitMenu3
+ call SetMenuAttributes
ld a, [PartyCount]
inc a
ld [w2DMenuNumRows], a ; list length
@@ -704,7 +704,7 @@
InitPartyMenuNoCancel: ; 0x5042d
; no cancel
ld de, PartyMenuAttributes
- call InitMenu3
+ call SetMenuAttributes
ld a, [PartyCount]
ld [w2DMenuNumRows], a ; list length
ld b, a
@@ -726,13 +726,17 @@
PartyMenuAttributes: ; 5044f
; cursor y
; cursor x
-; list length
-; ?
+; num rows
+; num cols
; bit 6: animate sprites bit 5: wrap around
; ?
; distance between items (hi: y, lo: x)
; allowed buttons (mask)
- db $01, $00, $00, $01, $60, $00, $20, $00
+ db 1, 0
+ db 0, 1
+ db $60, $00
+ dn 2, 0
+ db 0
; 50457
PartyMenuSelect: ; 0x50457
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -270,7 +270,7 @@
.GetMenuAccountTextPointer ; 12819
ld e, a
ld d, 0
- ld hl, wcf97
+ ld hl, wMenuData2PointerTableAddr
ld a, [hli]
ld h, [hl]
ld l, a
@@ -1475,8 +1475,8 @@
.asm_12f73: ; 12f73
call SetUpMoveScreenBG
- ld de, Unknown_12fb2
- call InitMenu3
+ ld de, DeleteMoveScreenAttrs
+ call SetMenuAttributes
call SetUpMoveList
ld hl, w2DMenuFlags1
set 6, [hl]
@@ -1514,8 +1514,12 @@
ret
; 12fb2
-Unknown_12fb2: ; 12fb2
- db $03, $01, $03, $01, $40, $00, $20, $c3
+DeleteMoveScreenAttrs: ; 12fb2
+ db 3, 1
+ db 3, 1
+ db $40, $00
+ dn 2, 0
+ db D_UP | D_DOWN | A_BUTTON | B_BUTTON
; 12fba
ManagePokemonMoves: ; 12fba
@@ -1539,11 +1543,11 @@
MoveScreenLoop: ; 12fd5
ld a, [CurPartyMon]
inc a
- ld [wd0d8], a
+ ld [wPartyMenuCursor], a
call SetUpMoveScreenBG
call Function132d3
- ld de, Unknown_13163
- call InitMenu3
+ ld de, MoveScreenAttributes
+ call SetMenuAttributes
.loop
call SetUpMoveList
ld hl, w2DMenuFlags1
@@ -1746,8 +1750,12 @@
jp ClearTileMap
; 13163
-Unknown_13163: ; 13163
- db $03, $01, $03, $01, $40, $00, $20, $f3
+MoveScreenAttributes: ; 13163
+ db 3, 1
+ db 3, 1
+ db $40, $00
+ dn 2, 0
+ db D_UP | D_DOWN | D_LEFT | D_RIGHT | A_BUTTON | B_BUTTON
; 1316b
String_1316b: ; 1316b
--- a/engine/switch_items.asm
+++ b/engine/switch_items.asm
@@ -8,9 +8,9 @@
cp b
jr z, .trivial
ld a, [wScrollingMenuCursorPosition]
- call Function24a5c
+ call ItemSwitch_GetNthItem
ld a, [hl]
- cp $ff
+ cp -1
ret z
ld a, [wSwitchItem]
dec a
@@ -45,10 +45,10 @@
call Function24a6c
push bc
ld a, [wSwitchItem]
- call Function24a5c
+ call ItemSwitch_GetNthItem
dec hl
push hl
- call Function24a80
+ call ItemSwitch_ConvertSpacingToDW
add hl, bc
ld d, h
ld e, l
@@ -71,10 +71,10 @@
call Function24a6c
push bc
ld a, [wSwitchItem]
- call Function24a5c
+ call ItemSwitch_GetNthItem
ld d, h
ld e, l
- call Function24a80
+ call ItemSwitch_ConvertSpacingToDW
add hl, bc
pop bc
call CopyBytes
@@ -86,11 +86,11 @@
Function249a7: ; 249a7 (9:49a7)
ld a, [wSwitchItem]
- call Function24a5c
+ call ItemSwitch_GetNthItem
ld d, h
ld e, l
ld a, [wScrollingMenuCursorPosition]
- call Function24a5c
+ call ItemSwitch_GetNthItem
ld a, [de]
cp [hl]
jr nz, .asm_249cd
@@ -112,11 +112,11 @@
Function249d1: ; 249d1 (9:49d1)
ld a, [wSwitchItem]
- call Function24a5c
+ call ItemSwitch_GetNthItem
inc hl
push hl
ld a, [wScrollingMenuCursorPosition]
- call Function24a5c
+ call ItemSwitch_GetNthItem
inc hl
ld a, [hl]
pop hl
@@ -126,11 +126,11 @@
sub 99
push af
ld a, [wScrollingMenuCursorPosition]
- call Function24a5c
+ call ItemSwitch_GetNthItem
inc hl
ld [hl], 99
ld a, [wSwitchItem]
- call Function24a5c
+ call ItemSwitch_GetNthItem
inc hl
pop af
ld [hl], a
@@ -141,7 +141,7 @@
.asm_24a01
push af
ld a, [wScrollingMenuCursorPosition]
- call Function24a5c
+ call ItemSwitch_GetNthItem
inc hl
pop af
ld [hl], a
@@ -154,7 +154,7 @@
jr nz, .asm_24a25
dec [hl]
ld a, [wSwitchItem]
- call Function24a5c
+ call ItemSwitch_GetNthItem
ld [hl], $ff
xor a
ld [wSwitchItem], a
@@ -162,10 +162,10 @@
.asm_24a25
dec [hl]
- call Function24a80
+ call ItemSwitch_ConvertSpacingToDW
push bc
ld a, [wSwitchItem]
- call Function24a5c
+ call ItemSwitch_GetNthItem
pop bc
push hl
add hl, bc
@@ -181,24 +181,24 @@
ret
Function24a40: ; 24a40 (9:4a40)
- call Function24a5c
+ call ItemSwitch_GetNthItem
ld de, wd002
- call Function24a80
+ call ItemSwitch_ConvertSpacingToDW
call CopyBytes
ret
Function24a4d: ; 24a4d (9:4a4d)
- call Function24a5c
+ call ItemSwitch_GetNthItem
ld d, h
ld e, l
ld hl, wd002
- call Function24a80
+ call ItemSwitch_ConvertSpacingToDW
call CopyBytes
ret
-Function24a5c: ; 24a5c (9:4a5c)
+ItemSwitch_GetNthItem: ; 24a5c (9:4a5c)
push af
- call Function24a80
+ call ItemSwitch_ConvertSpacingToDW
ld hl, wMenuData2_ItemsPointerAddr
ld a, [hli]
ld h, [hl]
@@ -210,13 +210,13 @@
Function24a6c: ; 24a6c (9:4a6c)
push hl
- call Function24a80
+ call ItemSwitch_ConvertSpacingToDW
ld a, d
sub e
- jr nc, .asm_24a76
+ jr nc, .dont_negate
dec a
cpl
-.asm_24a76
+.dont_negate
ld hl, 0
call AddNTimes
ld b, h
@@ -224,12 +224,13 @@
pop hl
ret
-Function24a80: ; 24a80 (9:4a80)
+ItemSwitch_ConvertSpacingToDW: ; 24a80 (9:4a80)
+; This function is absolutely idiotic.
push hl
- ld a, [wcf94]
+ ld a, [wMenuData2_ScrollingMenuSpacing]
ld c, a
ld b, 0
- ld hl, Unknown_24a91
+ ld hl, .spacing_dws
rept 2
add hl, bc
endr
@@ -241,23 +242,23 @@
; 24a91 (9:4a91)
-Unknown_24a91: ; 24a91
+.spacing_dws: ; 24a91
dw 0, 1, 2
; 24a97
Function24a97: ; 24a97 (9:4a97)
push af
- call Function24a80
+ call ItemSwitch_ConvertSpacingToDW
ld a, c
- cp $2
- jr nz, .asm_24aa7
+ cp 2
+ jr nz, .not_2
pop af
- call Function24a5c
+ call ItemSwitch_GetNthItem
inc hl
ld a, [hl]
ret
-.asm_24aa7
+.not_2
pop af
ld a, $1
ret
--- a/event/magnet_train.asm
+++ b/event/magnet_train.asm
@@ -450,11 +450,11 @@
call GetSGBLayout
call UpdateTimePals
ld a, [rBGP]
- ld [wcfc7], a
+ ld [wBGP], a
ld a, [rOBP0]
- ld [wcfc8], a
+ ld [wOBP0], a
ld a, [rOBP1]
- ld [wcfc9], a
+ ld [wOBP1], a
pop af
ld [wPermission], a
pop af
--- a/home/movement.asm
+++ b/home/movement.asm
@@ -136,7 +136,7 @@
big_step_right
; 1bb1
-InitMenu3:: ; 1bb1
+SetMenuAttributes:: ; 1bb1
push hl
push bc
ld hl, w2DMenuCursorInitY
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -247,11 +247,11 @@
jp nz, UpdateCGBPals
; update gb pals
- ld a, [wcfc7]
+ ld a, [wBGP]
ld [rBGP], a
- ld a, [wcfc8]
+ ld a, [wOBP0]
ld [rOBP0], a
- ld a, [wcfc9]
+ ld a, [wOBP1]
ld [rOBP1], a
and a
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -413,7 +413,7 @@
xor a
ld [hBattleTurn], a
ld [Buffer2], a
- ld [wcfca], a
+ ld [wNumHits], a
predef PlayBattleAnim
ld a, [wWildMon]
@@ -2161,7 +2161,7 @@
Softboiled_MilkDrinkFunction: ; f3df (3:73df)
; Softboiled/Milk Drink in the field
- ld a, [wd0d8]
+ ld a, [wPartyMenuCursor]
dec a
ld b, a
call .SelectMilkDrinkRecipient ; select pokemon
@@ -2186,7 +2186,7 @@
.skip
ld a, b
inc a
- ld [wd0d8], a
+ ld [wPartyMenuCursor], a
ret
.SelectMilkDrinkRecipient: ; f419 (3:7419)
@@ -2197,7 +2197,7 @@
call ChoosePkmnToUseItemOn
pop bc
jr c, .set_carry
- ld a, [wd0d8]
+ ld a, [wPartyMenuCursor]
dec a
ld c, a
ld a, b
@@ -2958,7 +2958,7 @@
xor a
ld [wKickCounter], a
ld [hBattleTurn], a
- ld [wcfca], a
+ ld [wNumHits], a
predef PlayBattleAnim
ld hl, BlockedTheBallText
call PrintText
--- a/misc/mobile_12_2.asm
+++ b/misc/mobile_12_2.asm
@@ -507,7 +507,7 @@
inc a
ld b, a
ld a, [wMenuCursorY]
- ld [wd0d8], a
+ ld [wPartyMenuCursor], a
cp b
jr z, .asm_4ab7e
ld a, [wMenuCursorY]
@@ -528,7 +528,7 @@
.asm_4ab6d
ld a, [wMenuCursorY]
- ld [wd0d8], a
+ ld [wPartyMenuCursor], a
.asm_4ab73
ld de, SFX_READ_TEXT_2
call PlaySFX
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -1803,7 +1803,7 @@
ld de, LoadMenuDataHeader
call FarCall_de
ld a, BANK(BattleMenuDataHeader)
- ld [wcf94], a
+ ld [wMenuData2_2DMenuItemStringsBank], a
ld a, [wd0d2]
ld [wMenuCursorBuffer], a
call Function100e72
@@ -1844,7 +1844,7 @@
Function100b7a: ; 100b7a
ld hl, CopyMenuData2
- ld a, [wcf94]
+ ld a, [wMenuData2_2DMenuItemStringsBank]
rst FarCall
callba Draw2DMenu
callba MobileTextBorder
@@ -1858,7 +1858,7 @@
MobileMoveSelectionScreen: ; 100b9f
xor a
- ld [wd0e3], a
+ ld [wMoveSwapBuffer], a
callba CheckPlayerHasUsableMoves
ret z
call Function100dd8
@@ -1989,8 +1989,8 @@
; 100c98
Function100c98: ; 100c98
- ld de, Unknown_100cad
- call InitMenu3
+ ld de, .attrs
+ call SetMenuAttributes
ld a, [wNumMoves]
inc a
ld [w2DMenuNumRows], a
@@ -2000,8 +2000,12 @@
ret
; 100cad
-Unknown_100cad: ; 100cad
- db $a, $1, $ff, $1, $a0, $, $20, $c3
+.attrs: ; 100cad
+ db 10, 1
+ db 255, 1
+ db $a0, $00
+ dn 2, 0
+ db D_UP | D_DOWN | A_BUTTON | B_BUTTON
Function100cb5: ; 100cb5
call Function100dd8
@@ -2009,7 +2013,7 @@
ld hl, w2DMenuFlags1
set 7, [hl]
res 6, [hl]
-.asm_100cc0
+.loop
call Function100dd2
callba MobileMenuJoypad
push bc
@@ -2017,10 +2021,10 @@
callba Function10402d
call Function100dfd
pop bc
- jr c, .asm_100d17
+ jr c, .done
ld a, [wMenuJoypadFilter]
and c
- jr z, .asm_100cc0
+ jr z, .loop
call PlaceHollowCursor
ld a, [PartyCount]
inc a
@@ -2027,12 +2031,12 @@
ld b, a
ld a, [wMenuCursorY]
cp b
- jr z, .asm_100d17
- ld [wd0d8], a
+ jr z, .done
+ ld [wPartyMenuCursor], a
ld a, [hJoyLast]
ld b, a
bit 1, b
- jr nz, .asm_100d17
+ jr nz, .done
ld a, [wMenuCursorY]
dec a
ld [CurPartyMon], a
@@ -2048,7 +2052,7 @@
and a
ret
-.asm_100d17
+.done
ld de, SFX_READ_TEXT_2
call PlaySFX
call WaitSFX
@@ -2529,7 +2533,7 @@
db -1
Unknown_100feb: ; 100feb
- dbwww $, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
+ dbwww $0, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
db -1
Unknown_100ff3: ; 100ff3
@@ -6311,7 +6315,7 @@
ld hl, wcd4b
set 1, [hl]
ld de, MenuData3_102a33
- call InitMenu3
+ call SetMenuAttributes
ld a, [wcd4a]
inc a
ld [wcd4a], a
@@ -6353,7 +6357,9 @@
MenuData3_102a33:
db 8, 11
db 2, 1
- db $80, $00, $20, $01
+ db $80, $00
+ dn 2, 0
+ db A_BUTTON
Function102a3b: ; 102a3b
ld a, [wcd30]
@@ -6487,7 +6493,7 @@
ld a, [wMenuCursorY]
push af
ld de, Unknown_102b73
- call InitMenu3
+ call SetMenuAttributes
pop af
ld [wMenuCursorY], a
ld a, [OTPartyCount]
@@ -6504,7 +6510,11 @@
; 102b73
Unknown_102b73:
- db $9, $6, $ff, $1, $a0, $, $10, $c1
+ db 9, 6
+ db 255, 1
+ db $a0, $00
+ dn 1, 0
+ db D_UP | D_DOWN | A_BUTTON
Function102b7b: ; 102b7b
xor a
@@ -6512,7 +6522,7 @@
ld a, [wMenuCursorY]
push af
ld de, Unknown_102b94
- call InitMenu3
+ call SetMenuAttributes
pop af
ld [wMenuCursorY], a
ld a, [PartyCount]
@@ -6521,7 +6531,11 @@
; 102b94
Unknown_102b94:
- db $1, $6, $ff, $1, $a0, $, $10, $c1
+ db 1, 6
+ db 255, 1
+ db $a0, $00
+ dn 1, 0
+ db D_UP | D_DOWN | A_BUTTON
Function102b9c: ; 102b9c
ld a, [wcd4d]
@@ -7250,20 +7264,20 @@
; 103112
Unknown_103112: ; 103112
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $1, $, $, $, $, $, $, $
- db $2, $1, $, $, $, $, $, $
- db $3, $2, $1, $, $, $, $, $
- db $4, $3, $2, $1, $, $, $, $
- db $4, $4, $3, $2, $1, $, $, $
- db $4, $4, $4, $3, $2, $1, $, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $1, $0, $0, $0, $0, $0, $0, $
+ db $2, $1, $0, $0, $0, $0, $0, $
+ db $3, $2, $1, $0, $0, $0, $0, $
+ db $4, $3, $2, $1, $0, $0, $0, $
+ db $4, $4, $3, $2, $1, $0, $0, $
+ db $4, $4, $4, $3, $2, $1, $0, $
db $4, $4, $4, $4, $3, $2, $1, $
db $4, $4, $4, $4, $4, $3, $2, $1
db $4, $4, $4, $4, $4, $4, $3, $2
@@ -7279,48 +7293,48 @@
db $3, $4, $4, $4, $4, $4, $4, $4
db $2, $3, $4, $4, $4, $4, $4, $4
db $1, $2, $3, $4, $4, $4, $4, $4
- db $, $1, $2, $3, $4, $4, $4, $4
- db $, $, $1, $2, $3, $4, $4, $4
- db $, $, $, $1, $2, $3, $4, $4
- db $, $, $, $, $1, $2, $3, $4
- db $, $, $, $, $, $1, $2, $3
- db $, $, $, $, $, $, $1, $2
- db $, $, $, $, $, $, $, $1
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
- db $, $, $, $, $, $, $, $
+ db $0, $1, $2, $3, $4, $4, $4, $4
+ db $0, $0, $1, $2, $3, $4, $4, $4
+ db $0, $0, $0, $1, $2, $3, $4, $4
+ db $0, $0, $0, $0, $1, $2, $3, $4
+ db $0, $0, $0, $0, $0, $1, $2, $3
+ db $0, $0, $0, $0, $0, $0, $1, $2
+ db $0, $0, $0, $0, $0, $0, $0, $1
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
+ db $0, $0, $0, $0, $0, $0, $0, $
; 10327a
Unknown_10327a: ; 10327a
- db $, $, $, $
- db $, $, $1, $
- db $, $, $2, $
- db $, $, $3, $
- db $, $, $1, $1
- db $, $, $, $
- db $, $, $1, $2
- db $, $, $2, $2
- db $, $, $3, $2
- db $, $, $1, $3
+ db $0, $0, $0, $
+ db $0, $0, $1, $
+ db $0, $0, $2, $
+ db $0, $0, $3, $
+ db $0, $0, $1, $1
+ db $0, $0, $0, $
+ db $0, $0, $1, $2
+ db $0, $0, $2, $2
+ db $0, $0, $3, $2
+ db $0, $0, $1, $3
GFX_1032a2:
INCBIN "gfx/unknown/1032a2.2bpp"
Unknown_1032e2:
- db $, $, $ff, $1f
+ db $0, $0, $ff, $1f
db $f4, $1b, $8d, $42
- db $, $, $67, $45
- db $, $, $, $
- db $, $, $1f, $13
+ db $0, $0, $67, $45
+ db $0, $0, $0, $
+ db $0, $0, $1f, $13
db $99, $1, $ff, $10
- db $, $, $19, $
- db $, $, $, $
+ db $0, $0, $19, $
+ db $0, $0, $0, $
; 103302
Function103302: ; 103302
--- a/tilesets/animations.asm
+++ b/tilesets/animations.asm
@@ -99,7 +99,7 @@
TilesetAnimfc0d7: ; 0xfc0d7
dw VTiles2 tile $03, WriteTileToBuffer
- dw wcf41, ScrollTileRightLeft
+ dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $03, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -113,7 +113,7 @@
TilesetAnimfc103: ; 0xfc103
dw VTiles2 tile $14, WriteTileToBuffer
- dw wcf41, ScrollTileRightLeft
+ dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $14, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -153,15 +153,15 @@
TilesetAnimfc17f: ; 0xfc17f
dw VTiles2 tile $53, WriteTileToBuffer
- dw wcf41, ScrollTileDown
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw VTiles2 tile $53, WriteTileFromBuffer
dw VTiles2 tile $03, WriteTileToBuffer
- dw wcf41, ScrollTileRightLeft
+ dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $03, WriteTileFromBuffer
dw VTiles2 tile $53, WriteTileToBuffer
- dw wcf41, ScrollTileDown
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw VTiles2 tile $53, WriteTileFromBuffer
dw NULL, DoneTileAnimation
; 0xfc1af
@@ -168,17 +168,17 @@
TilesetAnimfc1af: ; 0xfc1af
dw VTiles2 tile $54, WriteTileToBuffer
- dw wcf41, ScrollTileDown
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw VTiles2 tile $54, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw VTiles2 tile $03, WriteTileToBuffer
- dw wcf41, ScrollTileRightLeft
+ dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $03, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw VTiles2 tile $54, WriteTileToBuffer
- dw wcf41, ScrollTileDown
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw VTiles2 tile $54, WriteTileFromBuffer
dw NULL, DoneTileAnimation
; 0xfc1e7
@@ -187,7 +187,7 @@
Tileset30Anim: ; 0xfc1e7
dw VTiles2 tile $14, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette
- dw wcf41, ScrollTileRightLeft
+ dw wTileAnimBuffer, ScrollTileRightLeft
dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $14, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette
@@ -195,11 +195,11 @@
dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $40, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $40, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette
@@ -209,7 +209,7 @@
Tileset29Anim: ; 0xfc233
dw VTiles2 tile $35, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette
- dw wcf41, ScrollTileRightLeft
+ dw wTileAnimBuffer, ScrollTileRightLeft
dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $35, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette
@@ -217,11 +217,11 @@
dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $31, WriteTileToBuffer
dw NULL, FlickeringCaveEntrancePalette
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette
- dw wcf41, ScrollTileDown
+ dw wTileAnimBuffer, ScrollTileDown
dw NULL, FlickeringCaveEntrancePalette
dw VTiles2 tile $31, WriteTileFromBuffer
dw NULL, FlickeringCaveEntrancePalette
@@ -249,7 +249,7 @@
TilesetAnimfc2bf: ; 0xfc2bf
dw VTiles2 tile $4f, WriteTileToBuffer
- dw wcf41, ScrollTileRightLeft
+ dw wTileAnimBuffer, ScrollTileRightLeft
dw VTiles2 tile $4f, WriteTileFromBuffer
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
@@ -430,10 +430,9 @@
add a
add l
ld l, a
- jr nc, .asm_fc399
+ jr nc, .okay
inc h
-
-.asm_fc399
+.okay
ld a, [hli]
ld h, [hl]
ld l, a
@@ -860,14 +859,14 @@
WriteTileFromBuffer: ; fc696
-; Write tiledata at wcf41 to de.
-; wcf41 is loaded to sp for WriteTile.
+; Write tiledata at wTileAnimBuffer to de.
+; wTileAnimBuffer is loaded to sp for WriteTile.
ld hl, [sp+0]
ld b, h
ld c, l
- ld hl, wcf41
+ ld hl, wTileAnimBuffer
ld sp, hl
ld h, d
@@ -877,7 +876,7 @@
WriteTileToBuffer: ; fc6a2
-; Write tiledata de to wcf41.
+; Write tiledata de to wTileAnimBuffer.
; de is loaded to sp for WriteTile.
ld hl, [sp+0]
@@ -888,7 +887,7 @@
ld l, e
ld sp, hl
- ld hl, wcf41
+ ld hl, wTileAnimBuffer
; fallthrough
--- a/wram.asm
+++ b/wram.asm
@@ -1498,11 +1498,13 @@
; bit 0-2: palette id
ds SCREEN_WIDTH * SCREEN_HEIGHT
AttrMapEnd::
-
-wcf41:: ds 1
+ ds 1
wcf42:: ds 2
wcf44:: ds 1
-wcf45:: ds 12
+wcf45::
+ ds AttrMapEnd - @
+wTileAnimBuffer::
+ ds $10
; addresses dealing with serial comms
wOtherPlayerLinkMode:: ds 1
wOtherPlayerLinkAction:: ds 4
@@ -1594,46 +1596,47 @@
; bit 0: Disable B button
wMenuData2_ScrollingMenuHeight::
-wMenuData2Items:: ds 1
+wMenuData2Items::
+ ds 1 ; cf92
wMenuData2IndicesPointer::
wMenuData2Spacing::
wMenuData2_ScrollingMenuWidth::
-wcf93:: ds 1
+ ds 1 ; cf93
wMenuData2_2DMenuItemStringsBank::
wMenuData2_ScrollingMenuSpacing::
-wcf94:: ds 1
+ ds 1 ; cf94
wMenuData2_2DMenuItemStringsAddr::
wMenuData2DisplayFunctionPointer::
wMenuData2_ItemsPointerBank::
-wcf95:: ds 1 ; bank
+ ds 1 ; cf95
wMenuData2_ItemsPointerAddr::
-wcf96:: ds 1 ; addr lo
+ ds 1 ; cf96
wMenuData2PointerTableAddr::
wMenuData2_2DMenuFunctionBank::
-wcf97:: ds 1 ; addr hi
+ ds 1 ; cf97
wMenuData2_2DMenuFunctionAddr::
wMenuData2_ScrollingMenuFunction1::
-wcf98:: ds 3
+ ds 3 ; cf98
wMenuData2_ScrollingMenuFunction2::
-wcf9b:: ds 3
+ ds 3 ; cf9b
wMenuData2_ScrollingMenuFunction3::
-wcf9e:: ds 3
+ ds 3 ; cf9e
wMenuData2End::
wMenuData3::
-w2DMenuCursorInitY:: ds 1
-w2DMenuCursorInitX:: ds 1
-w2DMenuNumRows:: ds 1
-w2DMenuNumCols:: ds 1
-w2DMenuFlags1:: ds 1
-w2DMenuFlags2:: ds 1
-w2DMenuCursorOffsets:: ds 1
-wMenuJoypadFilter:: ds 1
+w2DMenuCursorInitY:: ds 1 ; cfa1
+w2DMenuCursorInitX:: ds 1 ; cfa2
+w2DMenuNumRows:: ds 1 ; cfa3
+w2DMenuNumCols:: ds 1 ; cfa4
+w2DMenuFlags1:: ds 1 ; cfa5
+w2DMenuFlags2:: ds 1 ; cfa6
+w2DMenuCursorOffsets:: ds 1 ; cfa7
+wMenuJoypadFilter:: ds 1 ; cfa8
wMenuData3End::
-wMenuCursorY:: ds 1
-wMenuCursorX:: ds 1
-wCursorOffCharacter:: ds 1
+wMenuCursorY:: ds 1 ; cfa9
+wMenuCursorX:: ds 1 ; cfaa
+wCursorOffCharacter:: ds 1 ; cfab
wCursorCurrentTile:: ds 2 ; cfac
ds 3
@@ -1675,19 +1678,18 @@
FXAnimIDLo:: ; cfc2
ds 1
FXAnimIDHi:: ; cfc3
- ds 1
+ ds 3
-wcfc4:: ds 1
-wcfc5:: ds 1
-
TileAnimationTimer:: ; cfc6
ds 1
-wcfc7:: ds 1
-wcfc8:: ds 1
-wcfc9:: ds 1
-wcfca:: ds 2
+; palette backups?
+wBGP:: ds 1
+wOBP0:: ds 1
+wOBP1:: ds 1
+wNumHits:: ds 2
+
Options:: ; cfcc
; bit 0-2: number of frames to delay when printing text
; fast 1; mid 3; slow 5
@@ -3272,11 +3274,34 @@
SECTION "Battle Animations", WRAMX [$d300], BANK [5]
-w5_d300:: ds 10
+wBattleAnimTileDict:: ds 10
battle_anim_struct: MACRO
; Placeholder until we can figure out what it all means
- ds $18
+\1Index:: ds 1
+\1Anim01:: ds 1
+\1Anim02:: ds 1
+\1Anim03:: ds 1
+\1Anim04:: ds 1
+\1Anim05:: ds 1
+\1Anim06:: ds 1
+\1Anim07:: ds 1
+\1Anim08:: ds 1
+\1Anim09:: ds 1
+\1Anim0a:: ds 1
+\1Anim0b:: ds 1
+\1Anim0c:: ds 1
+\1Anim0d:: ds 1
+\1Anim0e:: ds 1
+\1Anim0f:: ds 1
+\1Anim10:: ds 1
+\1Anim11:: ds 1
+\1Anim12:: ds 1
+\1Anim13:: ds 1
+\1Anim14:: ds 1
+\1Anim15:: ds 1
+\1Anim16:: ds 1
+\1Anim17:: ds 1
endm
ActiveAnimObjects:: ; d30a
@@ -3295,7 +3320,7 @@
ActiveBGEffects:: ; d3fa
ds 4 * 5
-w5_d40e:: ds 1
+wNumActiveBattleAnims:: ds 1
BattleAnimFlags:: ; d40f
ds 1