Merge pull request #596 from Eebit/banim-efxbattle

Decompile banim-efxbattle
FireEmblemUniverse · Mar 24, 2024 · 4b26ffa · 4b26ffa
2 parents 722f361 + 76e2ecb
commit 4b26ffa
Show file tree

Hide file tree

Showing 8 changed files with 1,367 additions and 1,583 deletions.
diff --git a/asm/banim-efxbattle.s b/asm/banim-efxbattle.s
diff --git a/data/const_data_DA3A4.s b/data/const_data_DA3A4.s
diff --git a/data/data_banim_5B93D0.s b/data/data_banim_5B93D0.s
diff --git a/include/efxbattle.h b/include/efxbattle.h
@@ -2498,20 +2498,63 @@ void NewEfxNoDamageYure(struct Anim * anim1, struct Anim * anim2);
 void EfxNoDamageYureMain(struct ProcEfxHPBar * proc);
 void NewEfxStatusCHG(struct Anim * anim);
 void EfxStatusCHGMain(struct ProcEfxHPBar * proc);
-void NewEfxFarAttackWithDistance(struct Anim * anim, int arg);
-// ??? sub_80534AC(???);
-// ??? sub_80534E4(???);
-// ??? sub_8053514(???);
-// ??? sub_8053584(???);
-void sub_8053618();
+
+/* banim-efxfarattack.h */
+
+struct ProcEfxFarAttack
+{
+    /* 00 */ PROC_HEADER;
+    /* 29 */ u8 unk_29;
+    /* 2A */ u16 unk_2a;
+    /* 2C */ s16 unk_2c;
+    /* 2E */ s16 unk_2e;
+    /* 30 */ s16 unk_30;
+    /* 32 */ s16 unk_32;
+    /* 34 */ s16 unk_34;
+    /* 36 */ s16 unk_36;
+    /* 38 */ s16 unk_38;
+};
+
+void NewEfxFarAttackWithDistance(struct Anim * anim, s16 arg);
+void sub_80534AC(struct ProcEfxFarAttack * unused, int x);
+void sub_80534E4(struct ProcEfxFarAttack * proc);
+void sub_8053514(struct ProcEfxFarAttack * proc);
+void sub_8053584(struct ProcEfxFarAttack * proc);
+void sub_8053618(int);
+
+/* banim-efxquake.h */
+
+struct EfxQuakeProc
+{
+    /* 00 */ PROC_HEADER;
+    /* 29 */ u8 unk_29;
+    /* 2A */ u8 unk_2a;
+    /* 2C */ s16 unk_2c;
+    /* 30 */ int unk_30;
+    /* 34 */ s16 unk_34;
+    /* 36 */ s16 unk_36;
+    /* 38 */ s16 unk_38;
+    /* 3A */ s16 unk_3a;
+    /* 3C */ s16 unk_3c;
+    /* 3E */ s16 unk_3e;
+    /* 40 */ int unk_40;
+    /* 44 */ const s16 * unk_44;
+    /* 48 */ int unk_48;
+    /* 4C */ STRUCT_PAD(0x4C, 0x5C);
+    /* 5C */ struct Anim * unk_5c;
+    /* 60 */ struct Anim * unk_60;
+    /* 64 */ struct Anim * unk_64;
+};
+
 ProcPtr NewEfxQuakePure(int, int);
-// ??? sub_80536B8(???);
-// ??? NewEfxHitQuakePure(???);
-// ??? nullsub_56(???);
+void efxQuakePure_Loop(struct EfxQuakeProc * proc);
+ProcPtr NewEfxHitQuakePure(void);
+void efxHitQuakePure_Loop_Null(void);
 ProcPtr NewEfxQuake(int);
-// ??? sub_805382C(???);
-void NewEfxHitQuake(struct Anim * anim1, struct Anim * anim2, int);
-// ??? sub_8053BBC(???);
+void efxQuake_Loop(struct EfxQuakeProc * proc);
+void NewEfxHitQuake(struct Anim * anim1, struct Anim * anim2, int kind);
+void efxHitQuake_Loop(struct EfxQuakeProc * proc);
+
 void NewEfxFlashBgWhite(struct Anim * anim, int duartion);
 void NewEfxFlashBgRed(struct Anim * anim, int duartion);
 void NewEfxFlashBgBlack(struct Anim * anim, int duartion);

diff --git a/include/ekrbattle.h b/include/ekrbattle.h
@@ -85,7 +85,7 @@ struct ProcEfxSpdQuake {
     /* 29 */ STRUCT_PAD(0x29, 0x2C);
     /* 2C */ s16 timer;
     /* 2E */ STRUCT_PAD(0x2E, 0x44);
-    /* 44 */ struct Vec2 *vecs;
+    /* 44 */ const s16 * vecs;
     /* 48 */ STRUCT_PAD(0x48, 0x5C);
     /* 5C */ struct Anim * anim;
 };
@@ -529,10 +529,10 @@ extern struct ProcCmd ProcScr_efxDeadPika[];
 extern struct ProcCmd ProcScr_efxDeadAlpha[];
 extern struct ProcCmd ProcScr_efxDeadDragonAlpha[];
 extern struct ProcCmd gProc_efxFarAttack[];
-extern struct ProcCmd gProc_efxQuakePure[];
+extern struct ProcCmd ProcScr_efxQuakePure[];
 // extern ??? gUnknown_085B9804
 extern struct ProcCmd ProcScr_EfxHitQuakePure[];
-extern struct ProcCmd gProc_efxQuake[];
+extern struct ProcCmd ProcScr_efxQuake[];
 extern struct ProcCmd ProcScr_EfxHitQuake[];
 extern struct ProcCmd ProcScr_efxFlashBG[];
 extern struct ProcCmd ProcScr_efxWhiteOUT[];
@@ -574,9 +574,9 @@ extern struct ProcCmd gProc_ekrTogiColor[];
 
 extern const s16 gEfxNoDmgBgShakeOff[];
 // extern ??? gUnknown_080DA4BA
-extern CONST_DATA struct Vec2 gEfxQuakeVecs[];
+extern const s16 gEfxQuakeVecs[];
 // extern ??? gUnknown_080DA526
-extern CONST_DATA struct Vec2 gEfxQuakeVecs2[];
+extern const s16 gEfxQuakeVecs2[];
 // extern ??? gUnknown_080DA5BA
 // extern ??? gUnknown_080DA604
 // extern ??? gUnknown_080DA66E
@@ -986,8 +986,8 @@ void sub_805AA28(struct AnimBuffer * pAnimBuf);
 // void sub_805AA68(void *);
 // void sub_805AE14(void *);
 // void sub_805AE40(void *, s16, s16, s16, s16);
-// ??? sub_805AE58(???);
-// ??? sub_805AFA0(???);
+void sub_805AE58(void *);
+void sub_805AFA0(int, s16);
 
 struct ProcEkrTogi
 {

diff --git a/ldscript.txt b/ldscript.txt
@@ -410,7 +410,7 @@ SECTIONS
         src/banim-ekrdispup.o(.text);
         src/banim-efxhpbar.o(.text);
         src/banim-efxdeath.o(.text);
-        asm/banim-efxbattle.o(.text);
+        src/banim-efxbattle.o(.text);
         src/banim-efxflashbg.o(.text);
         src/banim-efxflashunit.o(.text);
         src/banim-efxstatusunit.o(.text);
@@ -723,7 +723,7 @@ SECTIONS
         . = ALIGN(4); src/banim-ekrdispup.o(.rodata);
         . = ALIGN(4); src/banim-efxhpbar.o(.rodata);
         . = ALIGN(4); src/banim-efxdeath.o(.rodata);
-        . = ALIGN(4); data/const_data_DA3A4.o(.rodata);
+        . = ALIGN(4); src/banim-efxbattle.o(.rodata);
         . = ALIGN(4); src/banim-efxflashbg.o(.rodata);
         . = ALIGN(4); src/banim-efxflashunit.o(.rodata);
         . = ALIGN(4); src/banim-efxstatusunit.o(.rodata);
@@ -965,7 +965,7 @@ SECTIONS
         . = ALIGN(4); src/banim-ekrdispup.o(.data);
         . = ALIGN(4); src/banim-efxhpbar.o(.data);
         . = ALIGN(4); src/banim-efxdeath.o(.data);
-        . = ALIGN(4); data/data_banim_5B93D0.o(.data);
+        . = ALIGN(4); src/banim-efxbattle.o(.data);
         . = ALIGN(4); src/banim-efxflashbg.o(.data);
         . = ALIGN(4); src/banim-efxflashunit.o(.data);
         . = ALIGN(4); src/banim-efxstatusunit.o(.data);