From 729c224bf2421c30e64f2082f19907b5e66b8138 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 18 Feb 2020 16:16:03 -0500 Subject: Name battle scene and map type constants --- src/item_use.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/item_use.c') diff --git a/src/item_use.c b/src/item_use.c index 57771754a..022be5b2b 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -42,7 +42,7 @@ #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" -#include "constants/map_types.h" +#include "constants/maps.h" static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL; -- cgit v1.2.3 From 69d8833b31519208f04444d3393b68a393163aa3 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 13:41:18 -0500 Subject: Prelim names for mvmt actions; merge field_ground_effect into evobjmv --- src/item_use.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/item_use.c') diff --git a/src/item_use.c b/src/item_use.c index 022be5b2b..164ef08b6 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -19,7 +19,7 @@ #include "mail.h" #include "main.h" #include "malloc.h" -#include "event_object_80688E4.h" +#include "event_object_movement.h" #include "event_object_lock.h" #include "metatile_behavior.h" #include "new_menu_helpers.h" -- cgit v1.2.3 From b7c28c4be76f19d3515ede426ae874390523457f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 15:00:56 -0500 Subject: Remove redundant include lines --- src/item_use.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/item_use.c') diff --git a/src/item_use.c b/src/item_use.c index 164ef08b6..f5e880f98 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -19,7 +19,6 @@ #include "mail.h" #include "main.h" #include "malloc.h" -#include "event_object_movement.h" #include "event_object_lock.h" #include "metatile_behavior.h" #include "new_menu_helpers.h" @@ -42,7 +41,6 @@ #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" -#include "constants/maps.h" static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL; -- cgit v1.2.3 From c93915120f23a9545ff0743f506af3d58a1fabff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 27 Feb 2020 11:45:08 -0500 Subject: Port many field_effect.c names from Emerald --- src/item_use.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/item_use.c') diff --git a/src/item_use.c b/src/item_use.c index f5e880f98..ec8155eb1 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -170,7 +170,7 @@ static void sub_80A103C(u8 taskId) static void sub_80A1084(void) { - sub_807DC00(); + FadeInFromBlack(); CreateTask(sub_80A109C, 8); } @@ -223,7 +223,7 @@ static bool8 sub_80A1194(void) { FreezeObjectEvents(); ScriptContext2_Enable(); - sub_807DC00(); + FadeInFromBlack(); CreateTask(sub_80A11C0, 10); gUnknown_2031DE0 = 0; return TRUE; @@ -646,7 +646,7 @@ static void sub_80A1C08(u8 taskId) void sub_80A1C44(u8 taskId) { ResetInitialPlayerAvatarState(); - sub_8085620(); + StartEscapeRopeFieldEffect(); DestroyTask(taskId); } -- cgit v1.2.3 From 6676e5bcb8345eaa2dc1e1999a8de3ac534bfdbf Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 9 Mar 2020 09:43:37 -0400 Subject: Use FADE_TO_BLACK define in other files --- src/item_use.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/item_use.c') diff --git a/src/item_use.c b/src/item_use.c index ec8155eb1..6f81ee0e3 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -41,6 +41,7 @@ #include "constants/maps.h" #include "constants/moves.h" #include "constants/songs.h" +#include "constants/field_weather.h" static EWRAM_DATA void (*sItemUseOnFieldCB)(u8 taskId) = NULL; @@ -456,7 +457,7 @@ void FieldUseFunc_TmCase(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = Task_InitTMCaseFromField; } } @@ -487,7 +488,7 @@ void FieldUseFunc_BerryPouch(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = Task_InitBerryPouchFromField; } } @@ -530,7 +531,7 @@ void FieldUseFunc_TeachyTv(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = Task_InitTeachyTvFromField; } } @@ -660,7 +661,7 @@ void FieldUseFunc_TownMap(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = sub_80A1CC0; } } @@ -692,7 +693,7 @@ void FieldUseFunc_FameChecker(u8 taskId) else { StopPokemonLeagueLightingEffectTask(); - FadeScreen(1, 0); + FadeScreen(FADE_TO_BLACK, 0); gTasks[taskId].func = sub_80A1D68; } } -- cgit v1.2.3