Merge pull request #437 from PikalaxALT/dism-effect-sbin

Effect bg/ob to C

include/graphics_memory.h

@@ -2,7 +2,6 @@
 #define GUARD_GRAPHICS_MEMORY_H
 
 #include "structs/axdata.h"
-#include "structs/str_8009A7C.h"
 
 extern RGB gFontPalette[128];
 
@@ -21,6 +20,6 @@ void ScheduleBgTilemapCopy(u32);
 void DoScheduledMemCopies(void);
 void CopyBgTilemaps0And1(void);
 void SetFontsBaseColor(RGB);
-bool8 sub_8009A7C(struct Struct_8009A7C *a0, s32 a1, s32 a2, s32 a3, bool8 a4, s32 *a5, s16 *a6);
+bool8 sub_8009A7C(struct EfbFileData *a0, s32 a1, s32 a2, s32 a3, bool8 a4, s32 *a5, s16 *a6);
 
 #endif // GUARD_GRAPHICS_MEMORY_H

include/structs/axdata.h

@@ -1,6 +1,7 @@
 #ifndef GUARD_AXDATA_H
 #define GUARD_AXDATA_H
 
+#include "gba/gba.h"
 #include "structs/rgb.h"
 #include "structs/str_file_system.h"
 #include "structs/str_position.h"
@@ -133,8 +134,8 @@ typedef struct Palette256
 // size: 0x20
 typedef struct EfoFileData
 {
-    /* 0x0 */ ax_pose **poses; // TODO: Verify if these fields' names are actually valid
-    /* 0x4 */ ax_anim ***animations;
+    /* 0x0 */ const ax_pose *const *poses; // TODO: Verify if these fields' names are actually valid
+    /* 0x4 */ const ax_anim *const *const *animations;
     /* 0x8 */ s32 animCount;
     /* 0xC */ void *spriteData; // ?
     /* 0x10 */ Palette256 *unk10; // ?
@@ -143,4 +144,13 @@ typedef struct EfoFileData
     /* 0x1C */ s32 tileCount;
 } EfoFileData;
 
+typedef struct EfbFileData
+{
+    s32 frameCount;
+    const u16 *const *frames;
+    s32 tileCount;
+    const u32 *tiles;
+    const RGB *pal;
+} EfbFileData;
+
 #endif // GUARD_AXDATA_H

include/structs/str_8009A7C.h

@@ -1,11 +0,0 @@
-#ifndef GUARD_STR_8009A7C_H
-#define GUARD_STR_8009A7C_H
-
-struct Struct_8009A7C
-{
-    s32 unk0;
-    u16 **unk4;
-    u8 fill8[0x14-0x8];
-};
-
-#endif // GUARD_STR_8009A7C_H