Sync new_game.inc

13 files changed, 283 insertions, 495 deletions

diff --git a/constants/berry_constants.inc b/constants/berry_constants.inc
deleted file mode 100644
index 2ecd7ac36..000000000
--- a/constants/berry_constants.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-	.set BERRY_FIRMNESS_UNKNOWN,    0
-	.set BERRY_FIRMNESS_VERY_SOFT,  1
-	.set BERRY_FIRMNESS_SOFT,       2
-	.set BERRY_FIRMNESS_HARD,       3
-	.set BERRY_FIRMNESS_VERY_HARD,  4
-	.set BERRY_FIRMNESS_SUPER_HARD, 5
diff --git a/constants/constants.inc b/constants/constants.inc
index 47d8d2aa4..6eeef5f2b 100644
--- a/constants/constants.inc
+++ b/constants/constants.inc
@@ -3,7 +3,6 @@
 	.include "constants/contest_constants.inc"
 	.include "constants/item_data_constants.inc"
 	.include "constants/trainer_constants.inc"
-	.include "constants/berry_constants.inc"
 	.include "constants/version.inc"
 	.include "constants/battle.inc"
 	.include "constants/battle_text.inc"
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 4d96e181c..ee0452ccd 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -16,6 +16,7 @@
 #include "constants/battle_setup.h"
 #include "constants/map_scripts.h"
 #include "constants/pokemon.h"
+#include "constants/berry.h"
 	.include "include/macros.inc"
 	.include "include/macros/event.inc"
 	.include "constants/constants.inc"
@@ -713,225 +714,7 @@ UnknownString_819C21F: @ 819C21F
 
 	.include "data/scripts/std_msgbox.inc"
 	.include "data/scripts/trainer_battle.inc"
-
-Event_ResetBerryTrees: @ 19F940
-	setberrytree 2, 7, 5
-	setberrytree 1, 3, 5
-	setberrytree 11, 7, 5
-	setberrytree 13, 3, 5
-	setberrytree 4, 7, 5
-	setberrytree 76, 1, 5
-	setberrytree 8, 1, 5
-	setberrytree 10, 6, 5
-	setberrytree 25, 20, 5
-	setberrytree 26, 2, 5
-	setberrytree 66, 2, 5
-	setberrytree 67, 20, 5
-	setberrytree 69, 22, 5
-	setberrytree 70, 22, 5
-	setberrytree 71, 22, 5
-	setberrytree 55, 17, 5
-	setberrytree 56, 17, 5
-	setberrytree 5, 1, 5
-	setberrytree 6, 6, 5
-	setberrytree 7, 1, 5
-	setberrytree 16, 18, 5
-	setberrytree 17, 18, 5
-	setberrytree 18, 18, 5
-	setberrytree 29, 19, 5
-	setberrytree 28, 19, 5
-	setberrytree 27, 19, 5
-	setberrytree 24, 4, 5
-	setberrytree 23, 3, 5
-	setberrytree 22, 3, 5
-	setberrytree 21, 4, 5
-	setberrytree 19, 16, 5
-	setberrytree 20, 16, 5
-	setberrytree 80, 7, 5
-	setberrytree 81, 7, 5
-	setberrytree 77, 8, 5
-	setberrytree 78, 8, 5
-	setberrytree 68, 8, 5
-	setberrytree 31, 10, 5
-	setberrytree 33, 10, 5
-	setberrytree 34, 21, 5
-	setberrytree 35, 21, 5
-	setberrytree 36, 21, 5
-	setberrytree 83, 24, 5
-	setberrytree 84, 24, 5
-	setberrytree 85, 10, 5
-	setberrytree 86, 6, 5
-	setberrytree 37, 5, 5
-	setberrytree 38, 5, 5
-	setberrytree 39, 5, 5
-	setberrytree 40, 3, 5
-	setberrytree 41, 3, 5
-	setberrytree 42, 3, 5
-	setberrytree 46, 19, 5
-	setberrytree 45, 20, 5
-	setberrytree 44, 18, 5
-	setberrytree 43, 16, 5
-	setberrytree 47, 8, 5
-	setberrytree 48, 5, 5
-	setberrytree 49, 4, 5
-	setberrytree 50, 2, 5
-	setberrytree 52, 18, 5
-	setberrytree 53, 18, 5
-	setberrytree 62, 6, 5
-	setberrytree 64, 6, 5
-	setberrytree 58, 21, 5
-	setberrytree 59, 21, 5
-	setberrytree 60, 25, 5
-	setberrytree 61, 25, 5
-	setberrytree 79, 23, 5
-	setberrytree 14, 23, 5
-	setberrytree 15, 21, 5
-	setberrytree 30, 21, 5
-	setberrytree 65, 25, 5
-	setberrytree 72, 25, 5
-	setberrytree 73, 23, 5
-	setberrytree 74, 23, 5
-	setberrytree 87, 3, 5
-	setberrytree 88, 10, 5
-	setberrytree 89, 4, 5
-	setberrytree 82, 36, 5
-	return
-
-gUnknown_0819FA81:: @ 819FA81
-	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
-	setflag FLAG_HIDE_VICTORIA_WINSTRATE
-	setflag FLAG_HIDE_VIVI_WINSTRATE
-	setflag FLAG_HIDE_VICKI_WINSTRATE
-	setflag FLAG_HIDE_BIRCH_IN_LAB
-	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
-	setflag FLAG_HIDE_WALLY_PETALBURG
-	setflag FLAG_UNKNOWN_363
-	setflag FLAG_HIDE_GRUNT_RUSTBORO
-	setflag FLAG_HIDE_DEVON_RUSTBORO
-	setflag FLAG_HIDE_RIVAL_RUSTBORO
-	setflag FLAG_HIDE_FAT_MAN_LITTLEROOT
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
-	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
-	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
-	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
-	setflag FLAG_UNKNOWN_2E1
-	setflag FLAG_UNKNOWN_2EB
-	setflag FLAG_UNKNOWN_2EC
-	setflag FLAG_UNKNOWN_2ED
-	setflag FLAG_UNKNOWN_2F4
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
-	setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
-	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
-	setflag FLAG_UNKNOWN_30E
-	setflag FLAG_UNKNOWN_30F
-	setflag FLAG_HIDE_NORMAN_LITTLEROOT
-	setflag FLAG_HIDE_MAY_PICHU_DOLL
-	setflag FLAG_HIDE_FANCLUB_OLD_LADY
-	setflag FLAG_HIDE_FANCLUB_BOY
-	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
-	setflag FLAG_HIDE_FANCLUB_LADY
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
-	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
-	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
-	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
-	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
-	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
-	setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
-	setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
-	setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
-	setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
-	setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
-	setflag FLAG_HIDE_WALLY_PETALBURG_GYM
-	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
-	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
-	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
-	setflag FLAG_UNKNOWN_337
-	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
-	setflag FLAG_UNKNOWN_34B
-	setflag FLAG_UNKNOWN_34C
-	setflag FLAG_UNKNOWN_34F
-	setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
-	setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
-	setflag FLAG_HIDE_STERN_SLATEPORT
-	setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_RIVAL_ROUTE119
-	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
-	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
-	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
-	setflag FLAG_HIDE_LANETTE
-	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
-	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
-	setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_BRINEY_ROUTE116
-	setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
-	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
-	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	setflag FLAG_HIDE_MOM_LITTLEROOT
-	setflag FLAG_HIDE_MOM_UPSTAIRS
-	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
-	setflag FLAG_UNKNOWN_BIRCH_380
-	setflag FLAG_HIDE_BIRCH_ROUTE101
-	setflag FLAG_HIDE_BIRCH_ROUTE103
-	setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
-	setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
-	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
-	setflag FLAG_UNKNOWN_393
-	setflag FLAG_HIDE_WATTSON_MAUVILLE
-	setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
-	setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
-	setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
-	setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
-	setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
-	setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
-	setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
-	setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
-	setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
-	setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
-	setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
-	setflag FLAG_HIDE_STEVEN_ROUTE128
-	setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
-	setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
-	setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
-	setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
-	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
-	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
-	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
-	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
-	setflag FLAG_HIDE_STEVENS_LETTER
-	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
-	setflag FLAG_HIDE_BOY_ROUTE101
-	call Event_ResetBerryTrees
-	end
+	.include "data/scripts/new_game.inc"
 
 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 0d2f8fe2e..1f92add45 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -16,6 +16,7 @@
 #include "constants/battle_setup.h"
 #include "constants/map_scripts.h"
 #include "constants/pokemon.h"
+#include "constants/berry.h"
 	.include "include/macros.inc"
 	.include "include/macros/event.inc"
 	.include "constants/constants.inc"
@@ -712,225 +713,7 @@ UnknownString_819C21F: @ 819C21F
 
 	.include "data/scripts/std_msgbox.inc"
 	.include "data/scripts/trainer_battle.inc"
-
-Event_ResetBerryTrees: @ 19F940
-	setberrytree 2, 7, 5
-	setberrytree 1, 3, 5
-	setberrytree 11, 7, 5
-	setberrytree 13, 3, 5
-	setberrytree 4, 7, 5
-	setberrytree 76, 1, 5
-	setberrytree 8, 1, 5
-	setberrytree 10, 6, 5
-	setberrytree 25, 20, 5
-	setberrytree 26, 2, 5
-	setberrytree 66, 2, 5
-	setberrytree 67, 20, 5
-	setberrytree 69, 22, 5
-	setberrytree 70, 22, 5
-	setberrytree 71, 22, 5
-	setberrytree 55, 17, 5
-	setberrytree 56, 17, 5
-	setberrytree 5, 1, 5
-	setberrytree 6, 6, 5
-	setberrytree 7, 1, 5
-	setberrytree 16, 18, 5
-	setberrytree 17, 18, 5
-	setberrytree 18, 18, 5
-	setberrytree 29, 19, 5
-	setberrytree 28, 19, 5
-	setberrytree 27, 19, 5
-	setberrytree 24, 4, 5
-	setberrytree 23, 3, 5
-	setberrytree 22, 3, 5
-	setberrytree 21, 4, 5
-	setberrytree 19, 16, 5
-	setberrytree 20, 16, 5
-	setberrytree 80, 7, 5
-	setberrytree 81, 7, 5
-	setberrytree 77, 8, 5
-	setberrytree 78, 8, 5
-	setberrytree 68, 8, 5
-	setberrytree 31, 10, 5
-	setberrytree 33, 10, 5
-	setberrytree 34, 21, 5
-	setberrytree 35, 21, 5
-	setberrytree 36, 21, 5
-	setberrytree 83, 24, 5
-	setberrytree 84, 24, 5
-	setberrytree 85, 10, 5
-	setberrytree 86, 6, 5
-	setberrytree 37, 5, 5
-	setberrytree 38, 5, 5
-	setberrytree 39, 5, 5
-	setberrytree 40, 3, 5
-	setberrytree 41, 3, 5
-	setberrytree 42, 3, 5
-	setberrytree 46, 19, 5
-	setberrytree 45, 20, 5
-	setberrytree 44, 18, 5
-	setberrytree 43, 16, 5
-	setberrytree 47, 8, 5
-	setberrytree 48, 5, 5
-	setberrytree 49, 4, 5
-	setberrytree 50, 2, 5
-	setberrytree 52, 18, 5
-	setberrytree 53, 18, 5
-	setberrytree 62, 6, 5
-	setberrytree 64, 6, 5
-	setberrytree 58, 21, 5
-	setberrytree 59, 21, 5
-	setberrytree 60, 25, 5
-	setberrytree 61, 25, 5
-	setberrytree 79, 23, 5
-	setberrytree 14, 23, 5
-	setberrytree 15, 21, 5
-	setberrytree 30, 21, 5
-	setberrytree 65, 25, 5
-	setberrytree 72, 25, 5
-	setberrytree 73, 23, 5
-	setberrytree 74, 23, 5
-	setberrytree 87, 3, 5
-	setberrytree 88, 10, 5
-	setberrytree 89, 4, 5
-	setberrytree 82, 36, 5
-	return
-
-gUnknown_0819FA81:: @ 819FA81
-	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
-	setflag FLAG_HIDE_VICTORIA_WINSTRATE
-	setflag FLAG_HIDE_VIVI_WINSTRATE
-	setflag FLAG_HIDE_VICKI_WINSTRATE
-	setflag FLAG_HIDE_BIRCH_IN_LAB
-	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
-	setflag FLAG_HIDE_WALLY_PETALBURG
-	setflag FLAG_UNKNOWN_363
-	setflag FLAG_HIDE_GRUNT_RUSTBORO
-	setflag FLAG_HIDE_DEVON_RUSTBORO
-	setflag FLAG_HIDE_RIVAL_RUSTBORO
-	setflag FLAG_HIDE_FAT_MAN_LITTLEROOT
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
-	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
-	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
-	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
-	setflag FLAG_UNKNOWN_2E1
-	setflag FLAG_UNKNOWN_2EB
-	setflag FLAG_UNKNOWN_2EC
-	setflag FLAG_UNKNOWN_2ED
-	setflag FLAG_UNKNOWN_2F4
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
-	setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
-	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
-	setflag FLAG_UNKNOWN_30E
-	setflag FLAG_UNKNOWN_30F
-	setflag FLAG_HIDE_NORMAN_LITTLEROOT
-	setflag FLAG_HIDE_MAY_PICHU_DOLL
-	setflag FLAG_HIDE_FANCLUB_OLD_LADY
-	setflag FLAG_HIDE_FANCLUB_BOY
-	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
-	setflag FLAG_HIDE_FANCLUB_LADY
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
-	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
-	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
-	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
-	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
-	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
-	setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
-	setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
-	setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
-	setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
-	setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
-	setflag FLAG_HIDE_WALLY_PETALBURG_GYM
-	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
-	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
-	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
-	setflag FLAG_UNKNOWN_337
-	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
-	setflag FLAG_UNKNOWN_34B
-	setflag FLAG_UNKNOWN_34C
-	setflag FLAG_UNKNOWN_34F
-	setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
-	setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
-	setflag FLAG_HIDE_STERN_SLATEPORT
-	setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_RIVAL_ROUTE119
-	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
-	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
-	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
-	setflag FLAG_HIDE_LANETTE
-	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
-	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
-	setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_BRINEY_ROUTE116
-	setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
-	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
-	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	setflag FLAG_HIDE_MOM_LITTLEROOT
-	setflag FLAG_HIDE_MOM_UPSTAIRS
-	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
-	setflag FLAG_UNKNOWN_BIRCH_380
-	setflag FLAG_HIDE_BIRCH_ROUTE101
-	setflag FLAG_HIDE_BIRCH_ROUTE103
-	setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
-	setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
-	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
-	setflag FLAG_UNKNOWN_393
-	setflag FLAG_HIDE_WATTSON_MAUVILLE
-	setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
-	setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
-	setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
-	setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
-	setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
-	setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
-	setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
-	setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
-	setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
-	setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
-	setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
-	setflag FLAG_HIDE_STEVEN_ROUTE128
-	setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
-	setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
-	setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
-	setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
-	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
-	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
-	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
-	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
-	setflag FLAG_HIDE_STEVENS_LETTER
-	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
-	setflag FLAG_HIDE_BOY_ROUTE101
-	call Event_ResetBerryTrees
-	end
+	.include "data/scripts/new_game.inc"
 
 EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
 	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
new file mode 100644
index 000000000..99eceb741
--- /dev/null
+++ b/data/scripts/new_game.inc
@@ -0,0 +1,218 @@
+EventScript_ResetAllBerryTrees: @ 19F940
+	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:: @ 819FA81
+	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_HIDE_WALLY_PETALBURG
+	setflag FLAG_UNKNOWN_363
+	setflag FLAG_HIDE_GRUNT_RUSTBORO
+	setflag FLAG_HIDE_DEVON_RUSTBORO
+	setflag FLAG_HIDE_RIVAL_RUSTBORO
+	setflag FLAG_HIDE_FAT_MAN_LITTLEROOT
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
+	setflag FLAG_UNKNOWN_2E1
+	setflag FLAG_UNKNOWN_2EB
+	setflag FLAG_UNKNOWN_2EC
+	setflag FLAG_UNKNOWN_2ED
+	setflag FLAG_UNKNOWN_2F4
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
+	setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	setflag FLAG_UNKNOWN_30E
+	setflag FLAG_UNKNOWN_30F
+	setflag FLAG_HIDE_NORMAN_LITTLEROOT
+	setflag FLAG_HIDE_MAY_PICHU_DOLL
+	setflag FLAG_HIDE_FANCLUB_OLD_LADY
+	setflag FLAG_HIDE_FANCLUB_BOY
+	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
+	setflag FLAG_HIDE_FANCLUB_LADY
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
+	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
+	setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	setflag FLAG_UNKNOWN_337
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	setflag FLAG_UNKNOWN_34B
+	setflag FLAG_UNKNOWN_34C
+	setflag FLAG_UNKNOWN_34F
+	setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
+	setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	setflag FLAG_HIDE_STERN_SLATEPORT
+	setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_RIVAL_ROUTE119
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
+	setflag FLAG_HIDE_LANETTE
+	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
+	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BRINEY_ROUTE116
+	setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	setflag FLAG_HIDE_MOM_LITTLEROOT
+	setflag FLAG_HIDE_MOM_UPSTAIRS
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+	setflag FLAG_UNKNOWN_393
+	setflag FLAG_HIDE_WATTSON_MAUVILLE
+	setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
+	setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
+	setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
+	setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
+	setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+	setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+	setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
+	setflag FLAG_HIDE_STEVEN_ROUTE128
+	setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
+	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
+	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
+	setflag FLAG_HIDE_STEVENS_LETTER
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	setflag FLAG_HIDE_BOY_ROUTE101
+	call EventScript_ResetAllBerryTrees
+	end
diff --git a/include/berry.h b/include/berry.h
index 9a7773779..0a84ed1c2 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -1,39 +1,6 @@
 #ifndef GUARD_BERRY_H
 #define GUARD_BERRY_H
 
-#define BERRY_NAME_LENGTH 6
-#define BERRY_REGROW_LIMIT 10
-#define MAX_BERRY_TREES 128
-
-#define BERRY_NONE 0
-#define FIRST_BERRY ITEM_CHERI_BERRY
-#define LAST_BERRY  ITEM_ENIGMA_BERRY
-
-#define GETBERRYID(berry) ((berry - FIRST_BERRY) + 1)
-#define GETITEMID(berry) ((berry + FIRST_BERRY) - 1)
-
-enum
-{
-    BERRY_FIRMNESS_UNKNOWN,
-    BERRY_FIRMNESS_VERY_SOFT,
-    BERRY_FIRMNESS_SOFT,
-    BERRY_FIRMNESS_HARD,
-    BERRY_FIRMNESS_VERY_HARD,
-    BERRY_FIRMNESS_SUPER_HARD,
-};
-
-// berry stages
-enum
-{
-    BERRY_STAGE_NO_BERRY, // there is no tree planted and the soil is completely flat.
-    BERRY_STAGE_PLANTED,
-    BERRY_STAGE_SPROUTED,
-    BERRY_STAGE_TALLER,
-    BERRY_STAGE_FLOWERING,
-    BERRY_STAGE_BERRIES,
-    BERRY_STAGE_SPARKLING = 0xFF,
-};
-
 void ClearEnigmaBerries(void);
 void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam);
 void SetEnigmaBerry(u8 *src);
diff --git a/include/constants/berry.h b/include/constants/berry.h
new file mode 100644
index 000000000..9dc8474f1
--- /dev/null
+++ b/include/constants/berry.h
@@ -0,0 +1,32 @@
+#ifndef GUARD_CONSTANTS_BERRY_H
+#define GUARD_CONSTANTS_BERRY_H
+
+#define BERRY_NAME_LENGTH 6
+#define BERRY_REGROW_LIMIT 10
+#define MAX_BERRY_TREES 128
+
+#define BERRY_NONE 0
+
+#define BERRY_FIRMNESS_UNKNOWN     0
+#define BERRY_FIRMNESS_VERY_SOFT   1
+#define BERRY_FIRMNESS_SOFT        2
+#define BERRY_FIRMNESS_HARD        3
+#define BERRY_FIRMNESS_VERY_HARD   4
+#define BERRY_FIRMNESS_SUPER_HARD  5
+
+#define FLAVOR_SPICY   0
+#define FLAVOR_DRY     1
+#define FLAVOR_SWEET   2
+#define FLAVOR_BITTER  3
+#define FLAVOR_SOUR    4
+#define FLAVOR_COUNT   5
+
+#define BERRY_STAGE_NO_BERRY    0  // there is no tree planted and the soil is completely flat.
+#define BERRY_STAGE_PLANTED     1
+#define BERRY_STAGE_SPROUTED    2
+#define BERRY_STAGE_TALLER      3
+#define BERRY_STAGE_FLOWERING   4
+#define BERRY_STAGE_BERRIES     5
+#define BERRY_STAGE_SPARKLING   255
+
+#endif // GUARD_CONSTANTS_BERRY_H
diff --git a/include/constants/items.h b/include/constants/items.h
index a52c72599..9dd381076 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -363,11 +363,23 @@
 #define ITEM_15B 347
 #define ITEM_15C 348
 
+#define ITEMS_COUNT 349
+#define ITEM_FIELD_ARROW ITEMS_COUNT
+
 #define NUM_TECHNICAL_MACHINES 50
 #define NUM_HIDDEN_MACHINES     8
 
+#define MAX_BAG_ITEM_CAPACITY  99
+#define MAX_PC_ITEM_CAPACITY   999
+#define MAX_BERRY_CAPACITY     999
+
+#define FIRST_BERRY_INDEX             ITEM_CHERI_BERRY
+#define LAST_BERRY_INDEX              ITEM_ENIGMA_BERRY
+
+#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
+
 // Check if the item is one that can be used on a Pokemon.
-#define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
+#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
 
 #define IS_ITEM_MAIL(item) ((item) >= ITEM_ORANGE_MAIL && (item) <= ITEM_RETRO_MAIL)
 
diff --git a/src/berry.c b/src/berry.c
index f1bdb5235..590b03469 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -11,6 +11,7 @@
 #include "random.h"
 #include "task.h"
 #include "text.h"
+#include "constants/berry.h"
 #include "constants/event_object_movement.h"
 #include "constants/items.h"
 
@@ -1127,7 +1128,7 @@ const struct Berry *GetBerryInfo(u8 berry)
     // when getting the pointer to the berry info, enigma berries are handled differently. if your
     // berry is an Enigma Berry and its checksum is valid, fetch the pointer to its information in
     // the save block.
-    if (berry == GETBERRYID(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid())
+    if (berry == ITEM_TO_BERRY(ITEM_ENIGMA_BERRY) && IsEnigmaBerryValid())
         return &gSaveBlock1.enigmaBerry.berry;
     else
     {
@@ -1135,8 +1136,8 @@ const struct Berry *GetBerryInfo(u8 berry)
         // an enigma berry whos checksum failed, the game will use the Enigma Berry information
         // for this: meaning if you see the Enigma Berry information, its actually because the
         // checksum failed.
-        if (berry == BERRY_NONE || berry > GETBERRYID(LAST_BERRY))
-            berry = GETBERRYID(FIRST_BERRY);
+        if (berry == BERRY_NONE || berry > ITEM_TO_BERRY(LAST_BERRY_INDEX))
+            berry = ITEM_TO_BERRY(FIRST_BERRY_INDEX);
         return &gBerries[berry - 1];
     }
 }
@@ -1321,22 +1322,22 @@ u8 GetStageByBerryTreeId(u8 id)
 
 u8 ItemIdToBerryType(u16 item)
 {
-    u16 berry = item - FIRST_BERRY;
+    u16 berry = item - FIRST_BERRY_INDEX;
 
-    if (berry > LAST_BERRY - FIRST_BERRY)
-        return GETBERRYID(FIRST_BERRY);
+    if (berry > LAST_BERRY_INDEX - FIRST_BERRY_INDEX)
+        return ITEM_TO_BERRY(FIRST_BERRY_INDEX);
     else
-        return GETBERRYID(item);
+        return ITEM_TO_BERRY(item);
 }
 
 static u16 BerryTypeToItemId(u16 berry)
 {
     u16 item = berry - 1;
 
-    if (item > LAST_BERRY - FIRST_BERRY)
-        return FIRST_BERRY;
+    if (item > LAST_BERRY_INDEX - FIRST_BERRY_INDEX)
+        return FIRST_BERRY_INDEX;
     else
-        return GETITEMID(berry);
+        return berry + FIRST_BERRY_INDEX - 1;
 }
 
 void GetBerryNameByBerryType(u8 berry, u8 *string)
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index a8f797e28..2a2ff6ae2 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -20,7 +20,6 @@
 #include "text.h"
 
 #define OFFSET_7B (123)
-#define FIRST_BERRY ITEM_CHERI_BERRY
 
 struct Struct2000000
 {
@@ -277,7 +276,7 @@ static void sub_81464E4(void)
 
     berryInfo = GetBerryInfo(gSpecialVar_ItemId + OFFSET_7B + 1);
 
-    ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_ItemId - FIRST_BERRY + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
+    ConvertIntToDecimalStringN(gStringVar1, gSpecialVar_ItemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
     Menu_PrintText(gStringVar1, 12, 4);
 
 #if ENGLISH
diff --git a/src/item.c b/src/item.c
index 470b4d430..8483e6d3f 100644
--- a/src/item.c
+++ b/src/item.c
@@ -64,7 +64,7 @@ void CopyItemName(u16 itemId, u8 *string)
 {
     if (itemId == ITEM_ENIGMA_BERRY)
     {
-        StringCopy(string, GetBerryInfo(GETBERRYID(ITEM_ENIGMA_BERRY))->name);
+        StringCopy(string, GetBerryInfo(ITEM_TO_BERRY(ITEM_ENIGMA_BERRY))->name);
         StringAppend(string, gOtherText_Berry2);
     }
     else
diff --git a/src/new_game.c b/src/new_game.c
index 683a22801..63a13be5e 100644
--- a/src/new_game.c
+++ b/src/new_game.c
@@ -38,7 +38,7 @@ extern u8 gPlayerPartyCount;
 extern u8 gUnknown_03005CE8;
 extern u16 gSaveFileStatus;
 
-extern u8 gUnknown_0819FA81[];
+extern u8 EventScript_ResetAllMapFlags[];
 
 static const struct ContestWinner sEmptyMuseumPortrait =
 {
@@ -202,7 +202,7 @@ void NewGameInitData(void)
     ResetFanClub();
     ResetLotteryCorner();
     WarpToTruck();
-    ScriptContext2_RunNewScript(gUnknown_0819FA81);
+    ScriptContext2_RunNewScript(EventScript_ResetAllMapFlags);
 }
 
 #if DEBUG
diff --git a/src/pokemon_item_effect.c b/src/pokemon_item_effect.c
index d59e8d77c..3ab351367 100644
--- a/src/pokemon_item_effect.c
+++ b/src/pokemon_item_effect.c
@@ -96,7 +96,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo
         sp34 = 4;
     }
 
-    if (!IS_POKEMON_ITEM(item))
+    if (!ITEM_HAS_EFFECT(item))
         return TRUE;
     if (gItemEffectTable[item - 13] == NULL && item != ITEM_ENIGMA_BERRY)
         return TRUE;