summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/pokenav.c17
-rw-r--r--src/use_pokeblock.c26
2 files changed, 27 insertions, 16 deletions
diff --git a/src/pokenav.c b/src/pokenav.c
index f50f039f8..4d1ecf421 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -1,24 +1,9 @@
#include "global.h"
#include "battle.h"
#include "data2.h"
+#include "pokenav.h"
#include "string_util.h"
-struct UnkPokenavStruct_Sub {
- /*0x0*/ u16 unk0;
- /*0x2*/ u8 filler2[6];
-};
-
-
-struct UnkPokenavStruct {
- /*0x0000*/ u8 filler0000[0xCEE8];
- /*0xCEE8*/ struct UnkPokenavStruct_Sub unkCEE8[78];
- /*0xD158*/ u16 unkD158;
-
-};
-
-extern struct UnkPokenavStruct *gUnknown_083DFEC4;
-
-
void sub_80F700C(u8 *arg0, u16 arg1) {
struct Trainer *trainer;
u8 *ptr;
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
new file mode 100644
index 000000000..78415cbd7
--- /dev/null
+++ b/src/use_pokeblock.c
@@ -0,0 +1,26 @@
+//
+// Created by Scott Norton on 5/31/17.
+//
+
+#include "global.h"
+#include "main.h"
+#include "pokemon.h"
+#include "pokenav.h"
+#include "use_pokeblock.h"
+
+asm(".text");
+
+extern struct UnkPokenavStruct_Sub1 *gUnknown_02039304;
+void launch_c3_walk_stairs_and_run_once(void *);
+void sub_8136244(void);
+void sub_8136294(void);
+
+void sub_8136130(u32 a0, u32 a1)
+{
+ gUnknown_02039304 = &gUnknown_083DFEC4->unkD164;
+ gUnknown_02039304->unk8 = a0;
+ gUnknown_02039304->unk4 = a1;
+ gUnknown_083DFEC4->unkD162[0] = 2;
+ launch_c3_walk_stairs_and_run_once(sub_8136294);
+ SetMainCallback2(sub_8136244);
+}