summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorwho-knows-who <j.williams.8@warwick.ac.uk>2018-08-01 22:25:49 +0100
committerwho-knows-who <j.williams.8@warwick.ac.uk>2018-08-01 22:25:49 +0100
commit3abc9e3a7e7eb83e42c1cbcb5a64052b1e693466 (patch)
treebe7626e78ecbfd722bacb403af48b93812e0e659 /src
parent574454555454ecbe0b508c0cf90bea3853ed8d5b (diff)
start
Diffstat (limited to 'src')
-rw-r--r--src/battle/anim/flying.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/battle/anim/flying.c b/src/battle/anim/flying.c
index ca4b61771..957975123 100644
--- a/src/battle/anim/flying.c
+++ b/src/battle/anim/flying.c
@@ -36,8 +36,6 @@ void sub_80DB5E4(struct Sprite *sprite);
void sub_80DA0DC(u8 taskId);
-u32 sub_80DA6F0(u32 a1);
-
const struct SpriteTemplate gBattleAnimSpriteTemplate_83DA380 =
{
.tileTag = 10009,
@@ -699,7 +697,7 @@ void sub_80DA4D8(struct Sprite *sprite ) {
if ((u16)(arg2byte - 64) <= 0x7f){
if (gMain.inBattle) {
- sprite->oam.priority = sub_8079ED4(bank) + 1;
+ sprite->oam.priority = sub_8079ED4(bank) + 1u;
} else {
sprite->oam.priority = sub_8079ED4(bank);
}
@@ -753,3 +751,22 @@ void sub_80DA4D8(struct Sprite *sprite ) {
sprite->callback = (SpriteCallback) sub_80DA6F0;
}
+
+void sub_80DA6F0(struct Sprite *sprite) {
+
+ int r6 = 0;
+ s16* data = sprite->data;
+ u8 dataByte;
+
+ dataByte = (u8)data[0];
+ r7 = 1;
+ r1 = 1;
+ r9 = r1;
+
+ if (dataByte & 1) {
+ r3 = data;
+ dataByte = data[1];
+ data[1] = dataByte + 0xff;
+ }
+
+};