16-bit Framesets

fellowship-of-the-roms · Jan 14, 2024 · b508546 · b508546
1 parent 5ea57b5
commit b508546
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/constants/battle_anim_constants.asm b/constants/battle_anim_constants.asm
@@ -3,7 +3,7 @@ rsreset
 DEF BATTLEANIMSTRUCT_INDEX           rb ; 00
 DEF BATTLEANIMSTRUCT_OAMFLAGS        rb ; 01
 DEF BATTLEANIMSTRUCT_FIX_Y           rb ; 02
-DEF BATTLEANIMSTRUCT_FRAMESET_ID     rb ; 03
+DEF BATTLEANIMSTRUCT_FRAMESET_ID     rw ; 03
 DEF BATTLEANIMSTRUCT_FUNCTION        rb ; 04
 DEF BATTLEANIMSTRUCT_PALETTE         rb ; 05
 DEF BATTLEANIMSTRUCT_TILEID          rb ; 06
@@ -18,7 +18,7 @@ DEF BATTLEANIMSTRUCT_FRAME           rb ; 0d
 DEF BATTLEANIMSTRUCT_JUMPTABLE_INDEX rb ; 0e
 DEF BATTLEANIMSTRUCT_VAR1            rb ; 0f
 DEF BATTLEANIMSTRUCT_VAR2            rb ; 10
-                                     rb_skip 7
+                                     rb_skip 6
 DEF BATTLEANIMSTRUCT_LENGTH EQU _RS
 DEF NUM_BATTLE_ANIM_STRUCTS EQU 10 ; see wActiveAnimObjects
 

diff --git a/data/battle_anims/objects.asm b/data/battle_anims/objects.asm
@@ -10,7 +10,7 @@ MACRO battleanimobj
 	db \2 ; enemy animation y fix param
 	; if $FF: y = y + 5 tiles
 	; else:   y = -y - (1 tile) * (is_softboiled_animation)
-	db \3 ; video sequence
+	dw \3 ; video sequence
 	db \4 ; callback
 	db \5 ; palette
 	db \6 ; tile offset

diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
@@ -43,6 +43,9 @@ endr
 	ld [hli], a ; BATTLEANIMSTRUCT_FRAMESET_ID
 	ld a, [de]
 	inc de
+	ld [hli], a ; BATTLEANIMSTRUCT_FRAMESET_ID + 1
+	ld a, [de]
+	inc de
 	ld [hli], a ; BATTLEANIMSTRUCT_FUNCTION
 	ld a, [de]
 	inc de

diff --git a/engine/battle_anims/framesets.asm b/engine/battle_anims/framesets.asm
@@ -66,7 +66,8 @@ GetBattleAnimFrame:
 	ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
 	add hl, bc
 	ld e, [hl]
-	ld d, 0
+	inc hl
+	ld d, [hl]
 	ld hl, BattleAnimFrameData
 	add hl, de
 	add hl, de

diff --git a/macros/ram.asm b/macros/ram.asm
@@ -463,7 +463,7 @@ MACRO battle_anim_struct
 \1Index::          db
 \1OAMFlags::       db
 \1FixY::           db
-\1FramesetID::     db
+\1FramesetID::     dw
 \1Function::       db
 \1Palette::        db
 \1TileID::         db
@@ -477,7 +477,7 @@ MACRO battle_anim_struct
 \1JumptableIndex:: db
 \1Var1::           db
 \1Var2::           db
-	ds 7
+	ds 6
 ENDM
 
 MACRO battle_bg_effect