More labels related to battle anims

This commit is contained in:
PikalaxALT 2015-12-23 22:51:50 -05:00
parent d7a5ea998d
commit c4e3e980b1
8 changed files with 1724 additions and 1712 deletions

View File

@ -620,27 +620,27 @@ BattleAnimCmd_JumpAnd: ; cc3fa (33:43fa)
ret
BattleAnimCmd_Obj: ; cc41f (33:441f)
; index, ???, ???, ???
; index, x, y, param
call GetBattleAnimByte
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
call GetBattleAnimByte
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
call GetBattleAnimByte
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
call GetBattleAnimByte
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTemp3], a
call QueueBattleAnimation
ret
BattleAnimCmd_BGEffect: ; cc43b (33:443b)
call GetBattleAnimByte
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
call GetBattleAnimByte
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
call GetBattleAnimByte
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
call GetBattleAnimByte
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTemp3], a
call _QueueBGEffect
ret
@ -689,14 +689,14 @@ BattleAnimCmd_5GFX: ; cc485 (33:4485)
ld c, a
ld hl, wBattleAnimTileDict
xor a
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
.loop
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
cp (VTiles1 - VTiles0) / $10 - $31
ret nc
call GetBattleAnimByte
ld [hli], a
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
ld [hli], a
push bc
push hl
@ -709,9 +709,9 @@ endr
add hl, de
ld a, [BattleAnimByte]
call LoadBattleAnimObj
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
add c
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
pop hl
pop bc
dec c
@ -818,12 +818,12 @@ BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
ld hl, VTiles0 tile $73
ld de, VTiles2 tile $06
ld a, $70
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, $7
call .LoadFootprint
ld de, VTiles2 tile $31
ld a, $60
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, $6
call .LoadFootprint
ret
@ -835,7 +835,7 @@ BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
lb bc, BANK(BattleAnimCmd_EnemyFeetObj), 1
call Request2bpp
pop de
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
ld l, a
ld h, 0
add hl, de
@ -873,12 +873,12 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
ld hl, VTiles0 tile $66
ld de, VTiles2 tile $05
ld a, $70
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, $7
call .LoadHead
ld de, VTiles2 tile $31
ld a, $60
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, $6
call .LoadHead
ret
@ -890,7 +890,7 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
lb bc, BANK(BattleAnimCmd_EnemyFeetObj), 2
call Request2bpp
pop de
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
ld l, a
ld h, 0
add hl, de

View File

@ -31,7 +31,7 @@ DeinitBattleAnimation: ; cc9bd
; cc9c4
InitBattleAnimation: ; cc9c4 (33:49c4)
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
ld e, a
ld d, 0
ld hl, BattleAnimObjects
@ -43,7 +43,7 @@ endr
ld hl, BATTLEANIMSTRUCT_INDEX
add hl, bc
ld a, [wNumActiveBattleAnims]
ld [hli], a ; 00
ld [hli], a ; Index
ld a, [de]
inc de
ld [hli], a ; 01
@ -52,24 +52,24 @@ endr
ld [hli], a ; 02
ld a, [de]
inc de
ld [hli], a ; 03
ld [hli], a ; Frameset ID
ld a, [de]
inc de
ld [hli], a ; 04
ld [hli], a ; Function
ld a, [de]
inc de
ld [hli], a ; 05
ld a, [de]
call GetBattleAnimTileOffset
ld [hli], a ; 06
ld a, [BattleAnimTemps + 1]
ld [hli], a ; 07
ld a, [BattleAnimTemps + 2]
ld [hli], a ; 08
ld [hli], a ; Tile ID
ld a, [wBattleAnimTemp1]
ld [hli], a ; X Coord
ld a, [wBattleAnimTemp2]
ld [hli], a ; Y Coord
xor a
ld [hli], a ; 09
ld [hli], a ; 0a
ld a, [BattleAnimTemps + 3]
ld [hli], a ; X Offset
ld [hli], a ; Y Offset
ld a, [wBattleAnimTemp3]
ld [hli], a ; 0b
xor a
ld [hli], a ; 0c
@ -82,24 +82,24 @@ endr
ret
BattleAnimOAMUpdate: ; cca09
call Functionccaaa
call InitBattleAnimBuffer
call GetBattleAnimFrame
cp -3
jp z, .exit_no_carry
cp -4
jp z, .delete_exit
push af
ld hl, BattleAnimTemps
ld a, [BattleAnimTemps + 7]
ld hl, wBattleAnimTempOAMFlags
ld a, [wBattleAnimTemp7]
xor [hl]
and $e0
ld [hl], a
pop af
push bc
call GetBattleAnimOAMPointer
ld a, [BattleAnimTemps + 2]
ld a, [wBattleAnimTempTileID]
add [hl]
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTempTileID], a
inc hl
ld a, [hli]
ld c, a
@ -110,14 +110,14 @@ BattleAnimOAMUpdate: ; cca09
ld e, a
ld d, Sprites / $100
.loop
ld a, [BattleAnimTemps + 4]
ld a, [wBattleAnimTempYCoord]
ld b, a
ld a, [BattleAnimTemps + 6]
ld a, [wBattleAnimTempYOffset]
add b
ld b, a
push hl
ld a, [hl]
ld hl, BattleAnimTemps
ld hl, wBattleAnimTempOAMFlags
bit 6, [hl]
jr z, .no_yflip
add $8
@ -130,14 +130,14 @@ BattleAnimOAMUpdate: ; cca09
ld [de], a
inc hl
inc de
ld a, [BattleAnimTemps + 3]
ld a, [wBattleAnimTempXCoord]
ld b, a
ld a, [BattleAnimTemps + 5]
ld a, [wBattleAnimTempXOffset]
add b
ld b, a
push hl
ld a, [hl]
ld hl, BattleAnimTemps
ld hl, wBattleAnimTempOAMFlags
bit 5, [hl]
jr z, .no_xflip
add $8
@ -150,13 +150,13 @@ BattleAnimOAMUpdate: ; cca09
ld [de], a
inc hl
inc de
ld a, [BattleAnimTemps + 2]
ld a, [wBattleAnimTempTileID]
add $31
add [hl]
ld [de], a
inc hl
inc de
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTempOAMFlags]
ld b, a
ld a, [hl]
xor b
@ -166,7 +166,7 @@ BattleAnimOAMUpdate: ; cca09
and $10
or b
ld b, a
ld a, [BattleAnimTemps + 8]
ld a, [wBattleAnimTempPalette]
and $f
or b
ld [de], a
@ -195,56 +195,56 @@ BattleAnimOAMUpdate: ; cca09
; ccaaa
Functionccaaa: ; ccaaa
InitBattleAnimBuffer: ; ccaaa
ld hl, BATTLEANIMSTRUCT_01
add hl, bc
ld a, [hl]
and $80
ld [BattleAnimTemps], a
and %10000000
ld [wBattleAnimTempOAMFlags], a
xor a
ld [BattleAnimTemps + 7], a
ld hl, BATTLEANIMSTRUCT_05
ld [wBattleAnimTemp7], a
ld hl, BATTLEANIMSTRUCT_PALETTE
add hl, bc
ld a, [hl]
ld [BattleAnimTemps + 8], a
ld [wBattleAnimTempPalette], a
ld hl, BATTLEANIMSTRUCT_02
add hl, bc
ld a, [hl]
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld hl, BATTLEANIMSTRUCT_TILEID
add hl, bc
ld a, [hli]
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTempTileID], a
ld a, [hli]
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTempXCoord], a
ld a, [hli]
ld [BattleAnimTemps + 4], a
ld [wBattleAnimTempYCoord], a
ld a, [hli]
ld [BattleAnimTemps + 5], a
ld [wBattleAnimTempXOffset], a
ld a, [hli]
ld [BattleAnimTemps + 6], a
ld [wBattleAnimTempYOffset], a
ld a, [hBattleTurn]
and a
ret z
ld hl, BATTLEANIMSTRUCT_01
add hl, bc
ld a, [hl]
ld [BattleAnimTemps], a
ld [wBattleAnimTempOAMFlags], a
bit 0, [hl]
ret z
ld hl, BATTLEANIMSTRUCT_07
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
ld a, [hli]
ld d, a
ld a, $b4
ld a, (-10 * 8) + 4
sub d
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTempXCoord], a
ld a, [hli]
ld d, a
ld a, [BattleAnimTemps + 1]
ld a, [wBattleAnimTemp1]
cp $ff
jr nz, .check_kinesis_softboiled_milkdrink
ld a, $28
ld a, 5 * 8
add d
jr .done
@ -265,17 +265,17 @@ Functionccaaa: ; ccaaa
.softboiled
.milk_drink
pop af
sub $8
sub 1 * 8
jr .done
.no_sub
pop af
.done
ld [BattleAnimTemps + 4], a
ld [wBattleAnimTempYCoord], a
ld a, [hli]
xor $ff
inc a
ld [BattleAnimTemps + 5], a
ld [wBattleAnimTempXOffset], a
ret
; ccb31
@ -317,197 +317,198 @@ _QueueBGEffect: ; ccb4f (33:4b4f)
BattleAnimObjects: ; ccb56
battleanimobj: MACRO
; ??, ??, frameset, function, ??, tile offset
db \1, \2, \3, \4, \5, \6
endm
battleanimobj $01, $ff, $00, $00, $02, $01 ; 00
battleanimobj $01, $ff, $01, $00, $02, $01 ; 01
battleanimobj $01, $ff, $02, $00, $02, $01 ; 02
battleanimobj $01, $90, $00, $00, $02, $01 ; 03
battleanimobj $01, $90, $01, $00, $02, $01 ; 04
battleanimobj $01, $90, $02, $00, $02, $01 ; 05
battleanimobj $01, $ff, $03, $00, $02, $01 ; 06
battleanimobj $01, $ff, $04, $1b, $02, $01 ; 07
battleanimobj $01, $ff, $05, $00, $02, $01 ; 08
battleanimobj $01, $ff, $06, $00, $02, $01 ; 09
battleanimobj $01, $90, $07, $09, $02, $01 ; 0a
battleanimobj $01, $aa, $10, $10, $04, $03 ; 0b
battleanimobj $01, $90, $0e, $04, $04, $03 ; 0c
battleanimobj $01, $90, $0f, $03, $04, $03 ; 0d
battleanimobj $01, $90, $10, $08, $04, $03 ; 0e
battleanimobj $01, $90, $0f, $0a, $04, $03 ; 0f
battleanimobj $01, $90, $11, $03, $04, $03 ; 10
battleanimobj $01, $90, $12, $08, $06, $0a ; 11
battleanimobj $01, $90, $13, $00, $06, $0a ; 12
battleanimobj $01, $90, $14, $01, $06, $0a ; 13
battleanimobj $21, $78, $16, $0b, $05, $06 ; 14
battleanimobj $00, $00, $09, $12, $04, $0b ; 15
battleanimobj $00, $00, $09, $13, $04, $0b ; 16
battleanimobj $01, $90, $18, $00, $04, $08 ; 17
battleanimobj $01, $ff, $18, $00, $04, $08 ; 18
battleanimobj $01, $90, $1d, $06, $02, $0c ; 19
battleanimobj $01, $b4, $1f, $38, $02, $0c ; 1a
battleanimobj $01, $90, $08, $00, $02, $07 ; 1b
battleanimobj $01, $a0, $08, $00, $02, $07 ; 1c
battleanimobj $01, $ff, $19, $07, $07, $09 ; 1d
battleanimobj $01, $ff, $1a, $07, $07, $09 ; 1e
battleanimobj $01, $b0, $1b, $36, $07, $09 ; 1f
battleanimobj $01, $b0, $84, $36, $06, $21 ; 20
battleanimobj $01, $90, $21, $0c, $06, $0d ; 21
battleanimobj $00, $00, $23, $0d, $06, $0d ; 22
battleanimobj $01, $90, $24, $0e, $02, $0e ; 23
battleanimobj $61, $80, $27, $0f, $06, $04 ; 24
battleanimobj $01, $b4, $2a, $00, $06, $04 ; 25
battleanimobj $01, $40, $2b, $11, $05, $0f ; 26
battleanimobj $61, $98, $2c, $00, $03, $10 ; 27
battleanimobj $61, $98, $2d, $09, $03, $10 ; 28
battleanimobj $01, $b8, $2e, $00, $06, $0a ; 29
battleanimobj $01, $b8, $2f, $00, $06, $0a ; 2a
battleanimobj $01, $b8, $30, $14, $07, $11 ; 2b
battleanimobj $01, $90, $21, $14, $03, $0d ; 2c
battleanimobj $21, $b0, $31, $00, $03, $05 ; 2d
battleanimobj $21, $b0, $32, $00, $03, $05 ; 2e
battleanimobj $21, $b0, $33, $00, $03, $05 ; 2f
battleanimobj $21, $90, $34, $15, $03, $05 ; 30
battleanimobj $21, $90, $36, $00, $03, $05 ; 31
battleanimobj $21, $90, $37, $03, $02, $08 ; 32
battleanimobj $21, $90, $38, $00, $03, $05 ; 33
battleanimobj $21, $90, $39, $03, $02, $08 ; 34
battleanimobj $21, $90, $3a, $16, $02, $02 ; 35
battleanimobj $01, $90, $3c, $17, $02, $02 ; 36
battleanimobj $21, $ff, $3e, $00, $02, $02 ; 37
battleanimobj $21, $ff, $3f, $00, $02, $02 ; 38
battleanimobj $21, $ff, $40, $00, $02, $02 ; 39
battleanimobj $21, $ff, $41, $00, $02, $02 ; 3a
battleanimobj $21, $ff, $42, $00, $02, $02 ; 3b
battleanimobj $01, $88, $43, $18, $05, $12 ; 3c
battleanimobj $01, $88, $44, $00, $05, $12 ; 3d
battleanimobj $21, $b8, $45, $19, $02, $13 ; 3e
battleanimobj $21, $ff, $46, $00, $02, $14 ; 3f
battleanimobj $21, $ff, $47, $00, $02, $14 ; 40
battleanimobj $21, $ff, $48, $1a, $02, $14 ; 41
battleanimobj $21, $ff, $49, $1a, $02, $14 ; 42
battleanimobj $21, $98, $4a, $01, $02, $14 ; 43
battleanimobj $21, $80, $4b, $00, $03, $11 ; 44
battleanimobj $01, $88, $4c, $1c, $05, $12 ; 45
battleanimobj $21, $b0, $4d, $1d, $02, $15 ; 46
battleanimobj $01, $b0, $51, $1e, $03, $11 ; 47
battleanimobj $21, $ff, $52, $1f, $05, $16 ; 48
battleanimobj $21, $ff, $54, $1f, $05, $16 ; 49
battleanimobj $21, $68, $56, $20, $05, $06 ; 4a
battleanimobj $21, $90, $59, $21, $02, $0e ; 4b
battleanimobj $21, $90, $5c, $02, $02, $17 ; 4c
battleanimobj $01, $90, $5d, $22, $03, $11 ; 4d
battleanimobj $61, $88, $5f, $00, $03, $10 ; 4e
battleanimobj $61, $88, $2d, $09, $03, $10 ; 4f
battleanimobj $21, $88, $60, $00, $03, $18 ; 50
battleanimobj $21, $80, $60, $00, $02, $18 ; 51
battleanimobj $21, $50, $61, $23, $03, $19 ; 52
battleanimobj $01, $80, $63, $24, $02, $19 ; 53
battleanimobj $01, $80, $66, $25, $02, $19 ; 54
battleanimobj $01, $50, $1c, $00, $02, $0c ; 55
battleanimobj $21, $a8, $67, $26, $07, $1a ; 56
battleanimobj $21, $a8, $68, $00, $07, $1a ; 57
battleanimobj $21, $90, $69, $01, $02, $1a ; 58
battleanimobj $21, $90, $6d, $28, $03, $19 ; 59
battleanimobj $21, $90, $6a, $27, $02, $1b ; 5a
battleanimobj $00, $00, $6f, $29, $02, $1c ; 5b
battleanimobj $21, $48, $70, $29, $02, $1c ; 5c
battleanimobj $21, $48, $6f, $29, $02, $1c ; 5d
battleanimobj $21, $78, $6f, $2a, $02, $1c ; 5e
battleanimobj $61, $90, $71, $2b, $02, $1d ; 5f
battleanimobj $61, $90, $72, $2c, $02, $1d ; 60
battleanimobj $01, $48, $73, $2d, $04, $1e ; 61
battleanimobj $01, $90, $74, $06, $02, $15 ; 62
battleanimobj $01, $ff, $75, $2e, $07, $19 ; 63
battleanimobj $21, $90, $4a, $02, $02, $14 ; 64
battleanimobj $01, $80, $30, $2f, $02, $11 ; 65
battleanimobj $01, $78, $76, $2a, $04, $23 ; 66
battleanimobj $01, $80, $77, $30, $02, $1f ; 67
battleanimobj $01, $90, $77, $02, $02, $1f ; 68
battleanimobj $01, $ff, $77, $00, $02, $1f ; 69
battleanimobj $01, $80, $78, $08, $03, $23 ; 6a
battleanimobj $21, $90, $79, $00, $02, $1f ; 6b
battleanimobj $01, $ff, $7a, $31, $03, $11 ; 6c
battleanimobj $01, $88, $7a, $31, $03, $11 ; 6d
battleanimobj $21, $88, $7b, $32, $02, $20 ; 6e
battleanimobj $21, $98, $7c, $00, $02, $04 ; 6f
battleanimobj $21, $80, $7d, $00, $02, $18 ; 70
battleanimobj $01, $80, $21, $2f, $06, $0d ; 71
battleanimobj $01, $b0, $7e, $33, $03, $12 ; 72
battleanimobj $01, $80, $7f, $2f, $02, $08 ; 73
battleanimobj $21, $a0, $6f, $34, $02, $1c ; 74
battleanimobj $21, $a0, $74, $35, $02, $15 ; 75
battleanimobj $21, $b0, $80, $33, $02, $14 ; 76
battleanimobj $01, $88, $81, $37, $02, $11 ; 77
battleanimobj $01, $88, $85, $00, $02, $22 ; 78
battleanimobj $01, $88, $86, $00, $02, $22 ; 79
battleanimobj $01, $90, $87, $39, $02, $1f ; 7a
battleanimobj $01, $80, $30, $3a, $03, $11 ; 7b
battleanimobj $21, $90, $34, $00, $03, $05 ; 7c
battleanimobj $a1, $88, $88, $3b, $06, $13 ; 7d
battleanimobj $01, $80, $76, $25, $04, $23 ; 7e
battleanimobj $01, $98, $10, $34, $04, $03 ; 7f
battleanimobj $01, $a8, $0f, $3c, $04, $03 ; 80
battleanimobj $21, $68, $89, $29, $02, $1f ; 81
battleanimobj $21, $b0, $8a, $00, $02, $1f ; 82
battleanimobj $21, $80, $8c, $00, $02, $1f ; 83
battleanimobj $21, $50, $8d, $00, $03, $1f ; 84
battleanimobj $01, $40, $24, $40, $02, $0e ; 85
battleanimobj $21, $a8, $8e, $41, $04, $1f ; 86
battleanimobj $21, $88, $8f, $3e, $02, $1f ; 87
battleanimobj $21, $88, $93, $3e, $02, $1f ; 88
battleanimobj $21, $90, $97, $3d, $02, $1f ; 89
battleanimobj $21, $90, $78, $3d, $03, $23 ; 8a
battleanimobj $01, $ff, $99, $2e, $02, $19 ; 8b
battleanimobj $21, $a0, $74, $02, $02, $15 ; 8c
battleanimobj $21, $a0, $99, $35, $04, $19 ; 8d
battleanimobj $21, $70, $8b, $3f, $02, $1f ; 8e
battleanimobj $01, $90, $15, $08, $02, $0a ; 8f
battleanimobj $01, $90, $11, $02, $04, $03 ; 90
battleanimobj $01, $80, $7f, $42, $02, $08 ; 91
battleanimobj $01, $90, $9a, $00, $02, $1b ; 92
battleanimobj $21, $a0, $9b, $35, $04, $23 ; 93
battleanimobj $21, $80, $9c, $23, $02, $25 ; 94
battleanimobj $21, $80, $9d, $25, $02, $25 ; 95
battleanimobj $21, $80, $9c, $00, $02, $25 ; 96
battleanimobj $21, $80, $9e, $00, $06, $25 ; 97
battleanimobj $61, $80, $9f, $3a, $05, $23 ; 98
battleanimobj $21, $80, $a0, $16, $02, $23 ; 99
battleanimobj $21, $70, $78, $43, $03, $23 ; 9a
battleanimobj $21, $c0, $a2, $01, $02, $25 ; 9b
battleanimobj $21, $40, $a3, $44, $03, $24 ; 9c
battleanimobj $01, $80, $a4, $00, $02, $24 ; 9d
battleanimobj $01, $80, $a5, $00, $03, $24 ; 9e
battleanimobj $01, $88, $43, $45, $04, $12 ; 9f
battleanimobj $21, $ff, $a6, $00, $02, $02 ; a0
battleanimobj $21, $ff, $a7, $00, $02, $02 ; a1
battleanimobj $21, $00, $b4, $4a, $07, $0f ; a2
battleanimobj $21, $90, $a8, $02, $03, $05 ; a3
battleanimobj $21, $40, $9c, $11, $02, $25 ; a4
battleanimobj $61, $90, $a9, $46, $02, $23 ; a5
battleanimobj $00, $00, $24, $47, $02, $0e ; a6
battleanimobj $01, $80, $aa, $00, $02, $24 ; a7
battleanimobj $21, $b8, $ab, $48, $02, $13 ; a8
battleanimobj $21, $90, $ac, $44, $02, $13 ; a9
battleanimobj $01, $a8, $05, $00, $02, $01 ; aa
battleanimobj $01, $90, $24, $43, $02, $0e ; ab
battleanimobj $01, $88, $ad, $00, $06, $17 ; ac
battleanimobj $01, $a8, $ae, $49, $02, $01 ; ad
battleanimobj $21, $90, $af, $01, $03, $11 ; ae
battleanimobj $21, $00, $b0, $4a, $02, $04 ; af
battleanimobj $00, $00, $70, $4b, $04, $1c ; b0
battleanimobj $01, $88, $b1, $4c, $02, $19 ; b1
battleanimobj $01, $b8, $19, $4d, $07, $09 ; b2
battleanimobj $61, $98, $b3, $00, $03, $27 ; b3
battleanimobj $61, $98, $74, $04, $06, $15 ; b4
battleanimobj $21, $ff, $19, $4e, $07, $09 ; b5
battleanimobj $01, $90, $73, $08, $04, $1e ; b6
battleanimobj $01, $ff, $89, $4f, $04, $1f ; b7
battleanimobj $00, $00, $b5, $00, $00, $28 ; b8
battleanimobj $00, $00, $b6, $00, $01, $29 ; b9
battleanimobj $00, $00, $b7, $00, $00, $28 ; ba
battleanimobj $00, $00, $b8, $00, $01, $29 ; bb
battleanimobj $01, $ff, $00, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_00
battleanimobj $01, $ff, $01, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_01
battleanimobj $01, $ff, $02, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_02
battleanimobj $01, $90, $00, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_03
battleanimobj $01, $90, $01, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_04
battleanimobj $01, $90, $02, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_05
battleanimobj $01, $ff, $03, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_06
battleanimobj $01, $ff, $04, BATTLEANIMFUNC_1B, $02, $01 ; ANIM_OBJ_07
battleanimobj $01, $ff, $05, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_08
battleanimobj $01, $ff, $06, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_09
battleanimobj $01, $90, $07, BATTLEANIMFUNC_09, $02, $01 ; ANIM_OBJ_0A
battleanimobj $01, $aa, $10, BATTLEANIMFUNC_10, $04, $03 ; ANIM_OBJ_0B
battleanimobj $01, $90, $0e, BATTLEANIMFUNC_04, $04, $03 ; ANIM_OBJ_0C
battleanimobj $01, $90, $0f, BATTLEANIMFUNC_03, $04, $03 ; ANIM_OBJ_0D
battleanimobj $01, $90, $10, BATTLEANIMFUNC_08, $04, $03 ; ANIM_OBJ_0E
battleanimobj $01, $90, $0f, BATTLEANIMFUNC_0A, $04, $03 ; ANIM_OBJ_0F
battleanimobj $01, $90, $11, BATTLEANIMFUNC_03, $04, $03 ; ANIM_OBJ_BURNED
battleanimobj $01, $90, $12, BATTLEANIMFUNC_08, $06, $0a ; ANIM_OBJ_11
battleanimobj $01, $90, $13, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_12
battleanimobj $01, $90, $14, BATTLEANIMFUNC_01, $06, $0a ; ANIM_OBJ_13
battleanimobj $21, $78, $16, BATTLEANIMFUNC_0B, $05, $06 ; ANIM_OBJ_14
battleanimobj $00, $00, $09, BATTLEANIMFUNC_12, $04, $0b ; ANIM_OBJ_POKE_BALL
battleanimobj $00, $00, $09, BATTLEANIMFUNC_13, $04, $0b ; ANIM_OBJ_16
battleanimobj $01, $90, $18, BATTLEANIMFUNC_00, $04, $08 ; ANIM_OBJ_17
battleanimobj $01, $ff, $18, BATTLEANIMFUNC_00, $04, $08 ; ANIM_OBJ_18
battleanimobj $01, $90, $1d, BATTLEANIMFUNC_06, $02, $0c ; ANIM_OBJ_19
battleanimobj $01, $b4, $1f, BATTLEANIMFUNC_38, $02, $0c ; ANIM_OBJ_1A
battleanimobj $01, $90, $08, BATTLEANIMFUNC_00, $02, $07 ; ANIM_OBJ_1B
battleanimobj $01, $a0, $08, BATTLEANIMFUNC_00, $02, $07 ; ANIM_OBJ_1C
battleanimobj $01, $ff, $19, BATTLEANIMFUNC_07, $07, $09 ; ANIM_OBJ_1D
battleanimobj $01, $ff, $1a, BATTLEANIMFUNC_07, $07, $09 ; ANIM_OBJ_1E
battleanimobj $01, $b0, $1b, BATTLEANIMFUNC_36, $07, $09 ; ANIM_OBJ_1F
battleanimobj $01, $b0, $84, BATTLEANIMFUNC_36, $06, $21 ; ANIM_OBJ_20
battleanimobj $01, $90, $21, BATTLEANIMFUNC_0C, $06, $0d ; ANIM_OBJ_21
battleanimobj $00, $00, $23, BATTLEANIMFUNC_0D, $06, $0d ; ANIM_OBJ_22
battleanimobj $01, $90, $24, BATTLEANIMFUNC_0E, $02, $0e ; ANIM_OBJ_23
battleanimobj $61, $80, $27, BATTLEANIMFUNC_0F, $06, $04 ; ANIM_OBJ_24
battleanimobj $01, $b4, $2a, BATTLEANIMFUNC_00, $06, $04 ; ANIM_OBJ_25
battleanimobj $01, $40, $2b, BATTLEANIMFUNC_11, $05, $0f ; ANIM_OBJ_26
battleanimobj $61, $98, $2c, BATTLEANIMFUNC_00, $03, $10 ; ANIM_OBJ_27
battleanimobj $61, $98, $2d, BATTLEANIMFUNC_09, $03, $10 ; ANIM_OBJ_28
battleanimobj $01, $b8, $2e, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_29
battleanimobj $01, $b8, $2f, BATTLEANIMFUNC_00, $06, $0a ; ANIM_OBJ_FROZEN
battleanimobj $01, $b8, $30, BATTLEANIMFUNC_14, $07, $11 ; ANIM_OBJ_2B
battleanimobj $01, $90, $21, BATTLEANIMFUNC_14, $03, $0d ; ANIM_OBJ_2C
battleanimobj $21, $b0, $31, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2D
battleanimobj $21, $b0, $32, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2E
battleanimobj $21, $b0, $33, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_2F
battleanimobj $21, $90, $34, BATTLEANIMFUNC_15, $03, $05 ; ANIM_OBJ_30
battleanimobj $21, $90, $36, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_31
battleanimobj $21, $90, $37, BATTLEANIMFUNC_03, $02, $08 ; ANIM_OBJ_32
battleanimobj $21, $90, $38, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_33
battleanimobj $21, $90, $39, BATTLEANIMFUNC_03, $02, $08 ; ANIM_OBJ_34
battleanimobj $21, $90, $3a, BATTLEANIMFUNC_16, $02, $02 ; ANIM_OBJ_35
battleanimobj $01, $90, $3c, BATTLEANIMFUNC_17, $02, $02 ; ANIM_OBJ_36
battleanimobj $21, $ff, $3e, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_37
battleanimobj $21, $ff, $3f, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_38
battleanimobj $21, $ff, $40, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_39
battleanimobj $21, $ff, $41, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_3A
battleanimobj $21, $ff, $42, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_3B
battleanimobj $01, $88, $43, BATTLEANIMFUNC_18, $05, $12 ; ANIM_OBJ_3C
battleanimobj $01, $88, $44, BATTLEANIMFUNC_00, $05, $12 ; ANIM_OBJ_3D
battleanimobj $21, $b8, $45, BATTLEANIMFUNC_19, $02, $13 ; ANIM_OBJ_GUST
battleanimobj $21, $ff, $46, BATTLEANIMFUNC_00, $02, $14 ; ANIM_OBJ_3F
battleanimobj $21, $ff, $47, BATTLEANIMFUNC_00, $02, $14 ; ANIM_OBJ_40
battleanimobj $21, $ff, $48, BATTLEANIMFUNC_1A, $02, $14 ; ANIM_OBJ_41
battleanimobj $21, $ff, $49, BATTLEANIMFUNC_1A, $02, $14 ; ANIM_OBJ_42
battleanimobj $21, $98, $4a, BATTLEANIMFUNC_01, $02, $14 ; ANIM_OBJ_43
battleanimobj $21, $80, $4b, BATTLEANIMFUNC_00, $03, $11 ; ANIM_OBJ_44
battleanimobj $01, $88, $4c, BATTLEANIMFUNC_1C, $05, $12 ; ANIM_OBJ_45
battleanimobj $21, $b0, $4d, BATTLEANIMFUNC_1D, $02, $15 ; ANIM_OBJ_46
battleanimobj $01, $b0, $51, BATTLEANIMFUNC_1E, $03, $11 ; ANIM_OBJ_47
battleanimobj $21, $ff, $52, BATTLEANIMFUNC_1F, $05, $16 ; ANIM_OBJ_48
battleanimobj $21, $ff, $54, BATTLEANIMFUNC_1F, $05, $16 ; ANIM_OBJ_49
battleanimobj $21, $68, $56, BATTLEANIMFUNC_20, $05, $06 ; ANIM_OBJ_4A
battleanimobj $21, $90, $59, BATTLEANIMFUNC_21, $02, $0e ; ANIM_OBJ_4B
battleanimobj $21, $90, $5c, BATTLEANIMFUNC_02, $02, $17 ; ANIM_OBJ_4C
battleanimobj $01, $90, $5d, BATTLEANIMFUNC_22, $03, $11 ; ANIM_OBJ_4D
battleanimobj $61, $88, $5f, BATTLEANIMFUNC_00, $03, $10 ; ANIM_OBJ_4E
battleanimobj $61, $88, $2d, BATTLEANIMFUNC_09, $03, $10 ; ANIM_OBJ_4F
battleanimobj $21, $88, $60, BATTLEANIMFUNC_00, $03, $18 ; ANIM_OBJ_50
battleanimobj $21, $80, $60, BATTLEANIMFUNC_00, $02, $18 ; ANIM_OBJ_51
battleanimobj $21, $50, $61, BATTLEANIMFUNC_23, $03, $19 ; ANIM_OBJ_CHICK
battleanimobj $01, $80, $63, BATTLEANIMFUNC_24, $02, $19 ; ANIM_OBJ_53
battleanimobj $01, $80, $66, BATTLEANIMFUNC_25, $02, $19 ; ANIM_OBJ_54
battleanimobj $01, $50, $1c, BATTLEANIMFUNC_00, $02, $0c ; ANIM_OBJ_SKULL
battleanimobj $21, $a8, $67, BATTLEANIMFUNC_26, $07, $1a ; ANIM_OBJ_56
battleanimobj $21, $a8, $68, BATTLEANIMFUNC_00, $07, $1a ; ANIM_OBJ_57
battleanimobj $21, $90, $69, BATTLEANIMFUNC_01, $02, $1a ; ANIM_OBJ_58
battleanimobj $21, $90, $6d, BATTLEANIMFUNC_28, $03, $19 ; ANIM_OBJ_PARALYZED
battleanimobj $21, $90, $6a, BATTLEANIMFUNC_27, $02, $1b ; ANIM_OBJ_5A
battleanimobj $00, $00, $6f, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5B
battleanimobj $21, $48, $70, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5C
battleanimobj $21, $48, $6f, BATTLEANIMFUNC_29, $02, $1c ; ANIM_OBJ_5D
battleanimobj $21, $78, $6f, BATTLEANIMFUNC_2A, $02, $1c ; ANIM_OBJ_5E
battleanimobj $61, $90, $71, BATTLEANIMFUNC_2B, $02, $1d ; ANIM_OBJ_5F
battleanimobj $61, $90, $72, BATTLEANIMFUNC_2C, $02, $1d ; ANIM_OBJ_60
battleanimobj $01, $48, $73, BATTLEANIMFUNC_2D, $04, $1e ; ANIM_OBJ_61
battleanimobj $01, $90, $74, BATTLEANIMFUNC_06, $02, $15 ; ANIM_OBJ_62
battleanimobj $01, $ff, $75, BATTLEANIMFUNC_2E, $07, $19 ; ANIM_OBJ_63
battleanimobj $21, $90, $4a, BATTLEANIMFUNC_02, $02, $14 ; ANIM_OBJ_64
battleanimobj $01, $80, $30, BATTLEANIMFUNC_2F, $02, $11 ; ANIM_OBJ_65
battleanimobj $01, $78, $76, BATTLEANIMFUNC_2A, $04, $23 ; ANIM_OBJ_66
battleanimobj $01, $80, $77, BATTLEANIMFUNC_30, $02, $1f ; ANIM_OBJ_67
battleanimobj $01, $90, $77, BATTLEANIMFUNC_02, $02, $1f ; ANIM_OBJ_68
battleanimobj $01, $ff, $77, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_69
battleanimobj $01, $80, $78, BATTLEANIMFUNC_08, $03, $23 ; ANIM_OBJ_6A
battleanimobj $21, $90, $79, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_6B
battleanimobj $01, $ff, $7a, BATTLEANIMFUNC_31, $03, $11 ; ANIM_OBJ_6C
battleanimobj $01, $88, $7a, BATTLEANIMFUNC_31, $03, $11 ; ANIM_OBJ_6D
battleanimobj $21, $88, $7b, BATTLEANIMFUNC_32, $02, $20 ; ANIM_OBJ_6E
battleanimobj $21, $98, $7c, BATTLEANIMFUNC_00, $02, $04 ; ANIM_OBJ_6F
battleanimobj $21, $80, $7d, BATTLEANIMFUNC_00, $02, $18 ; ANIM_OBJ_70
battleanimobj $01, $80, $21, BATTLEANIMFUNC_2F, $06, $0d ; ANIM_OBJ_71
battleanimobj $01, $b0, $7e, BATTLEANIMFUNC_33, $03, $12 ; ANIM_OBJ_72
battleanimobj $01, $80, $7f, BATTLEANIMFUNC_2F, $02, $08 ; ANIM_OBJ_73
battleanimobj $21, $a0, $6f, BATTLEANIMFUNC_34, $02, $1c ; ANIM_OBJ_74
battleanimobj $21, $a0, $74, BATTLEANIMFUNC_35, $02, $15 ; ANIM_OBJ_75
battleanimobj $21, $b0, $80, BATTLEANIMFUNC_33, $02, $14 ; ANIM_OBJ_76
battleanimobj $01, $88, $81, BATTLEANIMFUNC_37, $02, $11 ; ANIM_OBJ_77
battleanimobj $01, $88, $85, BATTLEANIMFUNC_00, $02, $22 ; ANIM_OBJ_78
battleanimobj $01, $88, $86, BATTLEANIMFUNC_00, $02, $22 ; ANIM_OBJ_79
battleanimobj $01, $90, $87, BATTLEANIMFUNC_39, $02, $1f ; ANIM_OBJ_7A
battleanimobj $01, $80, $30, BATTLEANIMFUNC_3A, $03, $11 ; ANIM_OBJ_7B
battleanimobj $21, $90, $34, BATTLEANIMFUNC_00, $03, $05 ; ANIM_OBJ_7C
battleanimobj $a1, $88, $88, BATTLEANIMFUNC_3B, $06, $13 ; ANIM_OBJ_7D
battleanimobj $01, $80, $76, BATTLEANIMFUNC_25, $04, $23 ; ANIM_OBJ_HEART
battleanimobj $01, $98, $10, BATTLEANIMFUNC_34, $04, $03 ; ANIM_OBJ_7F
battleanimobj $01, $a8, $0f, BATTLEANIMFUNC_3C, $04, $03 ; ANIM_OBJ_80
battleanimobj $21, $68, $89, BATTLEANIMFUNC_29, $02, $1f ; ANIM_OBJ_81
battleanimobj $21, $b0, $8a, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_82
battleanimobj $21, $80, $8c, BATTLEANIMFUNC_00, $02, $1f ; ANIM_OBJ_83
battleanimobj $21, $50, $8d, BATTLEANIMFUNC_00, $03, $1f ; ANIM_OBJ_84
battleanimobj $01, $40, $24, BATTLEANIMFUNC_40, $02, $0e ; ANIM_OBJ_85
battleanimobj $21, $a8, $8e, BATTLEANIMFUNC_41, $04, $1f ; ANIM_OBJ_86
battleanimobj $21, $88, $8f, BATTLEANIMFUNC_3E, $02, $1f ; ANIM_OBJ_87
battleanimobj $21, $88, $93, BATTLEANIMFUNC_3E, $02, $1f ; ANIM_OBJ_88
battleanimobj $21, $90, $97, BATTLEANIMFUNC_3D, $02, $1f ; ANIM_OBJ_89
battleanimobj $21, $90, $78, BATTLEANIMFUNC_3D, $03, $23 ; ANIM_OBJ_8A
battleanimobj $01, $ff, $99, BATTLEANIMFUNC_2E, $02, $19 ; ANIM_OBJ_8B
battleanimobj $21, $a0, $74, BATTLEANIMFUNC_02, $02, $15 ; ANIM_OBJ_8C
battleanimobj $21, $a0, $99, BATTLEANIMFUNC_35, $04, $19 ; ANIM_OBJ_8D
battleanimobj $21, $70, $8b, BATTLEANIMFUNC_3F, $02, $1f ; ANIM_OBJ_8E
battleanimobj $01, $90, $15, BATTLEANIMFUNC_08, $02, $0a ; ANIM_OBJ_8F
battleanimobj $01, $90, $11, BATTLEANIMFUNC_02, $04, $03 ; ANIM_OBJ_90
battleanimobj $01, $80, $7f, BATTLEANIMFUNC_42, $02, $08 ; ANIM_OBJ_91
battleanimobj $01, $90, $9a, BATTLEANIMFUNC_00, $02, $1b ; ANIM_OBJ_92
battleanimobj $21, $a0, $9b, BATTLEANIMFUNC_35, $04, $23 ; ANIM_OBJ_93
battleanimobj $21, $80, $9c, BATTLEANIMFUNC_23, $02, $25 ; ANIM_OBJ_94
battleanimobj $21, $80, $9d, BATTLEANIMFUNC_25, $02, $25 ; ANIM_OBJ_95
battleanimobj $21, $80, $9c, BATTLEANIMFUNC_00, $02, $25 ; ANIM_OBJ_96
battleanimobj $21, $80, $9e, BATTLEANIMFUNC_00, $06, $25 ; ANIM_OBJ_97
battleanimobj $61, $80, $9f, BATTLEANIMFUNC_3A, $05, $23 ; ANIM_OBJ_98
battleanimobj $21, $80, $a0, BATTLEANIMFUNC_16, $02, $23 ; ANIM_OBJ_99
battleanimobj $21, $70, $78, BATTLEANIMFUNC_43, $03, $23 ; ANIM_OBJ_9A
battleanimobj $21, $c0, $a2, BATTLEANIMFUNC_01, $02, $25 ; ANIM_OBJ_9B
battleanimobj $21, $40, $a3, BATTLEANIMFUNC_44, $03, $24 ; ANIM_OBJ_9C
battleanimobj $01, $80, $a4, BATTLEANIMFUNC_00, $02, $24 ; ANIM_OBJ_9D
battleanimobj $01, $80, $a5, BATTLEANIMFUNC_00, $03, $24 ; ANIM_OBJ_9E
battleanimobj $01, $88, $43, BATTLEANIMFUNC_45, $04, $12 ; ANIM_OBJ_9F
battleanimobj $21, $ff, $a6, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_A0
battleanimobj $21, $ff, $a7, BATTLEANIMFUNC_00, $02, $02 ; ANIM_OBJ_A1
battleanimobj $21, $00, $b4, BATTLEANIMFUNC_4A, $07, $0f ; ANIM_OBJ_A2
battleanimobj $21, $90, $a8, BATTLEANIMFUNC_02, $03, $05 ; ANIM_OBJ_A3
battleanimobj $21, $40, $9c, BATTLEANIMFUNC_11, $02, $25 ; ANIM_OBJ_A4
battleanimobj $61, $90, $a9, BATTLEANIMFUNC_46, $02, $23 ; ANIM_OBJ_A5
battleanimobj $00, $00, $24, BATTLEANIMFUNC_47, $02, $0e ; ANIM_OBJ_A6
battleanimobj $01, $80, $aa, BATTLEANIMFUNC_00, $02, $24 ; ANIM_OBJ_A7
battleanimobj $21, $b8, $ab, BATTLEANIMFUNC_48, $02, $13 ; ANIM_OBJ_A8
battleanimobj $21, $90, $ac, BATTLEANIMFUNC_44, $02, $13 ; ANIM_OBJ_A9
battleanimobj $01, $a8, $05, BATTLEANIMFUNC_00, $02, $01 ; ANIM_OBJ_AA
battleanimobj $01, $90, $24, BATTLEANIMFUNC_43, $02, $0e ; ANIM_OBJ_AB
battleanimobj $01, $88, $ad, BATTLEANIMFUNC_00, $06, $17 ; ANIM_OBJ_AC
battleanimobj $01, $a8, $ae, BATTLEANIMFUNC_49, $02, $01 ; ANIM_OBJ_AD
battleanimobj $21, $90, $af, BATTLEANIMFUNC_01, $03, $11 ; ANIM_OBJ_AE
battleanimobj $21, $00, $b0, BATTLEANIMFUNC_4A, $02, $04 ; ANIM_OBJ_AF
battleanimobj $00, $00, $70, BATTLEANIMFUNC_4B, $04, $1c ; ANIM_OBJ_B0
battleanimobj $01, $88, $b1, BATTLEANIMFUNC_4C, $02, $19 ; ANIM_OBJ_B1
battleanimobj $01, $b8, $19, BATTLEANIMFUNC_4D, $07, $09 ; ANIM_OBJ_B2
battleanimobj $61, $98, $b3, BATTLEANIMFUNC_00, $03, $27 ; ANIM_OBJ_B3
battleanimobj $61, $98, $74, BATTLEANIMFUNC_04, $06, $15 ; ANIM_OBJ_B4
battleanimobj $21, $ff, $19, BATTLEANIMFUNC_4E, $07, $09 ; ANIM_OBJ_B5
battleanimobj $01, $90, $73, BATTLEANIMFUNC_08, $04, $1e ; ANIM_OBJ_FLOWER
battleanimobj $01, $ff, $89, BATTLEANIMFUNC_4F, $04, $1f ; ANIM_OBJ_COTTON
battleanimobj $00, $00, $b5, BATTLEANIMFUNC_00, $00, $28 ; ANIM_OBJ_B8
battleanimobj $00, $00, $b6, BATTLEANIMFUNC_00, $01, $29 ; ANIM_OBJ_B9
battleanimobj $00, $00, $b7, BATTLEANIMFUNC_00, $00, $28 ; ANIM_OBJ_BA
battleanimobj $00, $00, $b8, BATTLEANIMFUNC_00, $01, $29 ; ANIM_OBJ_BB
; ccfbe
INCLUDE "battle/objects/functions.asm"
@ -560,7 +561,7 @@ GetBattleAnimFrame: ; ce7d1
ld a, [hl]
and $c0
srl a
ld [BattleAnimTemps + 7], a
ld [wBattleAnimTemp7], a
pop af
ret

File diff suppressed because it is too large Load Diff

View File

@ -40,13 +40,13 @@ QueueBGEffect: ; c801a (32:401a)
ld b, h
ld hl, BG_EFFECT_STRUCT_FUNCTION
add hl, bc
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
ld [hli], a
ld a, [BattleAnimTemps + 1]
ld a, [wBattleAnimTemp1]
ld [hli], a
ld a, [BattleAnimTemps + 2]
ld a, [wBattleAnimTemp2]
ld [hli], a
ld a, [BattleAnimTemps + 3]
ld a, [wBattleAnimTemp3]
ld [hl], a
ret
@ -187,7 +187,7 @@ BattleBGEffect_FlashWhite: ; c80f3 (32:40f3)
BattleBGEffect_FlashContinue: ; c80fb (32:40fb)
; current timer, flash duration, number of flashes
ld a, $1
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld a, [hl]
@ -385,9 +385,9 @@ BattleBGEffect_ShowMon: ; c81ea (32:41ea)
ld de, Unknown_c820c
.got_dims
ld a, e
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld a, d
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
call Functionc83ed
ret
@ -428,20 +428,20 @@ Functionc8223: ; c8223 (32:4223)
call Functionc9038
jr nz, .asm_c8242
ld a, $b8
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, $84
jr .asm_c8249
.asm_c8242
ld a, $b9
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, $30
.asm_c8249
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld a, $40
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
xor a
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTemp3], a
call _QueueBattleAnimation
pop bc
ret
@ -496,20 +496,20 @@ Functionc8290: ; c8290 (32:4290)
call Functionc9038
jr nz, .asm_c82af
ld a, $ba
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, $84
jr .asm_c82b6
.asm_c82af
ld a, $bb
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, $30
.asm_c82b6
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld a, $40
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
xor a
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTemp3], a
call _QueueBattleAnimation
pop bc
ret
@ -654,9 +654,9 @@ BattleBGEffect_EnterMon: ; c837b (32:437b)
ld de, Unknown_c8394
.asm_c8388
ld a, e
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld a, d
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
call Functionc83ed
ret
@ -686,9 +686,9 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
ld de, Unknown_c83c1
.asm_c83b5
ld a, e
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld a, d
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
call Functionc83ed
ret
@ -732,9 +732,9 @@ Functionc83fa: ; c83fa (32:43fa)
ld e, [hl]
ld d, $0
inc [hl]
ld a, [BattleAnimTemps + 1]
ld a, [wBattleAnimTemp1]
ld l, a
ld a, [BattleAnimTemps + 2]
ld a, [wBattleAnimTemp2]
ld h, a
rept 3
add hl, de
@ -818,7 +818,7 @@ endr
pop hl
inc hl
ld a, [hli]
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
push de
ld e, [hl]
ld d, 0
@ -833,7 +833,7 @@ endr
.asm_c8484
push bc
push hl
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
ld b, a
.asm_c848a
ld a, [de]
@ -919,59 +919,59 @@ Unknown_c853c: ; c853c
BattleBGEffect_Surf: ; c8545 (32:4545)
call BattleBGEffects_AnonJumptable
.anon_jumptable
dw Functionc854e
dw Functionc8557
dw Functionc8561
dw .zero
dw .one
dw .two
Functionc854e: ; c854e (32:454e)
.zero: ; c854e (32:454e)
call BattleBGEffects_IncrementJumptable
ld de, $202
call Functionc8f69
lb de, 2, 2
call InitSurfWaves
Functionc8557: ; c8557 (32:4557)
.one: ; c8557 (32:4557)
ld a, [hLCDStatCustom]
and a
ret z
push bc
call Functionc8565
call .RotatewSurfWaveBGEffect
pop bc
ret
Functionc8561: ; c8561 (32:4561)
call Functionc8f0a
.two: ; c8561 (32:4561)
call BattleAnim_ResetLCDStatCustom
ret
Functionc8565: ; c8565 (32:4565)
ld hl, w5_d422
ld de, w5_d422 + 1
ld c, $3f
.RotatewSurfWaveBGEffect: ; c8565 (32:4565)
ld hl, wSurfWaveBGEffect
ld de, wSurfWaveBGEffect + 1
ld c, wSurfWaveBGEffectEnd - wSurfWaveBGEffect - 1
ld a, [hl]
push af
.asm_c856f
.loop
ld a, [de]
inc de
ld [hli], a
dec c
jr nz, .asm_c856f
jr nz, .loop
pop af
ld [hl], a
ld de, LYOverridesBackup
ld hl, w5_d422
ld hl, wSurfWaveBGEffect
ld bc, $0
.asm_c8580
.loop2
ld a, [hLCDStatCustom + 1]
cp e
jr nc, .asm_c858b
jr nc, .load_zero
push hl
add hl, bc
ld a, [hl]
pop hl
jr .asm_c858c
jr .okay
.asm_c858b
.load_zero
xor a
.asm_c858c
.okay
ld [de], a
ld a, c
inc a
@ -980,7 +980,7 @@ Functionc8565: ; c8565 (32:4565)
inc de
ld a, e
cp $5f
jr c, .asm_c8580
jr c, .loop2
ret
BattleBGEffect_Whirlpool: ; c8599 (32:4599)
@ -1009,7 +1009,7 @@ Functionc85ba: ; c85ba (32:45ba)
ret
Functionc85be: ; c85be (32:45be)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_30: ; c85c2 (32:45c2)
@ -1037,7 +1037,7 @@ BattleBGEffect_31: ; c85ce (32:45ce)
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld a, [hl]
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld hl, BG_EFFECT_STRUCT_02
add hl, bc
ld a, [hl]
@ -1055,7 +1055,7 @@ endr
ret
BattleBGEffect_32: ; c8603 (32:4603)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Psychic: ; c8607 (32:4607)
@ -1093,7 +1093,7 @@ Functionc862e: ; c862e (32:462e)
ret
Functionc863b: ; c863b (32:463b)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Teleport: ; c863f (32:463f)
@ -1118,7 +1118,7 @@ Functionc865a: ; c865a (32:465a)
ret
Functionc865e: ; c865e (32:465e)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_NightShade: ; c8662 (32:4662)
@ -1146,7 +1146,7 @@ Functionc8681: ; c8681 (32:4681)
ret
Functionc8685: ; c8685 (32:4685)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
@ -1202,7 +1202,7 @@ Functionc86cf: ; c86cf (32:46cf)
add hl, bc
ld a, [hl]
ld d, $2
call Functionc905d
call BattleBGEffects_Sine
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
add [hl]
@ -1241,7 +1241,7 @@ Functionc86ea: ; c86ea (32:46ea)
ret
Functionc8705: ; c8705 (32:4705)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_AcidArmor: ; c8709 (32:4709)
@ -1304,7 +1304,7 @@ Functionc8732: ; c8732 (32:4732)
ret
Functionc875d: ; c875d (32:475d)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_21: ; c8761 (32:4761)
@ -1353,7 +1353,7 @@ Functionc8781: ; c8781 (32:4781)
ret
Functionc87a3: ; c87a3 (32:47a3)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_23: ; c87a7 (32:47a7)
@ -1422,7 +1422,7 @@ endr
ret
Functionc8801: ; c8801 (32:4801)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Tackle: ; c8805 (32:4805)
@ -1457,7 +1457,7 @@ Functionc8810: ; c8810 (32:4810)
ret
Functionc8833: ; c8833 (32:4833)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_25: ; c8837 (32:4837)
@ -1492,7 +1492,7 @@ Functionc8842: ; c8842 (32:4842)
ret
Functionc8865: ; c8865 (32:4865)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
Functionc8869: ; c8869 (32:4869)
@ -1598,7 +1598,7 @@ BattleBGEffect_2d: ; c88e7 (32:48e7)
Functionc88f2: ; c88f2 (32:48f2)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
Functionc88f6: ; c88f6 (32:48f6)
@ -1634,7 +1634,7 @@ BattleBGEffect_2f: ; c8919 (32:4919)
Functionc8926: ; c8926 (32:4926)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
Functionc8929: ; c8929 (32:4929)
ret
@ -1665,7 +1665,7 @@ Functionc894a: ; c894a (32:494a)
add hl, bc
ld a, [hl]
ld d, $8
call Functionc905d
call BattleBGEffects_Sine
call Functionc900b
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
@ -1675,7 +1675,7 @@ Functionc894a: ; c894a (32:494a)
ret
Functionc8960: ; c8960 (32:4960)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_2c: ; c8964 (32:4964)
@ -1706,13 +1706,13 @@ Functionc8985: ; c8985 (32:4985)
add hl, bc
ld a, [hl]
ld d, $6
call Functionc905d
call BattleBGEffects_Sine
push af
ld hl, BG_EFFECT_STRUCT_02
add hl, bc
ld a, [hl]
ld d, $2
call Functionc905d
call BattleBGEffects_Sine
ld e, a
pop af
add e
@ -1730,7 +1730,7 @@ Functionc8985: ; c8985 (32:4985)
ret
Functionc89b1: ; c89b1 (32:49b1)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_28: ; c89b5 (32:49b5)
@ -1773,7 +1773,7 @@ Functionc89da: ; c89da (32:49da)
ret
.asm_c89ea
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_22: ; c89ee (32:49ee)
@ -1811,7 +1811,7 @@ Functionc8a14: ; c8a14 (32:4a14)
add hl, bc
ld a, [hl]
ld d, $10
call Functionc9066
call BattleBGEffects_Cosine
add $10
ld d, a
pop af
@ -1825,7 +1825,7 @@ endr
ret
Functionc8a36: ; c8a36 (32:4a36)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_2a: ; c8a3a (32:4a3a)
@ -1974,7 +1974,7 @@ Functionc8ae5: ; c8ae5 (32:4ae5)
ret
.asm_c8afc
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_1c: ; c8b00 (32:4b00)
@ -2289,7 +2289,7 @@ Functionc8c85: ; c8c85 (32:4c85)
ret
.asm_c8c9e
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
@ -2321,7 +2321,7 @@ Functionc8cc3: ; c8cc3 (32:4cc3)
cp $40
jr nc, Functionc8cdd
ld d, $6
call Functionc905d
call BattleBGEffects_Sine
call Functionc900b
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
@ -2331,7 +2331,7 @@ Functionc8cc3: ; c8cc3 (32:4cc3)
ret
Functionc8cdd: ; c8cdd (32:4cdd)
call Functionc8f0a
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_2e: ; c8ce1 (32:4ce1)
@ -2412,7 +2412,7 @@ BattleBGEffect_35: ; c8d3a (32:4d3a)
cp $40
jr nc, .asm_c8d53
ld d, $6
call Functionc905d
call BattleBGEffects_Sine
ld [hSCX], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
@ -2740,7 +2740,7 @@ Functionc8ef4: ; c8ef4 (32:4ef4)
ld [hLCDStatCustom + 2], a
ret
Functionc8f0a: ; c8f0a (32:4f0a)
BattleAnim_ResetLCDStatCustom: ; c8f0a (32:4f0a)
xor a
ld [hLCDStatCustom + 1], a
ld [hLCDStatCustom + 2], a
@ -2765,13 +2765,13 @@ Functionc8f19: ; c8f19 (32:4f19)
Functionc8f2e: ; c8f2e (32:4f2e)
push bc
xor a
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, e
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld a, d
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
ld a, $80
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTemp3], a
ld bc, LYOverridesBackup
.asm_c8f43
ld a, [hLCDStatCustom + 1]
@ -2780,75 +2780,75 @@ Functionc8f2e: ; c8f2e (32:4f2e)
ld a, [hLCDStatCustom + 2]
cp c
jr c, .asm_c8f58
ld a, [BattleAnimTemps + 2]
ld a, [wBattleAnimTemp2]
ld d, a
ld a, [BattleAnimTemps]
call Functionc905d
ld a, [wBattleAnimTemp0]
call BattleBGEffects_Sine
ld [bc], a
.asm_c8f58
inc bc
ld a, [BattleAnimTemps + 1]
ld hl, BattleAnimTemps
ld a, [wBattleAnimTemp1]
ld hl, wBattleAnimTemp0
add [hl]
ld [hl], a
ld hl, BattleAnimTemps + 3
ld hl, wBattleAnimTemp3
dec [hl]
jr nz, .asm_c8f43
pop bc
ret
Functionc8f69: ; c8f69 (32:4f69)
InitSurfWaves: ; c8f69 (32:4f69)
push bc
xor a
ld [BattleAnimTemps], a
ld [wBattleAnimTemp0], a
ld a, e
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld a, d
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
ld a, $40
ld [BattleAnimTemps + 3], a
ld bc, w5_d422
.asm_c8f7e
ld a, [BattleAnimTemps + 2]
ld [wBattleAnimTemp3], a
ld bc, wSurfWaveBGEffect
.loop
ld a, [wBattleAnimTemp2]
ld d, a
ld a, [BattleAnimTemps]
call Functionc905d
ld a, [wBattleAnimTemp0]
call BattleBGEffects_Sine
ld [bc], a
inc bc
ld a, [BattleAnimTemps + 1]
ld hl, BattleAnimTemps
ld a, [wBattleAnimTemp1]
ld hl, wBattleAnimTemp0
add [hl]
ld [hl], a
ld hl, BattleAnimTemps + 3
ld hl, wBattleAnimTemp3
dec [hl]
jr nz, .asm_c8f7e
jr nz, .loop
pop bc
ret
Functionc8f9a: ; c8f9a (32:4f9a)
push bc
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTemp3], a
ld a, e
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
ld a, d
ld [BattleAnimTemps + 2], a
ld [wBattleAnimTemp2], a
call Functionc8fe4
ld hl, LYOverridesBackup
add hl, de
ld c, l
ld b, h
.asm_c8faf
ld a, [BattleAnimTemps + 3]
ld a, [wBattleAnimTemp3]
and a
jr z, .asm_c8fe1
dec a
ld [BattleAnimTemps + 3], a
ld [wBattleAnimTemp3], a
push af
ld a, [BattleAnimTemps + 2]
ld a, [wBattleAnimTemp2]
ld d, a
ld a, [BattleAnimTemps + 1]
ld a, [wBattleAnimTemp1]
push hl
call Functionc905d
call BattleBGEffects_Sine
ld e, a
pop hl
ld a, [hLCDStatCustom + 2]
@ -2864,9 +2864,9 @@ Functionc8f9a: ; c8f9a (32:4f9a)
ld [hl], e
dec hl
.asm_c8fd6
ld a, [BattleAnimTemps + 1]
ld a, [wBattleAnimTemp1]
add $4
ld [BattleAnimTemps + 1], a
ld [wBattleAnimTemp1], a
pop af
jr .asm_c8faf
@ -2878,7 +2878,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
Functionc8fe4: ; c8fe4 (32:4fe4)
ld a, [hLCDStatCustom + 1]
ld e, a
ld a, [BattleAnimTemps]
ld a, [wBattleAnimTemp0]
add e
ld e, a
ld d, $0
@ -2980,13 +2980,13 @@ BattleBGEffects_CheckSGB: ; c9059 (32:5059)
and a
ret
Functionc905d: ; c905d (32:505d)
BattleBGEffects_Sine: ; c905d (32:505d)
ld e, a
callab BattleAnim_Sine_e
ld a, e
ret
Functionc9066: ; c9066 (32:5066)
BattleBGEffects_Cosine: ; c9066 (32:5066)
ld e, a
callab BattleAnim_Cosine_e
ld a, e

File diff suppressed because it is too large Load Diff

View File

@ -4,12 +4,12 @@
const BATTLEANIMSTRUCT_02
const BATTLEANIMSTRUCT_FRAMESET_ID
const BATTLEANIMSTRUCT_FUNCTION
const BATTLEANIMSTRUCT_05
const BATTLEANIMSTRUCT_PALETTE
const BATTLEANIMSTRUCT_TILEID
const BATTLEANIMSTRUCT_07
const BATTLEANIMSTRUCT_08
const BATTLEANIMSTRUCT_09
const BATTLEANIMSTRUCT_0A
const BATTLEANIMSTRUCT_XCOORD
const BATTLEANIMSTRUCT_YCOORD
const BATTLEANIMSTRUCT_XOFFSET
const BATTLEANIMSTRUCT_YOFFSET
const BATTLEANIMSTRUCT_0B
const BATTLEANIMSTRUCT_DURATION
const BATTLEANIMSTRUCT_FRAME
@ -47,7 +47,7 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
const ANIM_OBJ_12
const ANIM_OBJ_13
const ANIM_OBJ_14
const ANIM_OBJ_15
const ANIM_OBJ_POKE_BALL
const ANIM_OBJ_16
const ANIM_OBJ_17
const ANIM_OBJ_18

View File

@ -11,9 +11,9 @@ endc
anim_obj: macro
db anim_obj_command
db \1 ; obj
db \2 ; x
db \3 ; y
db \4 ; param
db (\2 << 3) + \3 ; x
db (\4 << 3) + \5 ; y
db \6 ; param
endm
enum anim_1gfx_command ; d1

View File

@ -3279,30 +3279,30 @@ wBattleAnimTileDict:: ds 10
battle_anim_struct: MACRO
; Placeholder until we can figure out what it all means
\1Index:: ds 1
\1Anim01:: ds 1
\1Anim02:: ds 1
\1Anim03:: ds 1
\1AnimFunctionIndex:: ds 1
\1Anim05:: ds 1
\1AnimTileID:: ds 1
\1Anim07:: ds 1
\1Anim08:: ds 1
\1Anim09:: ds 1
\1Anim0a:: ds 1
\1Anim0b:: ds 1
\1Anim0c:: ds 1
\1Anim0d:: ds 1
\1AnimAnonJumptableIndex:: 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
\1_Index:: ds 1
\1_Anim01:: ds 1
\1_Anim02:: ds 1
\1_FramesetIndex:: ds 1
\1_FunctionIndex:: ds 1
\1_Anim05:: ds 1
\1_TileID:: ds 1
\1_XCoord:: ds 1
\1_YCoord:: ds 1
\1_XOffset:: ds 1
\1_YOffset:: ds 1
\1_Anim0b:: ds 1
\1_Anim0c:: ds 1
\1_Anim0d:: ds 1
\1_AnonJumptableIndex:: ds 1
\1_Anim0f:: ds 1
\1_Anim10:: ds 1
\1_Anim11:: ds 1
\1_Anim12:: ds 1
\1_Anim13:: ds 1
\1_Anim14:: ds 1
\1_Anim15:: ds 1
\1_Anim16:: ds 1
\1_Anim17:: ds 1
endm
ActiveAnimObjects:: ; d30a
@ -3351,9 +3351,26 @@ BattleAnimByte:: ; d417
ds 1
wBattleAnimOAMPointerLo:: ds 1 ; d418
BattleAnimTemps:: ; d419
ds 8
ds 1
w5_d422:: ds $32
wBattleAnimTempOAMFlags::
wBattleAnimTemp0:: ds 1
wBattleAnimTemp1:: ds 1
wBattleAnimTempTileID::
wBattleAnimTemp2:: ds 1
wBattleAnimTempXCoord::
wBattleAnimTemp3:: ds 1
wBattleAnimTempYCoord::
wBattleAnimTemp4:: ds 1
wBattleAnimTempXOffset::
wBattleAnimTemp5:: ds 1
wBattleAnimTempYOffset::
wBattleAnimTemp6:: ds 1
wBattleAnimTemp7:: ds 1
wBattleAnimTempPalette::
wBattleAnimTemp8:: ds 1
wSurfWaveBGEffect:: ds $40
wSurfWaveBGEffectEnd::
ds -$e
wBattleAnimEnd::
SECTION "WRAM 5 MOBILE", WRAMX [$d800], BANK [5]