diff options
Diffstat (limited to 'src/battle')
-rw-r--r-- | src/battle/anim/fire_2.c | 1 | ||||
-rw-r--r-- | src/battle/anim/ghost.c | 3 | ||||
-rw-r--r-- | src/battle/anim/heal_bell.c | 2 | ||||
-rw-r--r-- | src/battle/anim/musical.c | 2 | ||||
-rw-r--r-- | src/battle/anim/roots.c | 8 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/battle/anim/fire_2.c b/src/battle/anim/fire_2.c index 7ebd7dd87..1d69b2c1c 100644 --- a/src/battle/anim/fire_2.c +++ b/src/battle/anim/fire_2.c @@ -467,6 +467,7 @@ static void sub_80D54E0(u8 taskId) // animate Move_ERUPTION? break; default: + break; } } diff --git a/src/battle/anim/ghost.c b/src/battle/anim/ghost.c index 2b7ff8d95..4dea1ed1d 100644 --- a/src/battle/anim/ghost.c +++ b/src/battle/anim/ghost.c @@ -1145,7 +1145,8 @@ static void sub_80DF0B8(struct Sprite *sprite) if (++coeffB > 16) coeffB = 16; - if (--(s16)coeffA < 0) + --coeffA; + if ((s16)coeffA < 0) coeffA = 0; REG_BLDALPHA = (coeffB << 8) | coeffA; diff --git a/src/battle/anim/heal_bell.c b/src/battle/anim/heal_bell.c index e191460ea..94bf490c2 100644 --- a/src/battle/anim/heal_bell.c +++ b/src/battle/anim/heal_bell.c @@ -76,7 +76,7 @@ void sub_80D1ADC(u8 taskId) { int i; u8 sp[8]; - void* src; + const void* src; void* dest; void* what; sp[0] = IndexOfSpritePaletteTag(0x27DE); diff --git a/src/battle/anim/musical.c b/src/battle/anim/musical.c index 1e559d975..1a58c4daf 100644 --- a/src/battle/anim/musical.c +++ b/src/battle/anim/musical.c @@ -291,7 +291,7 @@ void sub_80CECE8(struct Sprite* sprite) if (GetBattlerSide(gBattleAnimAttacker) == 1) { a = gBattleAnimArgs[1]; - (u16)gBattleAnimArgs[1] = -a; + *(u16*)&gBattleAnimArgs[1] = -a; } sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1]; diff --git a/src/battle/anim/roots.c b/src/battle/anim/roots.c index e0cc441aa..245f201dd 100644 --- a/src/battle/anim/roots.c +++ b/src/battle/anim/roots.c @@ -7,10 +7,10 @@ extern s16 gBattleAnimArgs[]; extern u8 gBattleAnimAttacker; extern u8 gBattleAnimTarget; -IWRAM_DATA u32 filler_03000724; -IWRAM_DATA u16 gUnknown_03000728[4]; -IWRAM_DATA u16 gUnknown_03000730[6]; -IWRAM_DATA u32 filler_0300073c; +BSS_DATA u32 filler_03000724; +BSS_DATA u16 gUnknown_03000728[4]; +BSS_DATA u16 gUnknown_03000730[6]; +BSS_DATA u32 filler_0300073c; void sub_80CB59C(struct Sprite* sprite); void sub_80CB620(struct Sprite *sprite); |