summaryrefslogtreecommitdiff
path: root/src/braille_puzzles.c
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2017-03-22 02:01:55 -0400
committerGitHub <noreply@github.com>2017-03-22 02:01:55 -0400
commite3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (patch)
tree291912dbcf0f77d6c88b7e691efa18dcd9d4bc53 /src/braille_puzzles.c
parent515ae5e00f2661559583a4720d9944755e23d141 (diff)
parentd507cdcebb39e2ec43c4d0f756570a5734fcb42e (diff)
Merge pull request #241 from ProjectRevoTPP/master
decompile fldeff_cut.c, script_pokemon_util_80C4BF0.c, document save.c, move data to C files, decompile the next 3 functions in item_use.c, and a lot of labeling
Diffstat (limited to 'src/braille_puzzles.c')
-rw-r--r--src/braille_puzzles.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 8bbd1ce13..94643691c 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -12,19 +12,15 @@
#include "species.h"
#include "task.h"
#include "text.h"
+#include "braille_puzzles.h"
+#include "rom6.h"
extern u8 gPlayerPartyCount;
-extern u8 gUnknown_03005CE0;
+extern u8 gLastFieldPokeMenuOpened;
extern u32 gUnknown_0202FF84[];
-extern u8 gUnknown_0815EF19[];
-
-void UseFlyAncientTomb_Callback(void);
-void UseFlyAncientTomb_Finish(void);
-void Task_BrailleWait(u8 taskId);
-bool32 BrailleWait_CheckButtonPress(void);
-void SealedChamberShakingEffect(u8 taskId);
+extern u8 gIslandCave_EventScript_OpenRegiiceChamber[]; // regiice event script
bool8 ShouldDoBrailleDigEffect(void)
{
@@ -110,7 +106,7 @@ bool8 ShouldDoBrailleFlyEffect(void)
void DoBrailleFlyEffect(void)
{
- gUnknown_0202FF84[0] = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(0x3C);
}
@@ -196,7 +192,7 @@ void Task_BrailleWait(u8 taskId)
break;
case 4:
sub_8064E2C();
- ScriptContext1_SetupScript(gUnknown_0815EF19);
+ ScriptContext1_SetupScript(gIslandCave_EventScript_OpenRegiiceChamber);
DestroyTask(taskId);
break;
}