diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-28 17:37:17 -0400 |
| commit | 26a48d7e926d3c7841a28b2af8cbbd170923469e (patch) | |
| tree | fa83e9a7105769c66e3a66b3c6871984293db329 /src/use_pokeblock.c | |
| parent | 39efcb2a6d169fba0ff33f1bd25e2947b74881a0 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into use_pokeblock
Diffstat (limited to 'src/use_pokeblock.c')
| -rw-r--r-- | src/use_pokeblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c index 39003a1e3..fd60d6291 100644 --- a/src/use_pokeblock.c +++ b/src/use_pokeblock.c @@ -4,7 +4,6 @@ #include "global.h" #include "main.h" -#include "asm.h" #include "rom4.h" #include "pokemon.h" #include "pokenav.h" @@ -33,9 +32,10 @@ void sub_81365A0(void); void sub_81365C8(void); void sub_8136638(void); void sub_81368A4(void); +void sub_8089668(void); u8 sub_81370E4(u8); -void sub_8136130(void *a0, void *a1) +void sub_8136130(struct Pokeblock *a0, MainCallback a1) { gUnknown_02039304 = &gUnknown_083DFEC4->unkD164; gUnknown_02039304->unk8 = a0; |