Merge pull request #604 from Eebit/banim-efxmagic-utils

Decompile banim-efxmagic-utils
FireEmblemUniverse · Apr 6, 2024 · e0794ce · e0794ce
2 parents f4baebf + 1cb1e2a
commit e0794ce
Show file tree

Hide file tree

Showing 8 changed files with 322 additions and 609 deletions.
diff --git a/asm/banim-efxmagic-util.s b/asm/banim-efxmagic-util.s
diff --git a/data/banim-efxmagic-utils.s b/data/banim-efxmagic-utils.s
diff --git a/include/bmlib.h b/include/bmlib.h
@@ -93,7 +93,7 @@ void sub_8013168(u16 *dst, u8* src, int a3, int a4, int a5);
 // ??? sub_80131C4(???);
 void sub_80131D0(s16*);
 void sub_80131F0(s16*, int, int, int, int);
-// ??? sub_8013278(???);
+struct Vec2 * sub_8013278(int);
 // ??? DarkenPals(???);
 // ??? sub_8013428(???);
 // ??? sub_801342C(???);

diff --git a/include/efxbattle.h b/include/efxbattle.h
@@ -126,7 +126,8 @@ struct ProcEfxOBJ {
     /* 68 */ struct Anim * anim4;
 };
 
-struct ProcEfxALPHA {
+struct ProcEfxALPHA
+{
     PROC_HEADER;
 
     /* 29 */ u8 unk29;
@@ -137,7 +138,13 @@ struct ProcEfxALPHA {
     /* 2E */ s16 unk2E;
     /* 30 */ s16 unk30;
 
-    STRUCT_PAD(0x32, 0x5C);
+    STRUCT_PAD(0x32, 0x44);
+
+    /* 44 */ int unk44;
+    /* 48 */ int unk48;
+    /* 4C */ int unk4C;
+
+    STRUCT_PAD(0x50, 0x5C);
 
     /* 5C */ struct Anim * anim;
 };
@@ -177,6 +184,35 @@ struct ProcEkrDispUP {
 
 extern struct ProcEkrDispUP *gpProcEkrDispUP;
 
+struct ProcEfxCircleWIN
+{
+    /* 00 */ PROC_HEADER;
+    /* 29 */ STRUCT_PAD(0x29, 0x2c);
+    /* 2C */ s16 timer;
+    /* 2E */ s16 unk_2e;
+    /* 30 */ s16 unk_30;
+    /* 32 */ s16 unk_32;
+    /* 34 */ STRUCT_PAD(0x34, 0x3a);
+    /* 3A */ u16 unk_3a;
+    /* 3C */ STRUCT_PAD(0x3c, 0x44);
+    /* 44 */ int unk_44;
+    /* 48 */ STRUCT_PAD(0x48, 0x54);
+    /* 54 */ u16 * unk_54;
+    /* 58 */ int unk_58;
+    /* 5C */ struct Anim * anim;
+};
+
+struct ProcEfxMagicQuake
+{
+    /* 00 */ PROC_HEADER;
+    /* 29 */ STRUCT_PAD(0x29, 0x2c);
+    /* 2C */ s16 timer;
+    /* 2E */ s16 terminator;
+    /* 30 */ STRUCT_PAD(0x30, 0x5c);
+    /* 5C */ struct Anim * anim;
+    /* 60 */ ProcPtr pQuakePureProc;
+};
+
 struct Unknown_030053E0 {
     u16 u00;
     u16 u02;

diff --git a/include/efxmagic.h b/include/efxmagic.h
@@ -310,11 +310,11 @@ void StartSpellAnimation(struct Anim * anim);
 void sub_805B94C(ProcPtr proc);
 void sub_805B958(struct ProcEfx * proc);
 void NewEfxALPHA(struct Anim * anim, int a, int b, int c, int d, int e);
-// ??? EfxALPHAMain(???);
-// ??? sub_805BB24(???);
-// ??? EfxCircleWINMain(???);
+void EfxALPHAMain(struct ProcEfxALPHA * proc);
+void sub_805BB24(struct Anim * anim, int terminator, u16 * c, u16 d, u16 e);
+void EfxCircleWINMain(struct ProcEfxCircleWIN * proc);
 void StartSpellThing_MagicQuake(struct Anim *, int, int);
-// ??? Loop6C_efxMagicQUAKE(???);
+void Loop6C_efxMagicQUAKE(struct ProcEfxMagicQuake * proc);
 void StartSpellAnimDummy(struct Anim * anim);
 void EfxDummymagicMain(struct ProcEfx * proc);
 void StartSpellAnimHandAxe(struct Anim * anim);

diff --git a/ldscript.txt b/ldscript.txt
@@ -414,7 +414,6 @@ SECTIONS
         asm/code_battleanim.o(.text);
         src/banim-ekrarena.o(.text);
         src/banim-efxmagic.o(.text);
-        asm/banim-efxmagic-util.o(.text);
         src/banim-efxmagic-phywpn.o(.text);
         src/banim-efxmagic-refresh.o(.text);
         src/banim-efxmagic-ballista.o(.text);
@@ -969,7 +968,6 @@ SECTIONS
         . = ALIGN(4); data/banim-efxhitfx.o(.data);
         . = ALIGN(4); data/data_banim_5B9D5C.o(.data);
         . = ALIGN(4); src/banim-efxmagic.o(.data);
-        . = ALIGN(4); data/banim-efxmagic-utils.o(.data);
         . = ALIGN(4); src/banim-efxmagic-phywpn.o(.data);
         . = ALIGN(4); src/banim-efxmagic-refresh.o(.data);
         . = ALIGN(4); src/banim-efxmagic-ballista.o(.data);