pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix some constants surrounding sprite animations

Browse Source 
Also commented the use of the field surrounding the struct
initialization functions.

SPRITEANIMSTRUCT_0C -> SPRITEANIMSTRUCT_VAR1
SPRITEANIMSTRUCT_0D -> SPRITEANIMSTRUCT_VAR2
SPRITEANIMSTRUCT_0E -> SPRITEANIMSTRUCT_VAR3
SPRITEANIMSTRUCT_0F -> SPRITEANIMSTRUCT_VAR4

BATTLEANIMSTRUCT_01 -> BATTLEANIMSTRUCT_OAMFLAGS
BATTLEANIMSTRUCT_ANON_JT_INDEX -> BATTLEANIMSTRUCT_JUMPTABLE_INDEX
BATTLEANIMSTRUCT_0F -> BATTLEANIMSTRUCT_VAR1
BATTLEANIMSTRUCT_10 -> BATTLEANIMSTRUCT_VAR2
This commit is contained in:
mid-kid
2020-08-22 16:22:37 +02:00
parent 733664b18f
commit 13c4a93cea
19 changed files with 378 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine/battle_anims/anim_commands.asm
View File

@@ -319,7 +319,6 @@ RunBattleAnimCommand:
ld hl, BattleAnimCommands
add hl, de
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
@@ -714,7 +713,7 @@ BattleAnimCmd_IncObj:
ret
.found
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
inc [hl]
ret
@@ -765,7 +764,7 @@ BattleAnimCmd_SetObj:
.found
call GetBattleAnimByte
ld hl, BATTLEANIMSTRUCT_ANON_JT_INDEX
ld hl, BATTLEANIMSTRUCT_JUMPTABLE_INDEX
add hl, bc
ld [hl], a
ret

38
engine/battle_anims/core.asm
View File

@@ -39,42 +39,42 @@ endr
ld hl, BATTLEANIMSTRUCT_INDEX
add hl, bc
ld a, [wLastAnimObjectIndex]
ld [hli], a ; Index
ld [hli], a ; BATTLEANIMSTRUCT_INDEX
ld a, [de]
inc de
ld [hli], a ; 01
ld [hli], a ; BATTLEANIMSTRUCT_OAMFLAGS
ld a, [de]
inc de
ld [hli], a ; 02
ld [hli], a ; BATTLEANIMSTRUCT_02
ld a, [de]
inc de
ld [hli], a ; Frameset ID
ld [hli], a ; BATTLEANIMSTRUCT_FRAMESET_ID
ld a, [de]
inc de
ld [hli], a ; Function
ld [hli], a ; BATTLEANIMSTRUCT_FUNCTION
ld a, [de]
inc de
ld [hli], a ; 05
ld [hli], a ; BATTLEANIMSTRUCT_PALETTE
ld a, [de]
call GetBattleAnimTileOffset
ld [hli], a ; Tile ID
ld [hli], a ; BATTLEANIMSTRUCT_TILEID
ld a, [wBattleObjectTempXCoord]
ld [hli], a ; X Coord
ld [hli], a ; BATTLEANIMSTRUCT_XCOORD
ld a, [wBattleObjectTempYCoord]
ld [hli], a ; Y Coord
ld [hli], a ; BATTLEANIMSTRUCT_YCOORD
xor a
ld [hli], a ; X Offset
ld [hli], a ; Y Offset
ld [hli], a ; BATTLEANIMSTRUCT_XOFFSET
ld [hli], a ; BATTLEANIMSTRUCT_YOFFSET
ld a, [wBattleObjectTempParam]
ld [hli], a ; Param
ld [hli], a ; BATTLEANIMSTRUCT_PARAM
xor a
ld [hli], a ; 0c
ld [hli], a ; BATTLEANIMSTRUCT_DURATION
dec a
ld [hli], a ; 0d
ld [hli], a ; BATTLEANIMSTRUCT_FRAME
xor a
ld [hli], a ; 0e
ld [hli], a ; 0f
ld [hl], a ; 10
ld [hli], a ; BATTLEANIMSTRUCT_JUMPTABLE_INDEX
ld [hli], a ; BATTLEANIMSTRUCT_VAR1
ld [hl], a ; BATTLEANIMSTRUCT_VAR2
ret
BattleAnimOAMUpdate:
@@ -199,7 +199,7 @@ BattleAnimOAMUpdate:
ret
InitBattleAnimBuffer:
ld hl, BATTLEANIMSTRUCT_01
ld hl, BATTLEANIMSTRUCT_OAMFLAGS
add hl, bc
ld a, [hl]
@@ -232,7 +232,7 @@ InitBattleAnimBuffer:
and a
ret z
ld hl, BATTLEANIMSTRUCT_01
ld hl, BATTLEANIMSTRUCT_OAMFLAGS
add hl, bc
ld a, [hl]
ld [wBattleAnimTempOAMFlags], a

428
engine/battle_anims/functions.asm
View File

File diff suppressed because it is too large Load Diff