dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format fix

Browse Source
This commit is contained in:
Evan
2019-12-05 14:33:45 -07:00
parent dc7c82edaa
commit 646f34f981
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim_effects_3.c
-3
View File
@@ -2320,7 +2320,6 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER)); PlaySE12WithPanning(SE_W234, BattleAnimAdjustPanning(SOUND_PAN_ATTACKER));
break; break;
break;
case 1: case 1:
if (gTasks[taskId].data[4]++ > 0) if (gTasks[taskId].data[4]++ > 0)
{ {
@@ -2329,7 +2328,6 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
gTasks[taskId].data[1] = 12; gTasks[taskId].data[1] = 12;
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1])); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1]));
if (gTasks[taskId].data[1] == 12) if (gTasks[taskId].data[1] == 12)
gTasks[taskId].data[0]++; gTasks[taskId].data[0]++;
} }
@@ -2339,7 +2337,6 @@ void AnimTask_MorningSunLightBeam(u8 taskId)
gTasks[taskId].data[1] = 0; gTasks[taskId].data[1] = 0;
SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1])); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(gTasks[taskId].data[1], 16 - gTasks[taskId].data[1]));
if (!gTasks[taskId].data[1]) if (!gTasks[taskId].data[1])
{ {
gBattle_BG1_X = gMorningSunLightBeamCoordsTable[gTasks[taskId].data[2]] + gTasks[taskId].data[10]; gBattle_BG1_X = gMorningSunLightBeamCoordsTable[gTasks[taskId].data[2]] + gTasks[taskId].data[10];
sym_common.txt
+1 -1
View File
@@ -98,8 +98,8 @@ gUnknown_3005354: @ 3005354
.include "evolution_scene.o" .include "evolution_scene.o"
.align 2 .align 2
.include "save.o" .include "save.o"
.align 2
.align 2
gUnknown_3005424: @ 3005424 gUnknown_3005424: @ 3005424
.space 0x4 .space 0x4