mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-04-09 05:44:44 -07:00
More labels related to battle anims
This commit is contained in:
parent
d7a5ea998d
commit
c4e3e980b1
@ -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
|
||||
|
File diff suppressed because it is too large
Load Diff
1811
battle/anims.asm
1811
battle/anims.asm
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
@ -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
|
||||
|
71
wram.asm
71
wram.asm
@ -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]
|
||||
|
Loading…
x
Reference in New Issue
Block a user