flying

Makefile

@@ -191,6 +191,7 @@ $(C_BUILDDIR)/isagbprn.o: CC1 := tools/agbcc/bin/old_agbcc
 $(C_BUILDDIR)/isagbprn.o: CFLAGS := -mthumb-interwork
 
 #$(C_BUILDDIR)/trainer_tower.o: CFLAGS += -ffreestanding
+$(C_BUILDDIR)/flying.o: CFLAGS += -ffreestanding
 
 ifeq ($(NODEP),1)
 $(C_BUILDDIR)/%.o: c_dep :=

asm/poison.s

@@ -323,4 +323,40 @@ _080B1898: .4byte gBattleAnimAttacker
 _080B189C: .4byte sub_80B18A0
 	thumb_func_end sub_80B1838
 
+	thumb_func_start sub_80B18A0
+sub_80B18A0: @ 80B18A0
+	push {r4,lr}
+	adds r4, r0, 0
+	ldrh r0, [r4, 0x2E]
+	adds r0, 0xB
+	movs r1, 0xFF
+	ands r0, r1
+	strh r0, [r4, 0x2E]
+	movs r1, 0x2E
+	ldrsh r0, [r4, r1]
+	movs r1, 0x4
+	bl Sin
+	strh r0, [r4, 0x24]
+	ldrh r0, [r4, 0x30]
+	adds r0, 0x30
+	strh r0, [r4, 0x30]
+	lsls r0, 16
+	asrs r0, 24
+	negs r0, r0
+	strh r0, [r4, 0x26]
+	adds r0, r4, 0
+	adds r0, 0x3F
+	ldrb r1, [r0]
+	movs r0, 0x20
+	ands r0, r1
+	cmp r0, 0
+	beq _080B18DC
+	adds r0, r4, 0
+	bl DestroyAnimSprite
+_080B18DC:
+	pop {r4}
+	pop {r0}
+	bx r0
+	thumb_func_end sub_80B18A0
+
 	.align 2, 0 @ Don't pad with nop.

data/data_835B488.s

@@ -906,7 +906,7 @@ gUnknown_83E652C:: @ 83E652C
 	.incbin "baserom.gba", 0x3E652C, 0x78
 
 gUnknown_83E65A4:: @ 83E65A4
-	.incbin "baserom.gba", 0x3E65A4, 0x838
+	.incbin "baserom.gba", 0x3E65A4, 0x544
 
 	.section .rodata.83E7CFC
 

graphics/battle_anims/sprites/unk_83E6C18.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+106 148 139
+148 148 255
+189 197 255
+222 222 255
+238 238 255
+238 246 255
+255 255 255
+238 246 255
+255 255 255
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+205 213 255
+205 205 255
+230 230 255

include/battle_anim.h

@@ -80,6 +80,9 @@ extern struct OamData gOamData_83ACA00;
 extern struct OamData gOamData_83ACBC0;
 extern struct OamData gOamData_83ACB00;
 extern struct OamData gOamData_83AC9E0;
+extern struct OamData gOamData_83ACA20;
+extern struct OamData gOamData_83ACA80;
+extern struct OamData gOamData_83ACAA0;
 
 void ClearBattleAnimationVars(void);
 void DoMoveAnim(u16 move);
@@ -284,6 +287,8 @@ void sub_8099A78(u8 taskId);
 void sub_8099BD4(u8 taskId);
 
 // normal.c
+extern const struct SpriteTemplate gUnknown_83E7C98;
+
 u32 UnpackSelectedBattleAnimPalettes(s16 selector);
 void sub_80B9BDC(u8 taskId);
 void sub_80B9CE4(u8 taskId);
@@ -338,8 +343,10 @@ void AnimTask_MetallicShine(u8 taskId);
 void AnimTask_SetGreyscaleOrOriginalPal(u8 taskId);
 void sub_80B8B38(u8 taskId);
 
-// flying.s
+// flying.c
+void sub_80B194C(u8 taskId);
 void sub_80B1D3C(struct Sprite *sprite);
+void sub_80B2868(u8 taskId);
 
 // water.s
 extern const union AnimCmd *const gUnknown_83E5958[];

ld_script.txt

@@ -161,7 +161,7 @@ SECTIONS {
         asm/ice.o(.text);
         asm/fighting.o(.text);
         asm/poison.o(.text);
-        asm/flying.o(.text);
+        src/flying.o(.text);
         src/psychic.o(.text);
         src/bug.o(.text);
         src/rock.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/flying.o(.rodata);
         src/psychic.o(.rodata);
         src/bug.o(.rodata);
         src/rock.o(.rodata);