summaryrefslogtreecommitdiff
path: root/src/braille_puzzles.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/braille_puzzles.c')
-rw-r--r--src/braille_puzzles.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 1493f1793..cf05bdf20 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -1,16 +1,17 @@
#include "global.h"
-#include "event_data.h"
-#include "flags.h"
#include "asm.h"
+#include "event_data.h"
#include "field_camera.h"
#include "field_effect.h"
+#include "flags.h"
#include "map_obj_lock.h"
-#include "sound.h"
+#include "menu.h"
#include "script.h"
#include "songs.h"
+#include "sound.h"
#include "species.h"
#include "task.h"
-#include "menu.h"
+#include "text.h"
extern u8 gPlayerPartyCount;
extern u8 gUnknown_03005CE0;
@@ -103,7 +104,7 @@ bool8 ShouldDoBrailleFlyEffect(void)
if(gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25)
return TRUE;
}
-
+
return FALSE;
}
@@ -116,7 +117,7 @@ void DoBrailleFlyEffect(void)
bool8 FldEff_UseFlyAncientTomb(void)
{
u8 taskId = oei_task_add();
-
+
gTasks[taskId].data[8] = (u32)UseFlyAncientTomb_Callback >> 16;
gTasks[taskId].data[9] = (u32)UseFlyAncientTomb_Callback;
return FALSE;
@@ -204,12 +205,12 @@ void Task_BrailleWait(u8 taskId)
bool32 BrailleWait_CheckButtonPress(void)
{
u16 var = 0xFF;
-
+
if(gSaveBlock2.optionsButtonMode == 1)
var |= 0x300;
if(gSaveBlock2.optionsButtonMode == 2)
var |= 0x200;
-
+
if((var & gMain.newKeys) != FALSE)
return TRUE;
else
@@ -219,7 +220,7 @@ bool32 BrailleWait_CheckButtonPress(void)
void DoSealedChamberShakingEffect1(void)
{
u8 taskId = CreateTask(SealedChamberShakingEffect, 0x9);
-
+
gTasks[taskId].data[1] = 0;
gTasks[taskId].data[2] = 0;
gTasks[taskId].data[4] = 2;
@@ -231,7 +232,7 @@ void DoSealedChamberShakingEffect1(void)
void DoSealedChamberShakingEffect2(void)
{
u8 taskId = CreateTask(SealedChamberShakingEffect, 0x9);
-
+
gTasks[taskId].data[1] = 0;
gTasks[taskId].data[2] = 0;
gTasks[taskId].data[4] = 3;
@@ -243,7 +244,7 @@ void DoSealedChamberShakingEffect2(void)
void SealedChamberShakingEffect(u8 taskId)
{
struct Task *task = &gTasks[taskId];
-
+
task->data[1]++;
if(!(task->data[1] % task->data[5]))