diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-28 21:41:17 -0400 |
| commit | 6235276ca255a2b345c3a97be23c6b53be6eba0f (patch) | |
| tree | 81930ebec5d50f4b44575b28979549c34f2e1b0e /src/pokeblock.c | |
| parent | 170c82f299905b6e55b20a5c2c04f92353131d0e (diff) | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
Merge branch 'master' into daycare
Diffstat (limited to 'src/pokeblock.c')
| -rw-r--r-- | src/pokeblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokeblock.c b/src/pokeblock.c index 029bb066f..d69c41639 100644 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -3,7 +3,7 @@ // #include "global.h" -#include "rom4.h" +#include "overworld.h" #include "sprite.h" #include "script.h" #include "strings.h" @@ -816,7 +816,7 @@ static void sub_810C368(u8 taskId) sub_80F98A4(1); BasicInitMenuWindow(&gWindowConfig_81E6E50); MenuDrawTextWindow(7, v0 + 4, 13, 11); - PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, (const struct MenuAction *)gUnknown_083F7EF4, gUnknown_03000758); + PrintMenuItemsReordered(8, v0 + 5, gUnknown_0203924C, gUnknown_083F7EF4, gUnknown_03000758); InitMenu(0, 8, v0 + 5, gUnknown_0203924C, 0, 5); gScriptItemId = gUnknown_02039248.unk0 + gUnknown_02039248.unk1; gTasks[taskId].func = sub_810C40C; |