diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/pokemon_storage_system.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/pokemon_storage_system.c')
| -rw-r--r-- | src/pokemon_storage_system.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c index 031f704a4..465b97da2 100644 --- a/src/pokemon_storage_system.c +++ b/src/pokemon_storage_system.c @@ -1,25 +1,25 @@ #include "global.h" -#include "pokemon_storage_system.h" -#include "pokemon.h" -#include "constants/species.h" -#include "event_data.h" -#include "string_util.h" -#include "text.h" -#include "strings.h" -#include "window.h" -#include "menu.h" #include "bg.h" -#include "main.h" -#include "palette.h" -#include "overworld.h" +#include "event_data.h" #include "field_screen.h" #include "field_weather.h" -#include "script.h" +#include "gpu_regs.h" #include "international_string_util.h" -#include "walda_phrase.h" +#include "main.h" +#include "menu.h" +#include "overworld.h" +#include "palette.h" +#include "pokemon.h" +#include "pokemon_storage_system.h" +#include "script.h" #include "sound.h" -#include "gpu_regs.h" +#include "string_util.h" +#include "strings.h" +#include "text.h" +#include "walda_phrase.h" +#include "window.h" #include "constants/songs.h" +#include "constants/species.h" IWRAM_DATA u8 gUnknown_03000F78[0x188]; @@ -270,7 +270,7 @@ void Task_PokemonStorageSystem(u8 taskId) } break; case 2: - task->data[2] = ProcessMenuInput(); + task->data[2] = Menu_ProcessInput(); switch(task->data[2]) { case -2: |