Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ CODE_OVERLAYS := field_init intro field \
tripletriad battle_render battle world

ALL_EFFECT_OVERLAYS := $(filter effect_%,$(SPLAT_BINARIES))
EFFECTS ?= effect_001 effect_025
EFFECTS ?= effect_001 effect_025 effect_028
EFFECT_OVERLAYS := $(if $(filter all,$(EFFECTS)),$(ALL_EFFECT_OVERLAYS),$(EFFECTS))
OVERLAYS := $(MENU_OVERLAYS) $(CODE_OVERLAYS) $(EFFECT_OVERLAYS)
ALL_OVERLAYS := $(MENU_OVERLAYS) $(CODE_OVERLAYS) $(ALL_EFFECT_OVERLAYS)
Expand Down
2 changes: 1 addition & 1 deletion config/ff8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1092,7 +1092,7 @@ binaries:
subsegments:
- [0x0, c, effect_028]
- [0x9EFC, .rodata, effect_028]
- [0x9F10, bin, effect_028]
- [0x9FA0, bin, effect_028]
- [0x3CCB0]
- name: effect_029
sha1: 2f817a2bd73ec621f623440889ade98973bd1131
Expand Down
17 changes: 12 additions & 5 deletions include/battle.h
Original file line number Diff line number Diff line change
Expand Up @@ -1328,13 +1328,20 @@ struct EffectAttachment {
*/
typedef struct BattleEffectSlot {
/* 0x00 */ u16 flags; /**< See @c BATTLE_SLOT_FLAG_*. */
/* 0x02 */ u8 pad002[0x1E - 0x2];
/* 0x1E */ u16 unk01E; /**< Y origin: summed with a model's Y bounds. */
/* 0x20 */ u8 pad020[0x24 - 0x20];
/* 0x02 */ u8 pad002[0xE - 0x2];
/* 0x0E */ s16 facing; /**< Angle the slot's model is turned to. */
/* 0x10 */ u8 pad010[0x1C - 0x10];
/* 0x1C */ SVECTOR pos; /**< Where the slot's model stands; @c vy is
the origin a model's Y bounds are summed
with. */
/* 0x24 */ u16 unk024;
/* 0x26 */ u8 pad026[0x28 - 0x26];
/* 0x28 */ u32 unk028; /**< Packed RGB the textured prims are drawn with. */
/* 0x2C */ u8 pad02C[0x40 - 0x2C];
/* 0x2C */ u8 pad02C[0x36 - 0x2C];
/* 0x36 */ u16 unk036;
/* 0x38 */ u8 pad038[0x3C - 0x38];
/* 0x3C */ s16 unk03C; /**< Its distance above @c unk036 sizes the draw list. */
/* 0x3E */ u8 pad03E[0x40 - 0x3E];
/* 0x40 */ MATRIX mtx; /**< Pose the effect's render matrices start from. */
/* 0x60 */ u8 unk060[0x64 - 0x60];
/* 0x64 */ struct EffectMesh *mesh;
Expand All @@ -1357,7 +1364,7 @@ typedef struct BattleEffectSlot {
*/
typedef struct {
/* 0x00 */ u8 pad000[0x14];
/* 0x0014 */ u8 font[0x44 - 0x14]; /**< Glyph set handed to the text drawer. */
/* 0x0014 */ u32 frontOT[(0x44 - 0x14) / 4]; /**< Ordering table the screen overlays link into. */
/* 0x0044 */ u32 ot[(0x4040 - 0x44) / 4]; /**< Ordering table the effects link into. */
/* 0x4040 */ u8 unk4040[4];
} BattleGfx;
Expand Down
4 changes: 3 additions & 1 deletion include/effect.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ typedef struct EffectModel {
/* 0x40 */ SVECTOR unk040;
/* 0x48 */ SVECTOR boundsMin; /**< Lower corner of the model's bounding box. */
/* 0x50 */ SVECTOR boundsMax; /**< Upper corner of the model's bounding box. */
/* 0x58 */ u8 pad058[0x63 - 0x58];
/* 0x58 */ u8 pad058[0x5A - 0x58];
/* 0x5A */ u16 unk05A; /**< How many strands an effect builds from it. */
/* 0x5C */ u8 pad05C[0x63 - 0x5C];
/* 0x63 */ u8 unk063;
/* 0x64 */ u8 pad064[0x100 - 0x64];
} EffectModel; /* >= 0x100 */
Expand Down
Loading
Loading