Decompiled fire_2.s

1 files changed, 24 insertions, 25 deletions

diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c
index 41a4a9592..b71eedcdc 100644
--- a/src/battle/anim/fire.c
+++ b/src/battle/anim/fire.c
@@ -11,10 +11,10 @@ void sub_80D50E8(struct Sprite *);
 
 void sub_80D4ED8(struct Sprite *sprite) {
     sprite->data[0] = gBattleAnimArgs[0];
-    sprite->data[1] = 60;
-    sprite->data[2] = 9;
-    sprite->data[3] = 30;
-    sprite->data[4] = 65024;
+    sprite->data[1] = 0x3C;
+    sprite->data[2] = 0x9;
+    sprite->data[3] = 0x1E;
+    sprite->data[4] = 0xFE00;
     StoreSpriteCallbackInData(sprite, DestroyAnimSprite);
     sprite->callback = sub_8078174;
     sub_8078174(sprite);
@@ -33,12 +33,12 @@ void sub_80D4F18(struct Sprite *sprite) {
 void sub_80D4F5C(struct Sprite *sprite) {
     sub_8078650(sprite);
     if (GetBankSide(gAnimBankAttacker) << 24) {
-        sprite->pos1.x = sprite->pos1.x - gBattleAnimArgs[0];
-        sprite->pos1.y = sprite->pos1.y + gBattleAnimArgs[1];
+        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
         sprite->data[2] = -gBattleAnimArgs[4];
     } else {
-        sprite->pos1.x = sprite->pos1.x + gBattleAnimArgs[0];
-        sprite->pos1.y = sprite->pos1.y + gBattleAnimArgs[1];
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
         sprite->data[2] = gBattleAnimArgs[4];
     }
     sprite->data[1] = gBattleAnimArgs[2];
@@ -49,12 +49,12 @@ void sub_80D4F5C(struct Sprite *sprite) {
 
 void sub_80D4FCC(struct Sprite *sprite) {
     if (GetBankSide(gAnimBankAttacker) << 24) {
-        sprite->pos1.x = sprite->pos1.x - gBattleAnimArgs[0];
-        sprite->pos1.y = sprite->pos1.y + gBattleAnimArgs[1];
+        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
         sprite->data[2] = gBattleAnimArgs[4];
     } else {
-        sprite->pos1.x = sprite->pos1.x + gBattleAnimArgs[0];
-        sprite->pos1.y = sprite->pos1.y + gBattleAnimArgs[1];
+        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->pos1.y += gBattleAnimArgs[1];
         sprite->data[2] = -gBattleAnimArgs[4];
     }
     sprite->data[1] = gBattleAnimArgs[2];
@@ -64,10 +64,9 @@ void sub_80D4FCC(struct Sprite *sprite) {
 }
 
 void sub_80D5038(struct Sprite *sprite) {
-    sprite->data[0]++;
-    if (sprite->data[0] < sprite->data[4]) {
-        sprite->pos2.x = sprite->pos2.x + sprite->data[2];
-        sprite->pos2.y = sprite->pos2.y + sprite->data[3];
+    if (++sprite->data[0] < sprite->data[4]) {
+        sprite->pos2.x += sprite->data[2];
+        sprite->pos2.y += sprite->data[3];
     }
     if (sprite->data[0] == sprite->data[1]) {
         move_anim_8074EE0(sprite);
@@ -77,12 +76,12 @@ void sub_80D5038(struct Sprite *sprite) {
 void sub_80D5074(struct Sprite *sprite) {
     sub_8078650(sprite);
     if (GetBankSide(gAnimBankAttacker) << 24) {
-        sprite->pos1.x = sprite->pos1.x - gBattleAnimArgs[0];
+        sprite->pos1.x -= gBattleAnimArgs[0];
     } else {
-        sprite->pos1.x = sprite->pos1.x + gBattleAnimArgs[0];
+        sprite->pos1.x += gBattleAnimArgs[0];
         sprite->subpriority = 8;
     }
-    sprite->pos1.y = sprite->pos1.y + gBattleAnimArgs[1];
+    sprite->pos1.y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[4];
@@ -94,17 +93,17 @@ void sub_80D5074(struct Sprite *sprite) {
 
 void sub_80D50E8(struct Sprite *sprite) {
     if (sprite->data[3]) {
-        if(sprite->data[5] > 0x00002710) {
+        if(sprite->data[5] > 10000) {
             sprite->subpriority = 1;
         }
         sprite->pos2.x = Sin(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8));
         sprite->pos2.y = Cos(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8));
-        sprite->data[0] = sprite->data[0] + sprite->data[2];
-        sprite->data[5] = sprite->data[5] + sprite->data[4];
-        if (sprite->data[0] > 255) {
-            sprite->data[0] = sprite->data[0] - 256;
+        sprite->data[0] += sprite->data[2];
+        sprite->data[5] += sprite->data[4];
+        if (sprite->data[0] > 0xFF) {
+            sprite->data[0] -= 0x100;
         } else if (sprite->data[0] < 0) {
-            sprite->data[0] = sprite->data[0] + 256;
+            sprite->data[0] += 0x100;
         }
         sprite->data[3]--;
     } else {