Skip to content

Import and decompile ten MAGIC overlays #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khasinski wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Import and decompile ten MAGIC overlays #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3192a89
Import and decompile ten MAGIC overlays
khasinski Oct 12, 2026
1d1579d
magic: import overlay assets and simplify paused updates
khasinski Oct 13, 2026
358fbad
magic: satisfy CI formatting and declaration checks
khasinski Oct 13, 2026
ca2dc68
magic: regenerate model assets during build
khasinski Oct 14, 2026
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
7 changes: 7 additions & 0 deletions config/symbols.magic-boost.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
MAGIC_Boost = 0x801B0000; // type:func
func_boost_801B0028 = 0x801B0028; // type:func
func_boost_801B00E0 = 0x801B00E0; // type:func
func_boost_801B01C8 = 0x801B01C8; // type:func
func_boost_801B03D8 = 0x801B03D8; // type:func
func_boost_801B046C = 0x801B046C; // type:func
D_801B868C = 0x801B868C;
6 changes: 6 additions & 0 deletions config/symbols.magic-echoes.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MAGIC_Echoes = 0x801B0000; // type:func
func_echoes_801B0020 = 0x801B0020; // type:func
func_echoes_801B0108 = 0x801B0108; // type:func
func_echoes_801B02BC = 0x801B02BC; // type:func
func_echoes_801B03A4 = 0x801B03A4; // type:func
func_echoes_801B0404 = 0x801B0404; // type:func
2 changes: 2 additions & 0 deletions config/symbols.magic-gattai.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
func_gattai_801B0000 = 0x801B0000; // type:func
MAGIC_Gattai = 0x801B007C; // type:func
6 changes: 6 additions & 0 deletions config/symbols.magic-hakai.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MAGIC_Hakai = 0x801B0000; // type:func
func_hakai_801B0020 = 0x801B0020; // type:func
func_hakai_801B008C = 0x801B008C; // type:func
func_hakai_801B0180 = 0x801B0180; // type:func
func_hakai_801B03F4 = 0x801B03F4; // type:func
func_hakai_801B0448 = 0x801B0448; // type:func
7 changes: 7 additions & 0 deletions config/symbols.magic-jinrai.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
MAGIC_Jinrai = 0x801B0000; // type:func
func_jinrai_801B0028 = 0x801B0028; // type:func
func_jinrai_801B00E0 = 0x801B00E0; // type:func
func_jinrai_801B01E4 = 0x801B01E4; // type:func
func_jinrai_801B02B0 = 0x801B02B0; // type:func
D_801B3470 = 0x801B3470;
D_801B5220 = 0x801B5220; // size:0xC
6 changes: 6 additions & 0 deletions config/symbols.magic-magend.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MAGIC_Magend = 0x801B0000; // type:func
func_magend_801B0020 = 0x801B0020; // type:func
func_magend_801B0080 = 0x801B0080; // type:func
func_magend_801B0174 = 0x801B0174; // type:func
func_magend_801B03F4 = 0x801B03F4; // type:func
func_magend_801B0448 = 0x801B0448; // type:func
6 changes: 6 additions & 0 deletions config/symbols.magic-minimam.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
func_minimam_801B0000 = 0x801B0000; // type:func
MAGIC_Minimam = 0x801B0054; // type:func
func_minimam_801B0074 = 0x801B0074; // type:func
func_minimam_801B0190 = 0x801B0190; // type:func
func_minimam_801B0414 = 0x801B0414; // type:func
func_minimam_801B0514 = 0x801B0514; // type:func
5 changes: 5 additions & 0 deletions config/symbols.magic-smkball.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
MAGIC_Smkball = 0x801B0000; // type:func
func_smkball_801B0020 = 0x801B0020; // type:func
func_smkball_801B0124 = 0x801B0124; // type:func
func_smkball_801B0250 = 0x801B0250; // type:func
func_smkball_801B02B0 = 0x801B02B0; // type:func
6 changes: 6 additions & 0 deletions config/symbols.magic-tears.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MAGIC_Tears = 0x801B0000; // type:func
func_tears_801B0020 = 0x801B0020; // type:func
func_tears_801B0158 = 0x801B0158; // type:func
func_tears_801B0304 = 0x801B0304; // type:func
func_tears_801B0384 = 0x801B0384; // type:func
func_tears_801B03E4 = 0x801B03E4; // type:func
6 changes: 6 additions & 0 deletions config/symbols.magic-threat.us.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
MAGIC_Threat = 0x801B0000; // type:func
func_threat_801B0020 = 0x801B0020; // type:func
func_threat_801B00DC = 0x801B00DC; // type:func
func_threat_801B01D8 = 0x801B01D8; // type:func
func_threat_801B0304 = 0x801B0304; // type:func
MAGIC_ThreatSetup = 0x801B0364; // type:func
134 changes: 133 additions & 1 deletion config/us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,8 @@ overlays:
base_path: battle
imports: [
main, batini, batres,
barrier, brizad, lv5deth, thunder, mabaria, refrec, fire, faira, brizara, thundera, choco0
barrier, brizad, lv5deth, thunder, mabaria, refrec, fire, faira, brizara, thundera, choco0,
gattai, jinrai, smkball, threat, tears, echoes, magend, hakai, boost, minimam
]
symbol_addrs_path:
- config/symbols.battle.txt
Expand Down Expand Up @@ -808,3 +809,134 @@ overlays:
- [0, c, sennkoku]
- [0x930, data, sennkoku_model]
- [0x559C, data, sennkoku_buffers]

- name: gattai
disk_path: disks/us/MAGIC/GATTAI.BIN
sha1: 1e3c0b5dd198f0a2c8d93bc575adeaed66a3d057
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-gattai.us.txt
segments:
- [0, c, gattai]

- name: jinrai
disk_path: disks/us/MAGIC/JINRAI.BIN
sha1: d28d5e991126ca8500f410377a2ef73d93324f67
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-jinrai.us.txt
segments:
- [0, c, jinrai]
- [0x310, tim, jinrai_texture]
- [0x3350, .data, jinrai_data]
- [0x3470, databin, jinrai_model]
- [0x5220, .data, jinrai_render]

- name: smkball
disk_path: disks/us/MAGIC/SMKBALL.BIN
sha1: 1888a8fe8e808e76598bdd396a38d3c264238873
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-smkball.us.txt
segments:
- [0, c, smkball]
- [0x310, tim, smkball_texture]
- [0x6350, .data, smkball_data]

- name: threat
disk_path: disks/us/MAGIC/THREAT.BIN
sha1: 1ceaba779b289a572ad08fe67d36ba90996f1566
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-threat.us.txt
segments:
- [0, c, threat]
- [0x410, tim, threat_texture]
- [0x8450, .data, threat_data]

- name: tears
disk_path: disks/us/MAGIC/TEARS.BIN
sha1: decdeb398bcfb4e8c09d0600bfba9edb4766fe4b
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-tears.us.txt
segments:
- [0, c, tears]
- [0x450, .data, tears_data]

- name: echoes
disk_path: disks/us/MAGIC/ECHOES.BIN
sha1: cf7b802d0a7807fb8cc32bba1e51fb5c994b064c
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-echoes.us.txt
segments:
- [0, c, echoes]
- [0x474, tim, echoes_texture]
- [0x64B4, .data, echoes_data]

- name: magend
disk_path: disks/us/MAGIC/MAGEND.BIN
sha1: 2af3b214c94b309918fb2a8664f7512a9c60d5ca
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-magend.us.txt
segments:
- [0, c, magend]
- [0x4B4, tim, magend_texture]
- [0x16D4, .data, magend_data]

- name: hakai
disk_path: disks/us/MAGIC/HAKAI.BIN
sha1: 90098828bf03bd13ae535a566c10ff522158963b
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-hakai.us.txt
segments:
- [0, c, hakai]
- [0x4C4, tim, hakai_texture]
- [0x6504, .data, hakai_data]

- name: boost
disk_path: disks/us/MAGIC/BOOST.BIN
sha1: 119e4dccbf935a2636540d309e6592f3f73dc596
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-boost.us.txt
segments:
- [0, c, boost]
- [0x4CC, tim, boost_texture]
- [0x852C, .data, boost_data]
- [0x868C, databin, boost_model]
- [0xA264, .data, boost_render]

- name: minimam
disk_path: disks/us/MAGIC/MINIMAM.BIN
sha1: f2ec8681e080b3f24c48b34e5f92c37b2c8c1aa9
base_path: magic
imports: [main, battle]
vram_start: 0x801B0000
symbol_addrs_path:
- config/symbols.magic-minimam.us.txt
segments:
- [0, c, minimam]
- [0x5B8, tim, minimam_texture]
- [0x45F8, .data, minimam_data]
2 changes: 2 additions & 0 deletions src/battle/battle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,8 @@ extern Unk80166F78 D_80166F78[NUM_ENEMY][16];
extern SavePartyMember D_80167938;

s32 BattleEffectRegister(void (*callback)(void));
void BattleSpawnFloatingIcon(s32 actor, s32 arg1);
void BattleSpawnFloatingIconAtPart(s32 actor, s32 arg1, s32 arg2);
void BattleSetLoadTimToVram(u_long* addr, s16 imgXY, s16 clutX, s16 clutY);
void BattleEnqueueClearImage(RECT* rect, s32 arg1, s32 arg2, s32 arg3);
void* func_800D29D4(ModelRenderDesc*, u_long**, int, void*);
Expand Down
40 changes: 20 additions & 20 deletions src/battle/battle2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ s32 BattleModelReadAnimStream(BattleModelSub* arg0, s32 arg1, s16 nItems, u8* ar
void func_800D3AF0();
void func_800D4710();
MATRIX* BattleSetMatrixPosition(SVECTOR* pos, s32 depthBias, MATRIX* m);
static void BattleSpawnFloatingIcon(s32 actor, s32 arg1);
void BattleSpawnFloatingIcon(s32 actor, s32 arg1);
void BattleQueueImpactEffect(s32 arg0, s16 arg1);
void BattleInitMagicCastEffect(void);
void BattleStartEffectWithModel(s32 targetMask, s32 callbackArg);
Expand Down Expand Up @@ -627,14 +627,14 @@ MagicEntry D_800EF9D8[] = {
(MagicEntry)0x801B0A8C, // 6 CAREL.BIN
(MagicEntry)0x801B0EEC, // 7 CAREL.BIN
(MagicEntry)0x801B0B60, // 8 CAREL.BIN
(MagicEntry)0x801B0364, // 9 THREAT.BIN
(MagicEntry)MAGIC_ThreatSetup, // 9 THREAT.BIN
(MagicEntry)0x801B0054, // 10 TODO.BIN
(MagicEntry)0x801B0054, // 11 MINIMAM.BIN
(MagicEntry)0x801B0000, // 12 ECHOES.BIN
(MagicEntry)0x801B0000, // 13 HAKAI.BIN
(MagicEntry)0x801B0000, // 14 TEARS.BIN
(MagicEntry)MAGIC_Minimam, // 11 MINIMAM.BIN
(MagicEntry)MAGIC_Echoes, // 12 ECHOES.BIN
(MagicEntry)MAGIC_Hakai, // 13 HAKAI.BIN
(MagicEntry)MAGIC_Tears, // 14 TEARS.BIN
(MagicEntry)0x801B0000, // 15 ALMIGHTY.BIN
(MagicEntry)0x801B0000, // 16 SMKBALL.BIN
(MagicEntry)MAGIC_Smkball, // 16 SMKBALL.BIN
(MagicEntry)0x801B0054, // 17 HEIST.BIN
(MagicEntry)0x801B0054, // 18 MYTYG.BIN
(MagicEntry)0x801B0564, // 19 RESIST.BIN
Expand All @@ -652,7 +652,7 @@ MagicEntry D_800EF9D8[] = {
(MagicEntry)0x801B0084, // 31 FAIGA2.BIN
MAGIC_Brizara, // 32 BRIZARA.BIN
(MagicEntry)0x801B0054, // 33 BRIZAG2.BIN
MAGIC_Thundera, // 34 THUNDERA.BIN
MAGIC_Thundera, // 34 THUNDERA.BIN
(MagicEntry)0x801B000C, // 35 THUNDG2.BIN
(MagicEntry)0x801B0074, // 36 QUEIR.BIN
(MagicEntry)0x801B0054, // 37 QUEIG.BIN
Expand All @@ -669,7 +669,7 @@ MagicEntry D_800EF9D8[] = {
(MagicEntry)0x801B0054, // 48 DAISENP.BIN
(MagicEntry)0x801B0054, // 49 AQUA.BIN
(MagicEntry)0x801B0054, // 50 TODO.BIN
(MagicEntry)0x801B0054, // 51 MINIMAM.BIN
(MagicEntry)MAGIC_Minimam, // 51 MINIMAM.BIN
(MagicEntry)0x801B0000, // 52 ESNA.BIN
MAGIC_Fire, // 53 FIRE.BIN
(MagicEntry)0x801B0000, // 54 HAKUGEK2.BIN
Expand Down Expand Up @@ -701,7 +701,7 @@ MagicEntry D_800EFAF0[] = {
(MagicEntry)0x801B0564, // 6 RESIST.BIN
BattleStartEffectWithModel, // 7 RAISE.BIN
BattleStartEffectWithModel, // 8 RAISE.BIN
(MagicEntry)0x801B0054, // 9 MINIMAM.BIN
(MagicEntry)MAGIC_Minimam, // 9 MINIMAM.BIN
(MagicEntry)0x801B0054, // 10 TODO.BIN
(MagicEntry)0x801B0054, // 11 SLIPL.BIN
BattleStartEffectWithModel, // 12 CONF.BIN
Expand Down Expand Up @@ -842,7 +842,7 @@ MagicEntry D_800EFC28[] = {
(MagicEntry)0x801B0000, // 61 TOBOE.BIN
(MagicEntry)0x801B0F18, // 62 KAFUN.BIN
(MagicEntry)0x801B0000, // 63 ROCKET.BIN
(MagicEntry)0x801B0364, // 64 THREAT.BIN
(MagicEntry)MAGIC_ThreatSetup, // 64 THREAT.BIN
(MagicEntry)0x801B1028, // 65 Q_SHU.BIN
(MagicEntry)0x801B0000, // 66 JIBASIRI.BIN
(MagicEntry)0x801B0000, // 67 JIBAKU2.BIN
Expand All @@ -868,7 +868,7 @@ MagicEntry D_800EFC28[] = {
(MagicEntry)0x801B0008, // 87 SEKIKA.BIN
(MagicEntry)0x801B0000, // 88 HAKUGEK1.BIN
(MagicEntry)0x801B0000, // 89 HAKUGEK2.BIN
(MagicEntry)0x801B0000, // 90 HAKAI.BIN
(MagicEntry)MAGIC_Hakai, // 90 HAKAI.BIN
(MagicEntry)0x801B0000, // 91 WLASER.BIN
(MagicEntry)0x801B0000, // 92 AEROGA.BIN
(MagicEntry)0x801B0054, // 93 ZENBAKU.BIN
Expand All @@ -892,7 +892,7 @@ MagicEntry D_800EFC28[] = {
(MagicEntry)0x801B0000, // 111 KONA.BIN
(MagicEntry)0x801B0000, // 112 PINK.BIN
(MagicEntry)0x801B0000, // 113 JAMMER.BIN
(MagicEntry)0x801B0000, // 114 TEARS.BIN
(MagicEntry)MAGIC_Tears, // 114 TEARS.BIN
(MagicEntry)0x801B0E98, // 115 ELECBALL.BIN
(MagicEntry)0x801B0054, // 116 UTAGOE.BIN
(MagicEntry)0x801B0000, // 117 SAIKYO.BIN
Expand Down Expand Up @@ -923,7 +923,7 @@ MagicEntry D_800EFC28[] = {
(MagicEntry)0x801B0040, // 142 LASBOSS.BIN
(MagicEntry)0x801B0040, // 143 file id 318
BattleStartEffectWithModel, // 144 RAISE.BIN
(MagicEntry)0x801B0000, // 145 MAGEND.BIN
(MagicEntry)MAGIC_Magend, // 145 MAGEND.BIN
(MagicEntry)0x801B0000, // 146 TO_SEKI.BIN
(MagicEntry)BattleInitMagicCastEffect, // 147 DEADSEF.BIN
(MagicEntry)0x801B0A8C, // 148 CAREL.BIN
Expand Down Expand Up @@ -968,7 +968,7 @@ MagicEntryResult D_800EFEA0[] = {
(MagicEntryResult)0x801B0000, // 25 TIFA.BIN
(MagicEntryResult)0x801B0000, // 26 TIFA.BIN
(MagicEntryResult)0x801B0000, // 27 TIFA.BIN
(MagicEntryResult)0x801B0000, // 28 BOOST.BIN
(MagicEntryResult)MAGIC_Boost, // 28 BOOST.BIN
(MagicEntryResult)0x801B0000, // 29 MOD.BIN
(MagicEntryResult)0x801B0000, // 30 HYPER.BIN
(MagicEntryResult)0x801B0000, // 31 DYNAMITE.BIN
Expand All @@ -989,18 +989,18 @@ MagicEntryResult D_800EFEA0[] = {
(MagicEntryResult)0x801B0000, // 46 FIRE.BIN
(MagicEntryResult)0x801B0000, // 47 FIRE.BIN
(MagicEntryResult)0x801B0000, // 48 FIRE.BIN
(MagicEntryResult)0x801B0000, // 49 JINRAI.BIN
(MagicEntryResult)MAGIC_Jinrai, // 49 JINRAI.BIN
(MagicEntryResult)0x801B0000, // 50 MEIKYO.BIN
(MagicEntryResult)0x801B0000, // 51 GAISEI.BIN
(MagicEntryResult)0x801B0000, // 52 CHI.BIN
(MagicEntryResult)0x801B0000, // 53 GAISHU.BIN
(MagicEntryResult)0x801B0000, // 54 SEIJA.BIN
(MagicEntryResult)0x801B0000, // 55 SHINRA.BIN
(MagicEntryResult)0x801B007C, // 56 GATTAI.BIN
(MagicEntryResult)MAGIC_Gattai, // 56 GATTAI.BIN
(MagicEntryResult)BattleStartEffectWithModel, // 57 MDANCE.BIN
(MagicEntryResult)BattleStartEffectWithModel, // 58 TSOL.BIN
(MagicEntryResult)0x801B0054, // 59 LGIRL.BIN
(MagicEntryResult)MAGIC_Lv5Death,// 60 LV5DETH.BIN
(MagicEntryResult)MAGIC_Lv5Death, // 60 LV5DETH.BIN
(MagicEntryResult)BattleStartEffectWithModel, // 61 DEATH.BIN
(MagicEntryResult)0x801B0054, // 62 BEAST.BIN
(MagicEntryResult)0x801B0054, // 63 BEAST.BIN
Expand Down Expand Up @@ -2448,14 +2448,14 @@ void func_800D4C08(SVECTOR* pos, s32 scriptAndFlags, s32 scale, s32 depthBias) {
slot->depthBias = depthBias;
}

static void BattleSpawnFloatingIconAtPart(s32 actor, s32 arg1, s32 arg2) {
void BattleSpawnFloatingIconAtPart(s32 actor, s32 arg1, s32 arg2) {
SVECTOR pos;

BattleGetPartPosition(actor, g_BattleModels[actor].boneIndices[0], &pos);
func_800D4C08(&pos, arg1, arg2, -g_BattleModels[actor].collisionRadius);
}

static void BattleSpawnFloatingIcon(s32 actor, s32 arg1) { BattleSpawnFloatingIconAtPart(actor, arg1, 0x1000); }
void BattleSpawnFloatingIcon(s32 actor, s32 arg1) { BattleSpawnFloatingIconAtPart(actor, arg1, 0x1000); }

static void BattleSpawnFloatingIconAt(void* arg0, s32 arg1, s32 arg2) { func_800D4C08(arg0, arg1, 0x1000, arg2); }

Expand Down
10 changes: 6 additions & 4 deletions src/magic/barrier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ typedef struct {

// Battle effect instances.
extern BarrierData g_BattleEffectSlots[];
static s32 bari_a1[] = { // Embedded Model
// 6 verts, 12 polys,1 group
static s32 bari_a1[] = {
// Embedded Model
// 6 verts, 12 polys,1 group
0x00000030, // Vertex data size: 6 verts × 8 bytes
0xFE0C0000, 0x000001CA, // (-500, 0, 458, 0)
0x00000000, 0x0000FFD7, // (0, 0, -41, 0)
Expand All @@ -51,8 +52,9 @@ static s32 bari_a1[] = { // Embedded Model
0x00080000, 0x00280020, 0x38C0C0C0, 0x00FFFFFF, 0x006A6A6A, 0x006A6A6A, 0x00000010, 0x00200018, 0x38C0C0C0,
0x00C0C0C0, 0x006A6A6A, 0x006A6A6A};

static s32 bari_a2[] = { // Embedded Model
// 3 verts 2 ploys 1 group
static s32 bari_a2[] = {
// Embedded Model
// 3 verts 2 ploys 1 group
0x00000018, // Vertex data size: 3 × 8 bytes
0xFFEDFE2F, 0x000002C2, // vertex 0 (-19, -465, 706)
0xFE2AFFF2, 0x000001C2, // vertex 1 (-470, -14, 450)
Expand Down
Loading
Loading