summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Willems (M17.1) <progreon@gmail.com>2018-01-03 20:55:10 +0100
committerMarco Willems (M17.1) <progreon@gmail.com>2018-01-03 20:55:10 +0100
commit6649ab0876f608eedbdc5bff55d4c55593b12122 (patch)
treeb0ee7fe0de6e4da617781f3dfc75da988c49ea07
parent56f960f67679071712dd7d2cd6140eb8833e7344 (diff)
Updated with pull request remarks
-rw-r--r--data/battle_anim_80CA710.s2
-rw-r--r--src/battle/anim/fire.c6
-rw-r--r--src/battle/anim/fire_2.c8
3 files changed, 8 insertions, 8 deletions
diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s
index bd50379b0..4430cd372 100644
--- a/data/battle_anim_80CA710.s
+++ b/data/battle_anim_80CA710.s
@@ -2505,7 +2505,7 @@ gSpriteTemplate_83D96C4:: @ 83D96C4
spr_template 10201, 10201, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58FC
.align 1
-gUnknown_083D96DC:: @ 83D96DC @ holds coords for heated rocks of Move_ERUPTION
+gHeatedRockCoords:: @ 83D96DC
.2byte -2, -5
.2byte -1, -1
.2byte 3, -6
diff --git a/src/battle/anim/fire.c b/src/battle/anim/fire.c
index b71eedcdc..d1ef86731 100644
--- a/src/battle/anim/fire.c
+++ b/src/battle/anim/fire.c
@@ -32,7 +32,7 @@ void sub_80D4F18(struct Sprite *sprite) {
void sub_80D4F5C(struct Sprite *sprite) {
sub_8078650(sprite);
- if (GetBankSide(gAnimBankAttacker) << 24) {
+ if (GetBankSide(gAnimBankAttacker)) {
sprite->pos1.x -= gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
sprite->data[2] = -gBattleAnimArgs[4];
@@ -48,7 +48,7 @@ void sub_80D4F5C(struct Sprite *sprite) {
}
void sub_80D4FCC(struct Sprite *sprite) {
- if (GetBankSide(gAnimBankAttacker) << 24) {
+ if (GetBankSide(gAnimBankAttacker)) {
sprite->pos1.x -= gBattleAnimArgs[0];
sprite->pos1.y += gBattleAnimArgs[1];
sprite->data[2] = gBattleAnimArgs[4];
@@ -75,7 +75,7 @@ void sub_80D5038(struct Sprite *sprite) {
void sub_80D5074(struct Sprite *sprite) {
sub_8078650(sprite);
- if (GetBankSide(gAnimBankAttacker) << 24) {
+ if (GetBankSide(gAnimBankAttacker)) {
sprite->pos1.x -= gBattleAnimArgs[0];
} else {
sprite->pos1.x += gBattleAnimArgs[0];
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c
index d13142941..c68bc51f9 100644
--- a/src/battle/anim/fire_2.c
+++ b/src/battle/anim/fire_2.c
@@ -9,7 +9,7 @@ extern s16 gBattleAnimArgs[];
extern u8 gAnimBankAttacker;
extern u8 gAnimBankTarget;
extern struct SpriteTemplate gSpriteTemplate_83D96C4;
-extern s16 gUnknown_083D96DC[7][2]; // x,y coords for heated rocks of Move_ERUPTION
+extern s16 gHeatedRockCoords[7][2];
void sub_80D5254(struct Sprite *);
void sub_80D5348(struct Sprite *);
@@ -181,7 +181,7 @@ void sub_80D54E0(u8 taskId) { // animate Move_ERUPTION?
}
break;
case 3:
- if (!sub_8079C74(task) << 24) {
+ if (!sub_8079C74(task)) {
sub_80D57C4(task->data[15], taskId, 6);
task->data[0]++;
}
@@ -236,7 +236,7 @@ void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3) {
u16 y = sub_80D5940(spriteId);
u16 x = gSprites[spriteId].pos1.x;
s8 sign;
- if(!GetBankSide(gAnimBankAttacker) << 24) {
+ if(!GetBankSide(gAnimBankAttacker)) {
x -= 0xC;
sign = 1;
} else {
@@ -250,7 +250,7 @@ void sub_80D57C4(u8 spriteId, u8 taskId, u8 a3) {
if (++j >= 5) {
j = 0;
}
- sub_80D5994(&gSprites[spriteId], gUnknown_083D96DC[i][0] * sign, gUnknown_083D96DC[i][1]);
+ sub_80D5994(&gSprites[spriteId], gHeatedRockCoords[i][0] * sign, gHeatedRockCoords[i][1]);
gSprites[spriteId].data[6] = taskId;
gSprites[spriteId].data[7] = a3;
gTasks[taskId].data[a3]++;