diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:59:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 11:59:37 -0600 |
| commit | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (patch) | |
| tree | 9d04e3c1d115d496af910f2a1714e6e3fe82d77b /src/field/daycare.c | |
| parent | 871ae4c283ec8bc7730df52790b5ca53baa82230 (diff) | |
| parent | 19895d28322609e6f67797bfec9851e0cb5a2182 (diff) | |
Merge pull request #497 from huderlem/script_commands
Port event script names from pokeemerald
Diffstat (limited to 'src/field/daycare.c')
| -rw-r--r-- | src/field/daycare.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/daycare.c b/src/field/daycare.c index 9ac63b3c7..c28bc65ca 100644 --- a/src/field/daycare.c +++ b/src/field/daycare.c @@ -1758,7 +1758,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId) { HandleDestroyMenuCursors(); PlaySE(SE_SELECT); - gLastFieldPokeMenuOpened = gScriptResult = gTasks[taskId].data[0]; + gLastFieldPokeMenuOpened = gSpecialVar_Result = gTasks[taskId].data[0]; DestroyTask(taskId); MenuZeroFillWindowRect(15, 6, 29, 13); EnableBothScriptContexts(); @@ -1766,7 +1766,7 @@ static void HandleDaycareLevelMenuInput(u8 taskId) else if (gMain.newKeys & B_BUTTON) { HandleDestroyMenuCursors(); - gLastFieldPokeMenuOpened = gScriptResult = 2; + gLastFieldPokeMenuOpened = gSpecialVar_Result = 2; DestroyTask(taskId); MenuZeroFillWindowRect(15, 6, 29, 13); EnableBothScriptContexts(); |