Use misc ScrCmd constants
This commit is contained in:
GriffinR
@@ -1,6 +1,7 @@
|
||||
#include "constants/global.h"
|
||||
#include "constants/battle_frontier.h"
|
||||
#include "constants/battle_setup.h"
|
||||
#include "constants/berry.h"
|
||||
#include "constants/contest.h"
|
||||
#include "constants/easy_chat.h"
|
||||
#include "constants/event_objects.h"
|
||||
@@ -851,86 +852,86 @@ Std_MsgboxAutoclose:: @ 8271494
|
||||
return
|
||||
|
||||
EventScript_ResetAllBerries:: @ 827149D
|
||||
setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
|
||||
setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
|
||||
setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
|
||||
setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
|
||||
setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
|
||||
setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
|
||||
setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
|
||||
setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
|
||||
setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
|
||||
setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
|
||||
setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
|
||||
setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
|
||||
setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
|
||||
setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
|
||||
setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), 5
|
||||
setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
|
||||
setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), 5
|
||||
setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
|
||||
setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
|
||||
setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), 5
|
||||
setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
|
||||
setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
|
||||
setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
|
||||
setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
|
||||
setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
|
||||
setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
|
||||
setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
|
||||
setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
|
||||
setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
|
||||
setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
|
||||
setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
|
||||
setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
|
||||
setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
|
||||
setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), 5
|
||||
setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
|
||||
setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
|
||||
setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
|
||||
setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
|
||||
setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
|
||||
setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
|
||||
setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
|
||||
setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
|
||||
setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
|
||||
setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), 5
|
||||
setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
|
||||
setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
|
||||
setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
|
||||
setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
|
||||
setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
|
||||
setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
|
||||
setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
|
||||
setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
|
||||
setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), 5
|
||||
setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), 5
|
||||
setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
|
||||
setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), 5
|
||||
setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), 5
|
||||
setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), 5
|
||||
setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
|
||||
setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), 5
|
||||
setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
|
||||
setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), 5
|
||||
setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
|
||||
setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), 5
|
||||
setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
|
||||
setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
|
||||
setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
|
||||
setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
|
||||
setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
|
||||
setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
|
||||
setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
|
||||
setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), 5
|
||||
setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
|
||||
setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), 5
|
||||
setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
|
||||
setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), 5
|
||||
setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), 5
|
||||
setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), 5
|
||||
setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), 5
|
||||
setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), 5
|
||||
setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
|
||||
setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
|
||||
return
|
||||
|
||||
EventScript_ResetAllMapFlags:: @ 82715DE
|
||||
@@ -5548,17 +5549,17 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
|
||||
goto_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F
|
||||
hideobjectat 2, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
|
||||
setvar VAR_TEMP_4, 1
|
||||
turnobject 255, 2
|
||||
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
|
||||
end
|
||||
|
||||
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F35:: @ 82C3F35
|
||||
setvar VAR_TEMP_4, 1
|
||||
turnobject 255, 2
|
||||
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
|
||||
end
|
||||
|
||||
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3F3F:: @ 82C3F3F
|
||||
setvar VAR_TEMP_4, 1
|
||||
turnobject 255, 2
|
||||
turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
|
||||
hideobjectat 1, MAP_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user