psychic

data/data_835B488.s

@@ -906,22 +906,7 @@ gUnknown_83E652C:: @ 83E652C
 	.incbin "baserom.gba", 0x3E652C, 0x78
 
 gUnknown_83E65A4:: @ 83E65A4
-	.incbin "baserom.gba", 0x3E65A4, 0xA4C
-
-gUnknown_83E6FF0:: @ 83E6FF0
-	.incbin "baserom.gba", 0x3E6FF0, 0x1C
-
-gUnknown_83E700C:: @ 83E700C
-	.incbin "baserom.gba", 0x3E700C, 0x20
-
-gUnknown_83E702C:: @ 83E702C
-	.incbin "baserom.gba", 0x3E702C, 0x18
-
-gUnknown_83E7044:: @ 83E7044
-	.incbin "baserom.gba", 0x3E7044, 0xD0
-
-gUnknown_83E7114:: @ 83E7114
-	.incbin "baserom.gba", 0x3E7114, 0xD4
+	.incbin "baserom.gba", 0x3E65A4, 0x838
 
 	.section .rodata.83E7CFC
 

include/battle_anim.h

@@ -78,6 +78,8 @@ extern struct OamData gOamData_83ACB50;
 extern struct OamData gOamData_83ACAB8;
 extern struct OamData gOamData_83ACA00;
 extern struct OamData gOamData_83ACBC0;
+extern struct OamData gOamData_83ACB00;
+extern struct OamData gOamData_83AC9E0;
 
 void ClearBattleAnimationVars(void);
 void DoMoveAnim(u16 move);
@@ -316,8 +318,13 @@ void AnimTask_GetSeismicTossDamageLevel(u8 taskId);
 void sub_80B5188(u8 taskId);
 void sub_80B51EC(u8 taskId);
 
-// flying.s
-void sub_80B1D3C(struct Sprite *sprite);
+// psychic.c
+void sub_80B3418(u8 taskId);
+void sub_80B3480(u8 taskId);
+void sub_80B3584(u8 taskId);
+void sub_80B3834(u8 taskId);
+void sub_80B3A58(u8 taskId);
+void sub_80B3C78(u8 taskId);
 
 // dark.c
 void sub_80B78E0(u8 taskId);
@@ -331,6 +338,9 @@ void AnimTask_MetallicShine(u8 taskId);
 void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId);
 void sub_80B8B38(u8 taskId);
 
+// flying.s
+void sub_80B1D3C(struct Sprite *sprite);
+
 // battle_anim_utility_funcs.c
 void sub_80BA7F8(u8 taskId);
 void sub_80BA83C(u8 taskId);

include/sprite.h

@@ -116,6 +116,7 @@ union AffineAnimCmd
     struct AffineAnimFrameCmd frame;
     struct AffineAnimLoopCmd loop;
     struct AffineAnimJumpCmd jump;
+    struct AffineAnimEndCmdAlt end;
 };
 
 #define AFFINEANIMCMDTYPE_LOOP 0x7FFD

ld_script.txt

@@ -162,7 +162,7 @@ SECTIONS {
         asm/fighting.o(.text);
         asm/poison.o(.text);
         asm/flying.o(.text);
-        asm/psychic.o(.text);
+        src/psychic.o(.text);
         src/bug.o(.text);
         src/rock.o(.text);
         src/ghost.o(.text);
@@ -423,6 +423,7 @@ SECTIONS {
         src/battle_anim_mon_movement.o(.rodata);
         src/item.o(.rodata);
         data/data_835B488.o(.rodata.83DF09C);
+        src/psychic.o(.rodata);
         src/bug.o(.rodata);
         src/rock.o(.rodata);
         src/ghost.o(.rodata);

src/bug.c

@@ -17,7 +17,6 @@ static void sub_80B42E8(struct Sprite *sprite);
 static void sub_80B4344(struct Sprite *sprite);
 static void AnimMissileArcStep(struct Sprite *sprite);
 
-
 static const union AffineAnimCmd gUnknown_83E71E8[] =
 {
     AFFINEANIMCMD_FRAME(0x100, 0x100, 30, 0),