PC Screen Effect data

3 files changed, 14 insertions, 32 deletions

diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s
deleted file mode 100644
index 1d6571149..000000000
--- a/data/pc_screen_effect.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gOamData_83D18D8:: @ 83D18D8
-	.2byte 0x4000
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_83D18E0:: @ 83D18E0
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D18E8:: @ 83D18E8
-	.4byte gSpriteAnim_83D18E0
-
-	.align 2
-gUnknownPal_083D18EC::
-	.incbin "graphics/unknown/unknown_3D18EC.gbapal"
-
-	.align 2
-gUnknownGfx_083D190C::
-	.incbin "graphics/unknown/unknown_3D190C.4bpp"
diff --git a/ld_script.txt b/ld_script.txt
index 219dd51ed..e7572c8fc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -600,7 +600,7 @@ SECTIONS {
         data/contest_link_80C2020.o(.rodata);
         src/pokemon_size_record.o(.rodata);
         src/pc_screen_effect.o(.rodata);
-        data/pc_screen_effect.o(.rodata);
+        src/pc_screen_effect.o(.data);
         src/fldeff_secretpower.o(.rodata);
         src/fldeff_decoration.o(.rodata);
         src/fldeff_recordmixing.o(.rodata);
diff --git a/src/pc_screen_effect.c b/src/pc_screen_effect.c
index dcc3bc9c9..cbc050445 100644
--- a/src/pc_screen_effect.c
+++ b/src/pc_screen_effect.c
@@ -11,13 +11,22 @@ void sub_80C6130(struct Sprite *);
 void sub_80C61B0(IntrFunc);
 void ClearGpuRegBits(void);
 
-extern const struct OamData gOamData_83D18D8;
+struct OamData gOamData_83D18D8 = {
+    .shape = ST_OAM_H_RECTANGLE,
+    .size = 1
+};
 
-extern const union AnimCmd *const gSpriteAnimTable_83D18E8[];
+union AnimCmd gSpriteAnim_83D18E0[] = {
+    ANIMCMD_FRAME(0, 5),
+    ANIMCMD_END
+};
 
-extern const u16 gUnknownPal_083D18EC[16];
+const union AnimCmd *gSpriteAnimTable_83D18E8[] = {
+    gSpriteAnim_83D18E0
+};
 
-extern const u8 gUnknownGfx_083D190C[128];
+u16 gUnknownPal_083D18EC[] = INCBIN_U16("graphics/unknown/unknown_3D18EC.gbapal");
+u8 gUnknownGfx_083D190C[] = INCBIN_U8("graphics/unknown/unknown_3D190C.4bpp");
 
 EWRAM_DATA struct PCScreenEffectStruct *gUnknown_020387EC = NULL;