diff options
| author | Evan <eroelke@gmail.com> | 2019-12-05 14:33:45 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-05 14:33:45 -0700 |
| commit | 646f34f9811201c1e299756cf71991e2bee50a8e (patch) | |
| tree | c3cd3e06a125a5608232e91de350ce8f31197090 | |
| parent | dc7c82edaa70a90ad10b71a2fec2c3cebe477a6b (diff) | |
format fix
| -rw-r--r-- | src/battle_anim_effects_3.c | 3 | ||||
| -rw-r--r-- | sym_common.txt | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index c9c906778..f4e7da1b4 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -2320,7 +2320,6 @@ void AnimTask_MorningSunLightBeam(u8 taskId) gTasks[taskId].data[0]++; PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); break; - break; case 1: if (gTasks[taskId].data[4]++ > 0) { @@ -2329,7 +2328,6 @@ void AnimTask_MorningSunLightBeam(u8 taskId) gTasks[taskId].data[1] = 12; SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1])); - if (gTasks[taskId].data[1] == 12) gTasks[taskId].data[0]++; } @@ -2339,7 +2337,6 @@ void AnimTask_MorningSunLightBeam(u8 taskId) gTasks[taskId].data[1] = 0; SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1])); - if (!gTasks[taskId].data[1]) { gBattle_BG1_X = gMorningSunLightBeamCoordsTable[gTasks[taskId].data[2]] + gTasks[taskId].data[10]; diff --git a/sym_common.txt b/sym_common.txt index a2c5d4bad..9a64a9d0f 100644 --- a/sym_common.txt +++ b/sym_common.txt @@ -98,8 +98,8 @@ gUnknown_3005354: @ 3005354 .include "evolution_scene.o" .align 2 .include "save.o" - .align 2 + .align 2 gUnknown_3005424: @ 3005424 .space 0x4 |