diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-09-13 11:01:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 11:01:47 -0500 |
| commit | c1c2015f7046676b043641c0d1f9d9e29bc73647 (patch) | |
| tree | cbea3afbcdad3d6bcc178ae4abffa9bbe88549f7 /src/pokeblock.c | |
| parent | 37cf3484223366ee381f15d9a2cfeaf3612fd228 (diff) | |
| parent | 9e9c40214f7672662820636167d2cc1469ca2ba1 (diff) | |
Merge pull request #430 from camthesaxman/scrcmd_renaming
(don't merge yet) rename script commands
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; |