shithub: pokecrystal

--- a/constants/event_flags.asm

+++ b/constants/event_flags.asm

@@ -2001,53 +2001,5 @@

 	const EVENT_7CD

 	const EVENT_7CE

 	const EVENT_7CF

-	const EVENT_7D0

-	const EVENT_7D1

-	const EVENT_7D2

-	const EVENT_7D3

-	const EVENT_7D4

-	const EVENT_7D5

-	const EVENT_7D6

-	const EVENT_7D7

-	const EVENT_7D8

-	const EVENT_7D9

-	const EVENT_7DA

-	const EVENT_7DB

-	const EVENT_7DC

-	const EVENT_7DD

-	const EVENT_7DE

-	const EVENT_7DF

-	const EVENT_7E0

-	const EVENT_7E1

-	const EVENT_7E2

-	const EVENT_7E3

-	const EVENT_7E4

-	const EVENT_7E5

-	const EVENT_7E6

-	const EVENT_7E7

-	const EVENT_7E8

-	const EVENT_7E9

-	const EVENT_7EA

-	const EVENT_7EB

-	const EVENT_7EC

-	const EVENT_7ED

-	const EVENT_7EE

-	const EVENT_7EF

-	const EVENT_7F0

-	const EVENT_7F1

-	const EVENT_7F2

-	const EVENT_7F3

-	const EVENT_7F4

-	const EVENT_7F5

-	const EVENT_7F6

-	const EVENT_7F7

-	const EVENT_7F8

-	const EVENT_7F9

-	const EVENT_7FA

-	const EVENT_7FB

-	const EVENT_7FC

-	const EVENT_7FD

-	const EVENT_7FE

-	const EVENT_7FF

-EVENT_ALWAYS_THERE EQU $ffff

+NUM_EVENTS EQU const_value

--- a/constants/gfx_constants.asm

+++ b/constants/gfx_constants.asm

@@ -1,39 +1,40 @@

-ANIM_GFX_HIT        EQU 1

-ANIM_GFX_CUT        EQU 2

-ANIM_GFX_FIRE       EQU 3

-ANIM_GFX_WATER      EQU 4

-ANIM_GFX_LIGHTNING  EQU 5

-ANIM_GFX_PLANT      EQU 6

-ANIM_GFX_SMOKE      EQU 7

-ANIM_GFX_EXPLOSION  EQU 8

-ANIM_GFX_ROCKS      EQU 9

-ANIM_GFX_ICE        EQU 10

-ANIM_GFX_POKE_BALL  EQU 11

-ANIM_GFX_POISON     EQU 12

-ANIM_GFX_BUBBLE     EQU 13

-ANIM_GFX_NOISE      EQU 14

-ANIM_GFX_POWDER     EQU 15

-ANIM_GFX_BEAM       EQU 16

-ANIM_GFX_SPEED      EQU 17

-ANIM_GFX_CHARGE     EQU 18

-ANIM_GFX_WIND       EQU 19

-ANIM_GFX_WHIP       EQU 20

-ANIM_GFX_EGG        EQU 21

-ANIM_GFX_ROPE       EQU 22

-ANIM_GFX_PSYCHIC    EQU 23

-ANIM_GFX_REFLECT    EQU 24

-ANIM_GFX_STATUS     EQU 25

-ANIM_GFX_SAND       EQU 26

-ANIM_GFX_WEB        EQU 27

-ANIM_GFX_HAZE       EQU 28

-ANIM_GFX_HORN       EQU 29

-ANIM_GFX_FLOWER     EQU 30

-ANIM_GFX_MISC       EQU 31

-ANIM_GFX_SKY_ATTACK EQU 32

-ANIM_GFX_GLOBE      EQU 33

-ANIM_GFX_SHAPES     EQU 34

-ANIM_GFX_OBJECTS    EQU 35

-ANIM_GFX_SHINE      EQU 36

-ANIM_GFX_ANGELS     EQU 37

-ANIM_GFX_WAVE       EQU 38

-ANIM_GFX_AEROBLAST  EQU 39

+const_value = 1

+	const ANIM_GFX_HIT

+	const ANIM_GFX_CUT

+	const ANIM_GFX_FIRE

+	const ANIM_GFX_WATER

+	const ANIM_GFX_LIGHTNING

+	const ANIM_GFX_PLANT

+	const ANIM_GFX_SMOKE

+	const ANIM_GFX_EXPLOSION

+	const ANIM_GFX_ROCKS

+	const ANIM_GFX_ICE

+	const ANIM_GFX_POKE_BALL

+	const ANIM_GFX_POISON

+	const ANIM_GFX_BUBBLE

+	const ANIM_GFX_NOISE

+	const ANIM_GFX_POWDER

+	const ANIM_GFX_BEAM

+	const ANIM_GFX_SPEED

+	const ANIM_GFX_CHARGE

+	const ANIM_GFX_WIND

+	const ANIM_GFX_WHIP

+	const ANIM_GFX_EGG

+	const ANIM_GFX_ROPE

+	const ANIM_GFX_PSYCHIC

+	const ANIM_GFX_REFLECT

+	const ANIM_GFX_STATUS

+	const ANIM_GFX_SAND

+	const ANIM_GFX_WEB

+	const ANIM_GFX_HAZE

+	const ANIM_GFX_HORN

+	const ANIM_GFX_FLOWER

+	const ANIM_GFX_MISC

+	const ANIM_GFX_SKY_ATTACK

+	const ANIM_GFX_GLOBE

+	const ANIM_GFX_SHAPES

+	const ANIM_GFX_OBJECTS

+	const ANIM_GFX_SHINE

+	const ANIM_GFX_ANGELS

+	const ANIM_GFX_WAVE

+	const ANIM_GFX_AEROBLAST

--- a/constants/map_constants.asm

+++ b/constants/map_constants.asm

@@ -2,1806 +2,698 @@

 MAP_N_A   EQU -1

 ; map group ids

-GROUP_OLIVINE_POKECENTER_1F EQU $01

-GROUP_OLIVINE_GYM EQU $01

-GROUP_OLIVINE_VOLTORB_HOUSE EQU $01

-GROUP_OLIVINE_HOUSE_BETA EQU $01

-GROUP_OLIVINE_PUNISHMENT_SPEECH_HOUSE EQU $01

-GROUP_OLIVINE_GOOD_ROD_HOUSE EQU $01

-GROUP_OLIVINE_CAFE EQU $01

-GROUP_OLIVINE_MART EQU $01

-GROUP_ROUTE_38_ECRUTEAK_GATE EQU $01

-GROUP_ROUTE_39_BARN EQU $01

-GROUP_ROUTE_39_FARMHOUSE EQU $01

-GROUP_ROUTE_38 EQU $01

-GROUP_ROUTE_39 EQU $01

-GROUP_OLIVINE_CITY EQU $01

-GROUP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE EQU $02

-GROUP_MAHOGANY_GYM EQU $02

-GROUP_MAHOGANY_POKECENTER_1F EQU $02

-GROUP_ROUTE_42_ECRUTEAK_GATE EQU $02

-GROUP_ROUTE_42 EQU $02

-GROUP_ROUTE_44 EQU $02

-GROUP_MAHOGANY_TOWN EQU $02

-GROUP_SPROUT_TOWER_1F EQU $03

-GROUP_SPROUT_TOWER_2F EQU $03

-GROUP_SPROUT_TOWER_3F EQU $03

-GROUP_TIN_TOWER_1F EQU $03

-GROUP_TIN_TOWER_2F EQU $03

-GROUP_TIN_TOWER_3F EQU $03

-GROUP_TIN_TOWER_4F EQU $03

-GROUP_TIN_TOWER_5F EQU $03

-GROUP_TIN_TOWER_6F EQU $03

-GROUP_TIN_TOWER_7F EQU $03

-GROUP_TIN_TOWER_8F EQU $03

-GROUP_TIN_TOWER_9F EQU $03

-GROUP_BURNED_TOWER_1F EQU $03

-GROUP_BURNED_TOWER_B1F EQU $03

-GROUP_NATIONAL_PARK EQU $03

-GROUP_NATIONAL_PARK_BUG_CONTEST EQU $03

-GROUP_RADIO_TOWER_1F EQU $03

-GROUP_RADIO_TOWER_2F EQU $03

-GROUP_RADIO_TOWER_3F EQU $03

-GROUP_RADIO_TOWER_4F EQU $03

-GROUP_RADIO_TOWER_5F EQU $03

-GROUP_RUINS_OF_ALPH_OUTSIDE EQU $03

-GROUP_RUINS_OF_ALPH_HO_OH_CHAMBER EQU $03

-GROUP_RUINS_OF_ALPH_KABUTO_CHAMBER EQU $03

-GROUP_RUINS_OF_ALPH_OMANYTE_CHAMBER EQU $03

-GROUP_RUINS_OF_ALPH_AERODACTYL_CHAMBER EQU $03

-GROUP_RUINS_OF_ALPH_INNER_CHAMBER EQU $03

-GROUP_RUINS_OF_ALPH_RESEARCH_CENTER EQU $03

-GROUP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM EQU $03

-GROUP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM EQU $03

-GROUP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM EQU $03

-GROUP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM EQU $03

-GROUP_RUINS_OF_ALPH_HO_OH_WORD_ROOM EQU $03

-GROUP_RUINS_OF_ALPH_KABUTO_WORD_ROOM EQU $03

-GROUP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM EQU $03

-GROUP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM EQU $03

-GROUP_UNION_CAVE_1F EQU $03

-GROUP_UNION_CAVE_B1F EQU $03

-GROUP_UNION_CAVE_B2F EQU $03

-GROUP_SLOWPOKE_WELL_B1F EQU $03

-GROUP_SLOWPOKE_WELL_B2F EQU $03

-GROUP_OLIVINE_LIGHTHOUSE_1F EQU $03

-GROUP_OLIVINE_LIGHTHOUSE_2F EQU $03

-GROUP_OLIVINE_LIGHTHOUSE_3F EQU $03

-GROUP_OLIVINE_LIGHTHOUSE_4F EQU $03

-GROUP_OLIVINE_LIGHTHOUSE_5F EQU $03

-GROUP_OLIVINE_LIGHTHOUSE_6F EQU $03

-GROUP_MAHOGANY_MART_1F EQU $03

-GROUP_TEAM_ROCKET_BASE_B1F EQU $03

-GROUP_TEAM_ROCKET_BASE_B2F EQU $03

-GROUP_TEAM_ROCKET_BASE_B3F EQU $03

-GROUP_ILEX_FOREST EQU $03

-GROUP_WAREHOUSE_ENTRANCE EQU $03

-GROUP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES EQU $03

-GROUP_GOLDENROD_DEPT_STORE_B1F EQU $03

-GROUP_UNDERGROUND_WAREHOUSE EQU $03

-GROUP_MOUNT_MORTAR_1F_OUTSIDE EQU $03

-GROUP_MOUNT_MORTAR_1F_INSIDE EQU $03

-GROUP_MOUNT_MORTAR_2F_INSIDE EQU $03

-GROUP_MOUNT_MORTAR_B1F EQU $03

-GROUP_ICE_PATH_1F EQU $03

-GROUP_ICE_PATH_B1F EQU $03

-GROUP_ICE_PATH_B2F_MAHOGANY_SIDE EQU $03

-GROUP_ICE_PATH_B2F_BLACKTHORN_SIDE EQU $03

-GROUP_ICE_PATH_B3F EQU $03

-GROUP_WHIRL_ISLAND_NW EQU $03

-GROUP_WHIRL_ISLAND_NE EQU $03

-GROUP_WHIRL_ISLAND_SW EQU $03

-GROUP_WHIRL_ISLAND_CAVE EQU $03

-GROUP_WHIRL_ISLAND_SE EQU $03

-GROUP_WHIRL_ISLAND_B1F EQU $03

-GROUP_WHIRL_ISLAND_B2F EQU $03

-GROUP_WHIRL_ISLAND_LUGIA_CHAMBER EQU $03

-GROUP_SILVER_CAVE_ROOM_1 EQU $03

-GROUP_SILVER_CAVE_ROOM_2 EQU $03

-GROUP_SILVER_CAVE_ROOM_3 EQU $03

-GROUP_SILVER_CAVE_ITEM_ROOMS EQU $03

-GROUP_DARK_CAVE_VIOLET_ENTRANCE EQU $03

-GROUP_DARK_CAVE_BLACKTHORN_ENTRANCE EQU $03

-GROUP_DRAGONS_DEN_1F EQU $03

-GROUP_DRAGONS_DEN_B1F EQU $03

-GROUP_DRAGON_SHRINE EQU $03

-GROUP_TOHJO_FALLS EQU $03

-GROUP_DIGLETTS_CAVE EQU $03

-GROUP_MOUNT_MOON EQU $03

-GROUP_UNDERGROUND EQU $03

-GROUP_ROCK_TUNNEL_1F EQU $03

-GROUP_ROCK_TUNNEL_B1F EQU $03

-GROUP_SAFARI_ZONE_FUCHSIA_GATE_BETA EQU $03

-GROUP_SAFARI_ZONE_BETA EQU $03

-GROUP_VICTORY_ROAD EQU $03

-GROUP_ECRUTEAK_HOUSE EQU $04

-GROUP_WISE_TRIOS_ROOM EQU $04

-GROUP_ECRUTEAK_POKECENTER_1F EQU $04

-GROUP_ECRUTEAK_LUGIA_SPEECH_HOUSE EQU $04

-GROUP_DANCE_THEATRE EQU $04

-GROUP_ECRUTEAK_MART EQU $04

-GROUP_ECRUTEAK_GYM EQU $04

-GROUP_ECRUTEAK_ITEMFINDER_HOUSE EQU $04

-GROUP_ECRUTEAK_CITY EQU $04

-GROUP_BLACKTHORN_GYM_1F EQU $05

-GROUP_BLACKTHORN_GYM_2F EQU $05

-GROUP_BLACKTHORN_DRAGON_SPEECH_HOUSE EQU $05

-GROUP_BLACKTHORN_DODRIO_TRADE_HOUSE EQU $05

-GROUP_BLACKTHORN_MART EQU $05

-GROUP_BLACKTHORN_POKECENTER_1F EQU $05

-GROUP_MOVE_DELETERS_HOUSE EQU $05

-GROUP_ROUTE_45 EQU $05

-GROUP_ROUTE_46 EQU $05

-GROUP_BLACKTHORN_CITY EQU $05

-GROUP_CINNABAR_POKECENTER_1F EQU $06

-GROUP_CINNABAR_POKECENTER_2F_BETA EQU $06

-GROUP_ROUTE_19___FUCHSIA_GATE EQU $06

-GROUP_SEAFOAM_GYM EQU $06

-GROUP_ROUTE_19 EQU $06

-GROUP_ROUTE_20 EQU $06

-GROUP_ROUTE_21 EQU $06

-GROUP_CINNABAR_ISLAND EQU $06

-GROUP_CERULEAN_GYM_BADGE_SPEECH_HOUSE EQU $07

-GROUP_CERULEAN_POLICE_STATION EQU $07

-GROUP_CERULEAN_TRADE_SPEECH_HOUSE EQU $07

-GROUP_CERULEAN_POKECENTER_1F EQU $07

-GROUP_CERULEAN_POKECENTER_2F_BETA EQU $07

-GROUP_CERULEAN_GYM EQU $07

-GROUP_CERULEAN_MART EQU $07

-GROUP_ROUTE_10_POKECENTER_1F EQU $07

-GROUP_ROUTE_10_POKECENTER_2F_BETA EQU $07

-GROUP_POWER_PLANT EQU $07

-GROUP_BILLS_HOUSE EQU $07

-GROUP_ROUTE_4 EQU $07

-GROUP_ROUTE_9 EQU $07

-GROUP_ROUTE_10A EQU $07

-GROUP_ROUTE_10_NORTH EQU $07

-GROUP_ROUTE_24 EQU $07

-GROUP_ROUTE_25 EQU $07

-GROUP_CERULEAN_CITY EQU $07

-GROUP_AZALEA_POKECENTER_1F EQU $08

-GROUP_CHARCOAL_KILN EQU $08

-GROUP_AZALEA_MART EQU $08

-GROUP_KURTS_HOUSE EQU $08

-GROUP_AZALEA_GYM EQU $08

-GROUP_ROUTE_33 EQU $08

-GROUP_AZALEA_TOWN EQU $08

-GROUP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE EQU $09

-GROUP_LAKE_OF_RAGE_MAGIKARP_HOUSE EQU $09

-GROUP_ROUTE_43_MAHOGANY_GATE EQU $09

-GROUP_ROUTE_43_GATE EQU $09

-GROUP_ROUTE_43 EQU $09

-GROUP_LAKE_OF_RAGE EQU $09

-GROUP_ROUTE_32 EQU $0a

-GROUP_ROUTE_35 EQU $0a

-GROUP_ROUTE_36 EQU $0a

-GROUP_ROUTE_37 EQU $0a

-GROUP_VIOLET_CITY EQU $0a

-GROUP_VIOLET_MART EQU $0a

-GROUP_VIOLET_GYM EQU $0a

-GROUP_EARLS_POKEMON_ACADEMY EQU $0a

-GROUP_VIOLET_NICKNAME_SPEECH_HOUSE EQU $0a

-GROUP_VIOLET_POKECENTER_1F EQU $0a

-GROUP_VIOLET_ONIX_TRADE_HOUSE EQU $0a

-GROUP_ROUTE_32_RUINS_OF_ALPH_GATE EQU $0a

-GROUP_ROUTE_32_POKECENTER_1F EQU $0a

-GROUP_ROUTE_35_GOLDENROD_GATE EQU $0a

-GROUP_ROUTE_35_NATIONAL_PARK_GATE EQU $0a

-GROUP_ROUTE_36_RUINS_OF_ALPH_GATE EQU $0a

-GROUP_ROUTE_36_NATIONAL_PARK_GATE EQU $0a

-GROUP_ROUTE_34 EQU $0b

-GROUP_GOLDENROD_CITY EQU $0b

-GROUP_GOLDENROD_GYM EQU $0b

-GROUP_GOLDENROD_BIKE_SHOP EQU $0b

-GROUP_GOLDENROD_HAPPINESS_RATER EQU $0b

-GROUP_GOLDENROD_BILLS_HOUSE EQU $0b

-GROUP_GOLDENROD_MAGNET_TRAIN_STATION EQU $0b

-GROUP_GOLDENROD_FLOWER_SHOP EQU $0b

-GROUP_GOLDENROD_PP_SPEECH_HOUSE EQU $0b

-GROUP_GOLDENROD_NAME_RATERS_HOUSE EQU $0b

-GROUP_GOLDENROD_DEPT_STORE_1F EQU $0b

-GROUP_GOLDENROD_DEPT_STORE_2F EQU $0b

-GROUP_GOLDENROD_DEPT_STORE_3F EQU $0b

-GROUP_GOLDENROD_DEPT_STORE_4F EQU $0b

-GROUP_GOLDENROD_DEPT_STORE_5F EQU $0b

-GROUP_GOLDENROD_DEPT_STORE_6F EQU $0b

-GROUP_GOLDENROD_DEPT_STORE_ELEVATOR EQU $0b

-GROUP_GOLDENROD_DEPT_STORE_ROOF EQU $0b

-GROUP_GOLDENROD_GAME_CORNER EQU $0b

-GROUP_GOLDENROD_POKECENTER_1F EQU $0b

-GROUP_GOLDENROD_POKECOM_CENTER_2F_MOBILE EQU $0b

-GROUP_ILEX_FOREST_AZALEA_GATE EQU $0b

-GROUP_ROUTE_34_ILEX_FOREST_GATE EQU $0b

-GROUP_DAY_CARE EQU $0b

-GROUP_ROUTE_6 EQU $0c

-GROUP_ROUTE_11 EQU $0c

-GROUP_VERMILION_CITY EQU $0c

-GROUP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE EQU $0c

-GROUP_VERMILION_POKECENTER_1F EQU $0c

-GROUP_VERMILION_POKECENTER_2F_BETA EQU $0c

-GROUP_POKEMON_FAN_CLUB EQU $0c

-GROUP_VERMILION_MAGNET_TRAIN_SPEECH_HOUSE EQU $0c

-GROUP_VERMILION_MART EQU $0c

-GROUP_VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE EQU $0c

-GROUP_VERMILION_GYM EQU $0c

-GROUP_ROUTE_6_SAFFRON_GATE EQU $0c

-GROUP_ROUTE_6_UNDERGROUND_ENTRANCE EQU $0c

-GROUP_ROUTE_1 EQU $0d

-GROUP_PALLET_TOWN EQU $0d

-GROUP_REDS_HOUSE_1F EQU $0d

-GROUP_REDS_HOUSE_2F EQU $0d

-GROUP_BLUES_HOUSE EQU $0d

-GROUP_OAKS_LAB EQU $0d

-GROUP_ROUTE_3 EQU $0e

-GROUP_PEWTER_CITY EQU $0e

-GROUP_PEWTER_NIDORAN_SPEECH_HOUSE EQU $0e

-GROUP_PEWTER_GYM EQU $0e

-GROUP_PEWTER_MART EQU $0e

-GROUP_PEWTER_POKECENTER_1F EQU $0e

-GROUP_PEWTER_POKECENTER_2F_BETA EQU $0e

-GROUP_PEWTER_SNOOZE_SPEECH_HOUSE EQU $0e

-GROUP_OLIVINE_PORT EQU $0f

-GROUP_VERMILION_PORT EQU $0f

-GROUP_FAST_SHIP_1F EQU $0f

-GROUP_FAST_SHIP_CABINS_NNW_NNE_NE EQU $0f

-GROUP_FAST_SHIP_CABINS_SW_SSW_NW EQU $0f

-GROUP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN EQU $0f

-GROUP_FAST_SHIP_B1F EQU $0f

-GROUP_OLIVINE_PORT_PASSAGE EQU $0f

-GROUP_VERMILION_PORT_PASSAGE EQU $0f

-GROUP_MOUNT_MOON_SQUARE EQU $0f

-GROUP_MOUNT_MOON_GIFT_SHOP EQU $0f

-GROUP_TIN_TOWER_ROOF EQU $0f

-GROUP_ROUTE_23 EQU $10

-GROUP_INDIGO_PLATEAU_POKECENTER_1F EQU $10

-GROUP_WILLS_ROOM EQU $10

-GROUP_KOGAS_ROOM EQU $10

-GROUP_BRUNOS_ROOM EQU $10

-GROUP_KARENS_ROOM EQU $10

-GROUP_LANCES_ROOM EQU $10

-GROUP_HALL_OF_FAME EQU $10

-GROUP_ROUTE_13 EQU $11

-GROUP_ROUTE_14 EQU $11

-GROUP_ROUTE_15 EQU $11

-GROUP_ROUTE_18 EQU $11

-GROUP_FUCHSIA_CITY EQU $11

-GROUP_FUCHSIA_MART EQU $11

-GROUP_SAFARI_ZONE_MAIN_OFFICE EQU $11

-GROUP_FUCHSIA_GYM EQU $11

-GROUP_FUCHSIA_BILL_SPEECH_HOUSE EQU $11

-GROUP_FUCHSIA_POKECENTER_1F EQU $11

-GROUP_FUCHSIA_POKECENTER_2F_BETA EQU $11

-GROUP_SAFARI_ZONE_WARDENS_HOME EQU $11

-GROUP_ROUTE_15_FUCHSIA_GATE EQU $11

-GROUP_ROUTE_8 EQU $12

-GROUP_ROUTE_12 EQU $12

-GROUP_ROUTE_10B EQU $12

-GROUP_ROUTE_10_SOUTH EQU $12

-GROUP_LAVENDER_TOWN EQU $12

-GROUP_LAVENDER_POKECENTER_1F EQU $12

-GROUP_LAVENDER_POKECENTER_2F_BETA EQU $12

-GROUP_MR_FUJIS_HOUSE EQU $12

-GROUP_LAVENDER_TOWN_SPEECH_HOUSE EQU $12

-GROUP_LAVENDER_NAME_RATER EQU $12

-GROUP_LAVENDER_MART EQU $12

-GROUP_SOUL_HOUSE EQU $12

-GROUP_LAV_RADIO_TOWER_1F EQU $12

-GROUP_ROUTE_8_SAFFRON_GATE EQU $12

-GROUP_ROUTE_12_SUPER_ROD_HOUSE EQU $12

-GROUP_ROUTE_28 EQU $13

-GROUP_SILVER_CAVE_OUTSIDE EQU $13

-GROUP_SILVER_CAVE_POKECENTER_1F EQU $13

-GROUP_ROUTE_28_FAMOUS_SPEECH_HOUSE EQU $13

-GROUP_POKECENTER_2F EQU $14

-GROUP_TRADE_CENTER EQU $14

-GROUP_COLOSSEUM EQU $14

-GROUP_TIME_CAPSULE EQU $14

-GROUP_MOBILE_TRADE_ROOM_MOBILE EQU $14

-GROUP_MOBILE_BATTLE_ROOM EQU $14

-GROUP_ROUTE_7 EQU $15

-GROUP_ROUTE_16 EQU $15

-GROUP_ROUTE_17 EQU $15

-GROUP_CELADON_CITY EQU $15

-GROUP_CELADON_DEPT_STORE_1F EQU $15

-GROUP_CELADON_DEPT_STORE_2F EQU $15

-GROUP_CELADON_DEPT_STORE_3F EQU $15

-GROUP_CELADON_DEPT_STORE_4F EQU $15

-GROUP_CELADON_DEPT_STORE_5F EQU $15

-GROUP_CELADON_DEPT_STORE_6F EQU $15

-GROUP_CELADON_DEPT_STORE_ELEVATOR EQU $15

-GROUP_CELADON_MANSION_1F EQU $15

-GROUP_CELADON_MANSION_2F EQU $15

-GROUP_CELADON_MANSION_3F EQU $15

-GROUP_CELADON_MANSION_ROOF EQU $15

-GROUP_CELADON_MANSION_ROOF_HOUSE EQU $15

-GROUP_CELADON_POKECENTER_1F EQU $15

-GROUP_CELADON_POKECENTER_2F_BETA EQU $15

-GROUP_CELADON_GAME_CORNER EQU $15

-GROUP_CELADON_GAME_CORNER_PRIZE_ROOM EQU $15

-GROUP_CELADON_GYM EQU $15

-GROUP_CELADON_CAFE EQU $15

-GROUP_ROUTE_16_FUCHSIA_SPEECH_HOUSE EQU $15

-GROUP_ROUTE_16_GATE EQU $15

-GROUP_ROUTE_7_SAFFRON_GATE EQU $15

-GROUP_ROUTE_17_18_GATE EQU $15

-GROUP_ROUTE_40 EQU $16

-GROUP_ROUTE_41 EQU $16

-GROUP_CIANWOOD_CITY EQU $16

-GROUP_MANIAS_HOUSE EQU $16

-GROUP_CIANWOOD_GYM EQU $16

-GROUP_CIANWOOD_POKECENTER_1F EQU $16

-GROUP_CIANWOOD_PHARMACY EQU $16

-GROUP_CIANWOOD_CITY_PHOTO_STUDIO EQU $16

-GROUP_CIANWOOD_LUGIA_SPEECH_HOUSE EQU $16

-GROUP_POKE_SEERS_HOUSE EQU $16

-GROUP_BATTLE_TOWER_1F EQU $16

-GROUP_BATTLE_TOWER_BATTLE_ROOM EQU $16

-GROUP_BATTLE_TOWER_ELEVATOR EQU $16

-GROUP_BATTLE_TOWER_HALLWAY EQU $16

-GROUP_ROUTE_40_BATTLE_TOWER_GATE EQU $16

-GROUP_BATTLE_TOWER_OUTSIDE EQU $16

-GROUP_ROUTE_2 EQU $17

-GROUP_ROUTE_22 EQU $17

-GROUP_VIRIDIAN_CITY EQU $17

-GROUP_VIRIDIAN_GYM EQU $17

-GROUP_VIRIDIAN_NICKNAME_SPEECH_HOUSE EQU $17

-GROUP_TRAINER_HOUSE_1F EQU $17

-GROUP_TRAINER_HOUSE_B1F EQU $17

-GROUP_VIRIDIAN_MART EQU $17

-GROUP_VIRIDIAN_POKECENTER_1F EQU $17

-GROUP_VIRIDIAN_POKECENTER_2F_BETA EQU $17

-GROUP_ROUTE_2_NUGGET_SPEECH_HOUSE EQU $17

-GROUP_ROUTE_2_GATE EQU $17

-GROUP_VICTORY_ROAD_GATE EQU $17

-GROUP_ROUTE_26 EQU $18

-GROUP_ROUTE_27 EQU $18

-GROUP_ROUTE_29 EQU $18

-GROUP_NEW_BARK_TOWN EQU $18

-GROUP_ELMS_LAB EQU $18

-GROUP_KRISS_HOUSE_1F EQU $18

-GROUP_KRISS_HOUSE_2F EQU $18

-GROUP_KRISS_NEIGHBORS_HOUSE EQU $18

-GROUP_ELMS_HOUSE EQU $18

-GROUP_ROUTE_26_HEAL_SPEECH_HOUSE EQU $18

-GROUP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE EQU $18

-GROUP_ROUTE_27_SANDSTORM_HOUSE EQU $18

-GROUP_ROUTE_29_46_GATE EQU $18

-GROUP_ROUTE_5 EQU $19

-GROUP_SAFFRON_CITY EQU $19

-GROUP_FIGHTING_DOJO EQU $19

-GROUP_SAFFRON_GYM EQU $19

-GROUP_SAFFRON_MART EQU $19

-GROUP_SAFFRON_POKECENTER_1F EQU $19

-GROUP_SAFFRON_POKECENTER_2F_BETA EQU $19

-GROUP_MR_PSYCHICS_HOUSE EQU $19

-GROUP_SAFFRON_TRAIN_STATION EQU $19

-GROUP_SILPH_CO_1F EQU $19

-GROUP_COPYCATS_HOUSE_1F EQU $19

-GROUP_COPYCATS_HOUSE_2F EQU $19

-GROUP_ROUTE_5_UNDERGROUND_ENTRANCE EQU $19

-GROUP_ROUTE_5_SAFFRON_CITY_GATE EQU $19

-GROUP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE EQU $19

-GROUP_ROUTE_30 EQU $1a

-GROUP_ROUTE_31 EQU $1a

-GROUP_CHERRYGROVE_CITY EQU $1a

-GROUP_CHERRYGROVE_MART EQU $1a

-GROUP_CHERRYGROVE_POKECENTER_1F EQU $1a

-GROUP_CHERRYGROVE_GYM_SPEECH_HOUSE EQU $1a

-GROUP_GUIDE_GENTS_HOUSE EQU $1a

-GROUP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE EQU $1a

-GROUP_ROUTE_30_BERRY_SPEECH_HOUSE EQU $1a

-GROUP_MR_POKEMONS_HOUSE EQU $1a

-GROUP_ROUTE_31_VIOLET_GATE EQU $1a

+	const_def

+	newgroup

+	mapgroup OLIVINE_POKECENTER_1F, 4, 5

+	mapgroup OLIVINE_GYM, 8, 5

+	mapgroup OLIVINE_VOLTORB_HOUSE, 4, 4

+	mapgroup OLIVINE_HOUSE_BETA, 4, 4

+	mapgroup OLIVINE_PUNISHMENT_SPEECH_HOUSE, 4, 4

+	mapgroup OLIVINE_GOOD_ROD_HOUSE, 4, 4

+	mapgroup OLIVINE_CAFE, 4, 4

+	mapgroup OLIVINE_MART, 4, 6

+	mapgroup ROUTE_38_ECRUTEAK_GATE, 4, 5

+	mapgroup ROUTE_39_BARN, 4, 4

+	mapgroup ROUTE_39_FARMHOUSE, 4, 4

+	mapgroup ROUTE_38, 9, 20

+	mapgroup ROUTE_39, 18, 10

+	mapgroup OLIVINE_CITY, 18, 20

-; map ids

-MAP_OLIVINE_POKECENTER_1F EQU $01

-MAP_OLIVINE_GYM EQU $02

-MAP_OLIVINE_VOLTORB_HOUSE EQU $03

-MAP_OLIVINE_HOUSE_BETA EQU $04

-MAP_OLIVINE_PUNISHMENT_SPEECH_HOUSE EQU $05

-MAP_OLIVINE_GOOD_ROD_HOUSE EQU $06

-MAP_OLIVINE_CAFE EQU $07

-MAP_OLIVINE_MART EQU $08

-MAP_ROUTE_38_ECRUTEAK_GATE EQU $09

-MAP_ROUTE_39_BARN EQU $0a

-MAP_ROUTE_39_FARMHOUSE EQU $0b

-MAP_ROUTE_38 EQU $0c

-MAP_ROUTE_39 EQU $0d

-MAP_OLIVINE_CITY EQU $0e

-MAP_MAHOGANY_RED_GYARADOS_SPEECH_HOUSE EQU $01

-MAP_MAHOGANY_GYM EQU $02

-MAP_MAHOGANY_POKECENTER_1F EQU $03

-MAP_ROUTE_42_ECRUTEAK_GATE EQU $04

-MAP_ROUTE_42 EQU $05

-MAP_ROUTE_44 EQU $06

-MAP_MAHOGANY_TOWN EQU $07

-MAP_SPROUT_TOWER_1F EQU $01

-MAP_SPROUT_TOWER_2F EQU $02

-MAP_SPROUT_TOWER_3F EQU $03

-MAP_TIN_TOWER_1F EQU $04

-MAP_TIN_TOWER_2F EQU $05

-MAP_TIN_TOWER_3F EQU $06

-MAP_TIN_TOWER_4F EQU $07

-MAP_TIN_TOWER_5F EQU $08

-MAP_TIN_TOWER_6F EQU $09

-MAP_TIN_TOWER_7F EQU $0a

-MAP_TIN_TOWER_8F EQU $0b

-MAP_TIN_TOWER_9F EQU $0c

-MAP_BURNED_TOWER_1F EQU $0d

-MAP_BURNED_TOWER_B1F EQU $0e

-MAP_NATIONAL_PARK EQU $0f

-MAP_NATIONAL_PARK_BUG_CONTEST EQU $10

-MAP_RADIO_TOWER_1F EQU $11

-MAP_RADIO_TOWER_2F EQU $12

-MAP_RADIO_TOWER_3F EQU $13

-MAP_RADIO_TOWER_4F EQU $14

-MAP_RADIO_TOWER_5F EQU $15

-MAP_RUINS_OF_ALPH_OUTSIDE EQU $16

-MAP_RUINS_OF_ALPH_HO_OH_CHAMBER EQU $17

-MAP_RUINS_OF_ALPH_KABUTO_CHAMBER EQU $18

-MAP_RUINS_OF_ALPH_OMANYTE_CHAMBER EQU $19

-MAP_RUINS_OF_ALPH_AERODACTYL_CHAMBER EQU $1a

-MAP_RUINS_OF_ALPH_INNER_CHAMBER EQU $1b

-MAP_RUINS_OF_ALPH_RESEARCH_CENTER EQU $1c

-MAP_RUINS_OF_ALPH_HO_OH_ITEM_ROOM EQU $1d

-MAP_RUINS_OF_ALPH_KABUTO_ITEM_ROOM EQU $1e

-MAP_RUINS_OF_ALPH_OMANYTE_ITEM_ROOM EQU $1f

-MAP_RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM EQU $20

-MAP_RUINS_OF_ALPH_HO_OH_WORD_ROOM EQU $21

-MAP_RUINS_OF_ALPH_KABUTO_WORD_ROOM EQU $22

-MAP_RUINS_OF_ALPH_OMANYTE_WORD_ROOM EQU $23

-MAP_RUINS_OF_ALPH_AERODACTYL_WORD_ROOM EQU $24

-MAP_UNION_CAVE_1F EQU $25

-MAP_UNION_CAVE_B1F EQU $26

-MAP_UNION_CAVE_B2F EQU $27

-MAP_SLOWPOKE_WELL_B1F EQU $28

-MAP_SLOWPOKE_WELL_B2F EQU $29

-MAP_OLIVINE_LIGHTHOUSE_1F EQU $2a

-MAP_OLIVINE_LIGHTHOUSE_2F EQU $2b

-MAP_OLIVINE_LIGHTHOUSE_3F EQU $2c

-MAP_OLIVINE_LIGHTHOUSE_4F EQU $2d

-MAP_OLIVINE_LIGHTHOUSE_5F EQU $2e

-MAP_OLIVINE_LIGHTHOUSE_6F EQU $2f

-MAP_MAHOGANY_MART_1F EQU $30

-MAP_TEAM_ROCKET_BASE_B1F EQU $31

-MAP_TEAM_ROCKET_BASE_B2F EQU $32

-MAP_TEAM_ROCKET_BASE_B3F EQU $33

-MAP_ILEX_FOREST EQU $34

-MAP_WAREHOUSE_ENTRANCE EQU $35

-MAP_UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES EQU $36

-MAP_GOLDENROD_DEPT_STORE_B1F EQU $37

-MAP_UNDERGROUND_WAREHOUSE EQU $38

-MAP_MOUNT_MORTAR_1F_OUTSIDE EQU $39

-MAP_MOUNT_MORTAR_1F_INSIDE EQU $3a

-MAP_MOUNT_MORTAR_2F_INSIDE EQU $3b

-MAP_MOUNT_MORTAR_B1F EQU $3c

-MAP_ICE_PATH_1F EQU $3d

-MAP_ICE_PATH_B1F EQU $3e

-MAP_ICE_PATH_B2F_MAHOGANY_SIDE EQU $3f

-MAP_ICE_PATH_B2F_BLACKTHORN_SIDE EQU $40

-MAP_ICE_PATH_B3F EQU $41

-MAP_WHIRL_ISLAND_NW EQU $42

-MAP_WHIRL_ISLAND_NE EQU $43

-MAP_WHIRL_ISLAND_SW EQU $44

-MAP_WHIRL_ISLAND_CAVE EQU $45

-MAP_WHIRL_ISLAND_SE EQU $46

-MAP_WHIRL_ISLAND_B1F EQU $47

-MAP_WHIRL_ISLAND_B2F EQU $48

-MAP_WHIRL_ISLAND_LUGIA_CHAMBER EQU $49

-MAP_SILVER_CAVE_ROOM_1 EQU $4a

-MAP_SILVER_CAVE_ROOM_2 EQU $4b

-MAP_SILVER_CAVE_ROOM_3 EQU $4c

-MAP_SILVER_CAVE_ITEM_ROOMS EQU $4d

-MAP_DARK_CAVE_VIOLET_ENTRANCE EQU $4e

-MAP_DARK_CAVE_BLACKTHORN_ENTRANCE EQU $4f

-MAP_DRAGONS_DEN_1F EQU $50

-MAP_DRAGONS_DEN_B1F EQU $51

-MAP_DRAGON_SHRINE EQU $52

-MAP_TOHJO_FALLS EQU $53

-MAP_DIGLETTS_CAVE EQU $54

-MAP_MOUNT_MOON EQU $55

-MAP_UNDERGROUND EQU $56

-MAP_ROCK_TUNNEL_1F EQU $57

-MAP_ROCK_TUNNEL_B1F EQU $58

-MAP_SAFARI_ZONE_FUCHSIA_GATE_BETA EQU $59

-MAP_SAFARI_ZONE_BETA EQU $5a

-MAP_VICTORY_ROAD EQU $5b

-MAP_ECRUTEAK_HOUSE EQU $01

-MAP_WISE_TRIOS_ROOM EQU $02

-MAP_ECRUTEAK_POKECENTER_1F EQU $03

-MAP_ECRUTEAK_LUGIA_SPEECH_HOUSE EQU $04

-MAP_DANCE_THEATRE EQU $05

-MAP_ECRUTEAK_MART EQU $06

-MAP_ECRUTEAK_GYM EQU $07

-MAP_ECRUTEAK_ITEMFINDER_HOUSE EQU $08

-MAP_ECRUTEAK_CITY EQU $09

-MAP_BLACKTHORN_GYM_1F EQU $01

-MAP_BLACKTHORN_GYM_2F EQU $02

-MAP_BLACKTHORN_DRAGON_SPEECH_HOUSE EQU $03

-MAP_BLACKTHORN_DODRIO_TRADE_HOUSE EQU $04

-MAP_BLACKTHORN_MART EQU $05

-MAP_BLACKTHORN_POKECENTER_1F EQU $06

-MAP_MOVE_DELETERS_HOUSE EQU $07

-MAP_ROUTE_45 EQU $08

-MAP_ROUTE_46 EQU $09

-MAP_BLACKTHORN_CITY EQU $0a

-MAP_CINNABAR_POKECENTER_1F EQU $01

-MAP_CINNABAR_POKECENTER_2F_BETA EQU $02

-MAP_ROUTE_19___FUCHSIA_GATE EQU $03

-MAP_SEAFOAM_GYM EQU $04

-MAP_ROUTE_19 EQU $05

-MAP_ROUTE_20 EQU $06

-MAP_ROUTE_21 EQU $07

-MAP_CINNABAR_ISLAND EQU $08

-MAP_CERULEAN_GYM_BADGE_SPEECH_HOUSE EQU $01

-MAP_CERULEAN_POLICE_STATION EQU $02

-MAP_CERULEAN_TRADE_SPEECH_HOUSE EQU $03

-MAP_CERULEAN_POKECENTER_1F EQU $04

-MAP_CERULEAN_POKECENTER_2F_BETA EQU $05

-MAP_CERULEAN_GYM EQU $06

-MAP_CERULEAN_MART EQU $07

-MAP_ROUTE_10_POKECENTER_1F EQU $08

-MAP_ROUTE_10_POKECENTER_2F_BETA EQU $09

-MAP_POWER_PLANT EQU $0a

-MAP_BILLS_HOUSE EQU $0b

-MAP_ROUTE_4 EQU $0c

-MAP_ROUTE_9 EQU $0d

-MAP_ROUTE_10A EQU $0e

-MAP_ROUTE_10_NORTH EQU $0e

-MAP_ROUTE_24 EQU $0f

-MAP_ROUTE_25 EQU $10

-MAP_CERULEAN_CITY EQU $11

-MAP_AZALEA_POKECENTER_1F EQU $01

-MAP_CHARCOAL_KILN EQU $02

-MAP_AZALEA_MART EQU $03

-MAP_KURTS_HOUSE EQU $04

-MAP_AZALEA_GYM EQU $05

-MAP_ROUTE_33 EQU $06

-MAP_AZALEA_TOWN EQU $07

-MAP_LAKE_OF_RAGE_HIDDEN_POWER_HOUSE EQU $01

-MAP_LAKE_OF_RAGE_MAGIKARP_HOUSE EQU $02

-MAP_ROUTE_43_MAHOGANY_GATE EQU $03

-MAP_ROUTE_43_GATE EQU $04

-MAP_ROUTE_43 EQU $05

-MAP_LAKE_OF_RAGE EQU $06

-MAP_ROUTE_32 EQU $01

-MAP_ROUTE_35 EQU $02

-MAP_ROUTE_36 EQU $03

-MAP_ROUTE_37 EQU $04

-MAP_VIOLET_CITY EQU $05

-MAP_VIOLET_MART EQU $06

-MAP_VIOLET_GYM EQU $07

-MAP_EARLS_POKEMON_ACADEMY EQU $08

-MAP_VIOLET_NICKNAME_SPEECH_HOUSE EQU $09

-MAP_VIOLET_POKECENTER_1F EQU $0a

-MAP_VIOLET_ONIX_TRADE_HOUSE EQU $0b

-MAP_ROUTE_32_RUINS_OF_ALPH_GATE EQU $0c

-MAP_ROUTE_32_POKECENTER_1F EQU $0d

-MAP_ROUTE_35_GOLDENROD_GATE EQU $0e

-MAP_ROUTE_35_NATIONAL_PARK_GATE EQU $0f

-MAP_ROUTE_36_RUINS_OF_ALPH_GATE EQU $10

-MAP_ROUTE_36_NATIONAL_PARK_GATE EQU $11

-MAP_ROUTE_34 EQU $01

-MAP_GOLDENROD_CITY EQU $02

-MAP_GOLDENROD_GYM EQU $03

-MAP_GOLDENROD_BIKE_SHOP EQU $04

-MAP_GOLDENROD_HAPPINESS_RATER EQU $05

-MAP_GOLDENROD_BILLS_HOUSE EQU $06

-MAP_GOLDENROD_MAGNET_TRAIN_STATION EQU $07

-MAP_GOLDENROD_FLOWER_SHOP EQU $08

-MAP_GOLDENROD_PP_SPEECH_HOUSE EQU $09

-MAP_GOLDENROD_NAME_RATERS_HOUSE EQU $0a

-MAP_GOLDENROD_DEPT_STORE_1F EQU $0b

-MAP_GOLDENROD_DEPT_STORE_2F EQU $0c

-MAP_GOLDENROD_DEPT_STORE_3F EQU $0d

-MAP_GOLDENROD_DEPT_STORE_4F EQU $0e

-MAP_GOLDENROD_DEPT_STORE_5F EQU $0f

-MAP_GOLDENROD_DEPT_STORE_6F EQU $10

-MAP_GOLDENROD_DEPT_STORE_ELEVATOR EQU $11

-MAP_GOLDENROD_DEPT_STORE_ROOF EQU $12

-MAP_GOLDENROD_GAME_CORNER EQU $13

-MAP_GOLDENROD_POKECENTER_1F EQU $14

-MAP_GOLDENROD_POKECOM_CENTER_2F_MOBILE EQU $15

-MAP_ILEX_FOREST_AZALEA_GATE EQU $16

-MAP_ROUTE_34_ILEX_FOREST_GATE EQU $17

-MAP_DAY_CARE EQU $18

-MAP_ROUTE_6 EQU $01

-MAP_ROUTE_11 EQU $02

-MAP_VERMILION_CITY EQU $03

-MAP_VERMILION_HOUSE_FISHING_SPEECH_HOUSE EQU $04

-MAP_VERMILION_POKECENTER_1F EQU $05

-MAP_VERMILION_POKECENTER_2F_BETA EQU $06

-MAP_POKEMON_FAN_CLUB EQU $07

-MAP_VERMILION_MAGNET_TRAIN_SPEECH_HOUSE EQU $08

-MAP_VERMILION_MART EQU $09

-MAP_VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE EQU $0a

-MAP_VERMILION_GYM EQU $0b

-MAP_ROUTE_6_SAFFRON_GATE EQU $0c

-MAP_ROUTE_6_UNDERGROUND_ENTRANCE EQU $0d

-MAP_ROUTE_1 EQU $01

-MAP_PALLET_TOWN EQU $02

-MAP_REDS_HOUSE_1F EQU $03

-MAP_REDS_HOUSE_2F EQU $04

-MAP_BLUES_HOUSE EQU $05

-MAP_OAKS_LAB EQU $06

-MAP_ROUTE_3 EQU $01

-MAP_PEWTER_CITY EQU $02

-MAP_PEWTER_NIDORAN_SPEECH_HOUSE EQU $03

-MAP_PEWTER_GYM EQU $04

-MAP_PEWTER_MART EQU $05

-MAP_PEWTER_POKECENTER_1F EQU $06

-MAP_PEWTER_POKECENTER_2F_BETA EQU $07

-MAP_PEWTER_SNOOZE_SPEECH_HOUSE EQU $08

-MAP_OLIVINE_PORT EQU $01

-MAP_VERMILION_PORT EQU $02

-MAP_FAST_SHIP_1F EQU $03

-MAP_FAST_SHIP_CABINS_NNW_NNE_NE EQU $04

-MAP_FAST_SHIP_CABINS_SW_SSW_NW EQU $05

-MAP_FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN EQU $06

-MAP_FAST_SHIP_B1F EQU $07

-MAP_OLIVINE_PORT_PASSAGE EQU $08

-MAP_VERMILION_PORT_PASSAGE EQU $09

-MAP_MOUNT_MOON_SQUARE EQU $0a

-MAP_MOUNT_MOON_GIFT_SHOP EQU $0b

-MAP_TIN_TOWER_ROOF EQU $0c

-MAP_ROUTE_23 EQU $01

-MAP_INDIGO_PLATEAU_POKECENTER_1F EQU $02

-MAP_WILLS_ROOM EQU $03

-MAP_KOGAS_ROOM EQU $04

-MAP_BRUNOS_ROOM EQU $05

-MAP_KARENS_ROOM EQU $06

-MAP_LANCES_ROOM EQU $07

-MAP_HALL_OF_FAME EQU $08

-MAP_ROUTE_13 EQU $01

-MAP_ROUTE_14 EQU $02

-MAP_ROUTE_15 EQU $03

-MAP_ROUTE_18 EQU $04

-MAP_FUCHSIA_CITY EQU $05

-MAP_FUCHSIA_MART EQU $06

-MAP_SAFARI_ZONE_MAIN_OFFICE EQU $07

-MAP_FUCHSIA_GYM EQU $08

-MAP_FUCHSIA_BILL_SPEECH_HOUSE EQU $09

-MAP_FUCHSIA_POKECENTER_1F EQU $0a

-MAP_FUCHSIA_POKECENTER_2F_BETA EQU $0b

-MAP_SAFARI_ZONE_WARDENS_HOME EQU $0c

-MAP_ROUTE_15_FUCHSIA_GATE EQU $0d

-MAP_ROUTE_8 EQU $01

-MAP_ROUTE_12 EQU $02

-MAP_ROUTE_10B EQU $03

-MAP_ROUTE_10_SOUTH EQU $03

-MAP_LAVENDER_TOWN EQU $04

-MAP_LAVENDER_POKECENTER_1F EQU $05

-MAP_LAVENDER_POKECENTER_2F_BETA EQU $06

-MAP_MR_FUJIS_HOUSE EQU $07

-MAP_LAVENDER_TOWN_SPEECH_HOUSE EQU $08

-MAP_LAVENDER_NAME_RATER EQU $09

-MAP_LAVENDER_MART EQU $0a

-MAP_SOUL_HOUSE EQU $0b

-MAP_LAV_RADIO_TOWER_1F EQU $0c

-MAP_ROUTE_8_SAFFRON_GATE EQU $0d

-MAP_ROUTE_12_SUPER_ROD_HOUSE EQU $0e

-MAP_ROUTE_28 EQU $01

-MAP_SILVER_CAVE_OUTSIDE EQU $02

-MAP_SILVER_CAVE_POKECENTER_1F EQU $03

-MAP_ROUTE_28_FAMOUS_SPEECH_HOUSE EQU $04

-MAP_POKECENTER_2F EQU $01

-MAP_TRADE_CENTER EQU $02

-MAP_COLOSSEUM EQU $03

-MAP_TIME_CAPSULE EQU $04

-MAP_MOBILE_TRADE_ROOM_MOBILE EQU $05

-MAP_MOBILE_BATTLE_ROOM EQU $06

-MAP_ROUTE_7 EQU $01

-MAP_ROUTE_16 EQU $02

-MAP_ROUTE_17 EQU $03

-MAP_CELADON_CITY EQU $04

-MAP_CELADON_DEPT_STORE_1F EQU $05

-MAP_CELADON_DEPT_STORE_2F EQU $06

-MAP_CELADON_DEPT_STORE_3F EQU $07

-MAP_CELADON_DEPT_STORE_4F EQU $08

-MAP_CELADON_DEPT_STORE_5F EQU $09

-MAP_CELADON_DEPT_STORE_6F EQU $0a

-MAP_CELADON_DEPT_STORE_ELEVATOR EQU $0b

-MAP_CELADON_MANSION_1F EQU $0c

-MAP_CELADON_MANSION_2F EQU $0d

-MAP_CELADON_MANSION_3F EQU $0e

-MAP_CELADON_MANSION_ROOF EQU $0f

-MAP_CELADON_MANSION_ROOF_HOUSE EQU $10

-MAP_CELADON_POKECENTER_1F EQU $11

-MAP_CELADON_POKECENTER_2F_BETA EQU $12

-MAP_CELADON_GAME_CORNER EQU $13

-MAP_CELADON_GAME_CORNER_PRIZE_ROOM EQU $14

-MAP_CELADON_GYM EQU $15

-MAP_CELADON_CAFE EQU $16

-MAP_ROUTE_16_FUCHSIA_SPEECH_HOUSE EQU $17

-MAP_ROUTE_16_GATE EQU $18

-MAP_ROUTE_7_SAFFRON_GATE EQU $19

-MAP_ROUTE_17_18_GATE EQU $1a

-MAP_ROUTE_40 EQU $01

-MAP_ROUTE_41 EQU $02

-MAP_CIANWOOD_CITY EQU $03

-MAP_MANIAS_HOUSE EQU $04

-MAP_CIANWOOD_GYM EQU $05

-MAP_CIANWOOD_POKECENTER_1F EQU $06

-MAP_CIANWOOD_PHARMACY EQU $07

-MAP_CIANWOOD_CITY_PHOTO_STUDIO EQU $08

-MAP_CIANWOOD_LUGIA_SPEECH_HOUSE EQU $09

-MAP_POKE_SEERS_HOUSE EQU $0a

-MAP_BATTLE_TOWER_1F EQU $0b

-MAP_BATTLE_TOWER_BATTLE_ROOM EQU $0c

-MAP_BATTLE_TOWER_ELEVATOR EQU $0d

-MAP_BATTLE_TOWER_HALLWAY EQU $0e

-MAP_ROUTE_40_BATTLE_TOWER_GATE EQU $0f

-MAP_BATTLE_TOWER_OUTSIDE EQU $10

-MAP_ROUTE_2 EQU $01

-MAP_ROUTE_22 EQU $02

-MAP_VIRIDIAN_CITY EQU $03

-MAP_VIRIDIAN_GYM EQU $04

-MAP_VIRIDIAN_NICKNAME_SPEECH_HOUSE EQU $05

-MAP_TRAINER_HOUSE_1F EQU $06

-MAP_TRAINER_HOUSE_B1F EQU $07

-MAP_VIRIDIAN_MART EQU $08

-MAP_VIRIDIAN_POKECENTER_1F EQU $09

-MAP_VIRIDIAN_POKECENTER_2F_BETA EQU $0a

-MAP_ROUTE_2_NUGGET_SPEECH_HOUSE EQU $0b

-MAP_ROUTE_2_GATE EQU $0c

-MAP_VICTORY_ROAD_GATE EQU $0d

-MAP_ROUTE_26 EQU $01

-MAP_ROUTE_27 EQU $02

-MAP_ROUTE_29 EQU $03

-MAP_NEW_BARK_TOWN EQU $04

-MAP_ELMS_LAB EQU $05

-MAP_KRISS_HOUSE_1F EQU $06

-MAP_KRISS_HOUSE_2F EQU $07

-MAP_KRISS_NEIGHBORS_HOUSE EQU $08

-MAP_ELMS_HOUSE EQU $09

-MAP_ROUTE_26_HEAL_SPEECH_HOUSE EQU $0a

-MAP_ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE EQU $0b

-MAP_ROUTE_27_SANDSTORM_HOUSE EQU $0c

-MAP_ROUTE_29_46_GATE EQU $0d

-MAP_ROUTE_5 EQU $01

-MAP_SAFFRON_CITY EQU $02

-MAP_FIGHTING_DOJO EQU $03

-MAP_SAFFRON_GYM EQU $04

-MAP_SAFFRON_MART EQU $05

-MAP_SAFFRON_POKECENTER_1F EQU $06

-MAP_SAFFRON_POKECENTER_2F_BETA EQU $07

-MAP_MR_PSYCHICS_HOUSE EQU $08

-MAP_SAFFRON_TRAIN_STATION EQU $09

-MAP_SILPH_CO_1F EQU $0a

-MAP_COPYCATS_HOUSE_1F EQU $0b

-MAP_COPYCATS_HOUSE_2F EQU $0c

-MAP_ROUTE_5_UNDERGROUND_ENTRANCE EQU $0d

-MAP_ROUTE_5_SAFFRON_CITY_GATE EQU $0e

-MAP_ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE EQU $0f

-MAP_ROUTE_30 EQU $01

-MAP_ROUTE_31 EQU $02

-MAP_CHERRYGROVE_CITY EQU $03

-MAP_CHERRYGROVE_MART EQU $04

-MAP_CHERRYGROVE_POKECENTER_1F EQU $05

-MAP_CHERRYGROVE_GYM_SPEECH_HOUSE EQU $06

-MAP_GUIDE_GENTS_HOUSE EQU $07

-MAP_CHERRYGROVE_EVOLUTION_SPEECH_HOUSE EQU $08

-MAP_ROUTE_30_BERRY_SPEECH_HOUSE EQU $09

-MAP_MR_POKEMONS_HOUSE EQU $0a

-MAP_ROUTE_31_VIOLET_GATE EQU $0b

+	newgroup

+	mapgroup MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 4, 4

+	mapgroup MAHOGANY_GYM, 9, 5

+	mapgroup MAHOGANY_POKECENTER_1F, 4, 5

+	mapgroup ROUTE_42_ECRUTEAK_GATE, 4, 5

+	mapgroup ROUTE_42, 9, 30

+	mapgroup ROUTE_44, 9, 30

+	mapgroup MAHOGANY_TOWN, 9, 10

+	newgroup

+	mapgroup SPROUT_TOWER_1F, 8, 10

+	mapgroup SPROUT_TOWER_2F, 8, 10

+	mapgroup SPROUT_TOWER_3F, 8, 10

+	mapgroup TIN_TOWER_1F, 9, 10

+	mapgroup TIN_TOWER_2F, 9, 10

+	mapgroup TIN_TOWER_3F, 9, 10

+	mapgroup TIN_TOWER_4F, 9, 10

+	mapgroup TIN_TOWER_5F, 9, 10

+	mapgroup TIN_TOWER_6F, 9, 10

+	mapgroup TIN_TOWER_7F, 9, 10

+	mapgroup TIN_TOWER_8F, 9, 10

+	mapgroup TIN_TOWER_9F, 9, 10

+	mapgroup BURNED_TOWER_1F, 9, 10

+	mapgroup BURNED_TOWER_B1F, 9, 10

+	mapgroup NATIONAL_PARK, 27, 20

+	mapgroup NATIONAL_PARK_BUG_CONTEST, 27, 20

+	mapgroup RADIO_TOWER_1F, 4, 9

+	mapgroup RADIO_TOWER_2F, 4, 9

+	mapgroup RADIO_TOWER_3F, 4, 9

+	mapgroup RADIO_TOWER_4F, 4, 9

+	mapgroup RADIO_TOWER_5F, 4, 9

+	mapgroup RUINS_OF_ALPH_OUTSIDE, 18, 10

+	mapgroup RUINS_OF_ALPH_HO_OH_CHAMBER, 5, 4

+	mapgroup RUINS_OF_ALPH_KABUTO_CHAMBER, 5, 4

+	mapgroup RUINS_OF_ALPH_OMANYTE_CHAMBER, 5, 4

+	mapgroup RUINS_OF_ALPH_AERODACTYL_CHAMBER, 5, 4

+	mapgroup RUINS_OF_ALPH_INNER_CHAMBER, 14, 10

+	mapgroup RUINS_OF_ALPH_RESEARCH_CENTER, 4, 4

+	mapgroup RUINS_OF_ALPH_HO_OH_ITEM_ROOM, 5, 4

+	mapgroup RUINS_OF_ALPH_KABUTO_ITEM_ROOM, 5, 4

+	mapgroup RUINS_OF_ALPH_OMANYTE_ITEM_ROOM, 5, 4

+	mapgroup RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM, 5, 4

+	mapgroup RUINS_OF_ALPH_HO_OH_WORD_ROOM, 12, 10

+	mapgroup RUINS_OF_ALPH_KABUTO_WORD_ROOM, 7, 10

+	mapgroup RUINS_OF_ALPH_OMANYTE_WORD_ROOM, 8, 10

+	mapgroup RUINS_OF_ALPH_AERODACTYL_WORD_ROOM, 7, 10

+	mapgroup UNION_CAVE_1F, 18, 10

+	mapgroup UNION_CAVE_B1F, 18, 10

+	mapgroup UNION_CAVE_B2F, 18, 10

+	mapgroup SLOWPOKE_WELL_B1F, 9, 10

+	mapgroup SLOWPOKE_WELL_B2F, 9, 10

+	mapgroup OLIVINE_LIGHTHOUSE_1F, 9, 10

+	mapgroup OLIVINE_LIGHTHOUSE_2F, 9, 10

+	mapgroup OLIVINE_LIGHTHOUSE_3F, 9, 10

+	mapgroup OLIVINE_LIGHTHOUSE_4F, 9, 10

+	mapgroup OLIVINE_LIGHTHOUSE_5F, 9, 10

+	mapgroup OLIVINE_LIGHTHOUSE_6F, 9, 10

+	mapgroup MAHOGANY_MART_1F, 4, 4

+	mapgroup TEAM_ROCKET_BASE_B1F, 9, 15

+	mapgroup TEAM_ROCKET_BASE_B2F, 9, 15

+	mapgroup TEAM_ROCKET_BASE_B3F, 9, 15

+	mapgroup ILEX_FOREST, 27, 15

+	mapgroup WAREHOUSE_ENTRANCE, 18, 15

+	mapgroup UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES, 18, 15

+	mapgroup GOLDENROD_DEPT_STORE_B1F, 9, 10

+	mapgroup UNDERGROUND_WAREHOUSE, 9, 10

+	mapgroup MOUNT_MORTAR_1F_OUTSIDE, 18, 20

+	mapgroup MOUNT_MORTAR_1F_INSIDE, 27, 20

+	mapgroup MOUNT_MORTAR_2F_INSIDE, 18, 20

+	mapgroup MOUNT_MORTAR_B1F, 18, 20

+	mapgroup ICE_PATH_1F, 18, 20

+	mapgroup ICE_PATH_B1F, 18, 10

+	mapgroup ICE_PATH_B2F_MAHOGANY_SIDE, 9, 10

+	mapgroup ICE_PATH_B2F_BLACKTHORN_SIDE, 9, 5

+	mapgroup ICE_PATH_B3F, 9, 10

+	mapgroup WHIRL_ISLAND_NW, 9, 5

+	mapgroup WHIRL_ISLAND_NE, 9, 10

+	mapgroup WHIRL_ISLAND_SW, 9, 10

+	mapgroup WHIRL_ISLAND_CAVE, 9, 5

+	mapgroup WHIRL_ISLAND_SE, 9, 5

+	mapgroup WHIRL_ISLAND_B1F, 18, 20

+	mapgroup WHIRL_ISLAND_B2F, 18, 10

+	mapgroup WHIRL_ISLAND_LUGIA_CHAMBER, 9, 10

+	mapgroup SILVER_CAVE_ROOM_1, 18, 10

+	mapgroup SILVER_CAVE_ROOM_2, 18, 15

+	mapgroup SILVER_CAVE_ROOM_3, 18, 10

+	mapgroup SILVER_CAVE_ITEM_ROOMS, 9, 10

+	mapgroup DARK_CAVE_VIOLET_ENTRANCE, 18, 20

+	mapgroup DARK_CAVE_BLACKTHORN_ENTRANCE, 18, 15

+	mapgroup DRAGONS_DEN_1F, 9, 5

+	mapgroup DRAGONS_DEN_B1F, 18, 20

+	mapgroup DRAGON_SHRINE, 5, 5

+	mapgroup TOHJO_FALLS, 9, 15

+	mapgroup DIGLETTS_CAVE, 18, 10

+	mapgroup MOUNT_MOON, 9, 15

+	mapgroup UNDERGROUND, 14, 3

+	mapgroup ROCK_TUNNEL_1F, 18, 15

+	mapgroup ROCK_TUNNEL_B1F, 18, 15

+	mapgroup SAFARI_ZONE_FUCHSIA_GATE_BETA, 4, 5

+	mapgroup SAFARI_ZONE_BETA, 18, 10

+	mapgroup VICTORY_ROAD, 36, 10

-; map dimensions

-OLIVINE_POKECENTER_1F_HEIGHT EQU 4

-OLIVINE_POKECENTER_1F_WIDTH EQU 5

-OLIVINE_GYM_HEIGHT EQU 8

-OLIVINE_GYM_WIDTH EQU 5

-OLIVINE_VOLTORB_HOUSE_HEIGHT EQU 4

-OLIVINE_VOLTORB_HOUSE_WIDTH EQU 4

-OLIVINE_HOUSE_BETA_HEIGHT EQU 4

-OLIVINE_HOUSE_BETA_WIDTH EQU 4

-OLIVINE_PUNISHMENT_SPEECH_HOUSE_HEIGHT EQU 4

-OLIVINE_PUNISHMENT_SPEECH_HOUSE_WIDTH EQU 4

-OLIVINE_GOOD_ROD_HOUSE_HEIGHT EQU 4

-OLIVINE_GOOD_ROD_HOUSE_WIDTH EQU 4

-OLIVINE_CAFE_HEIGHT EQU 4

-OLIVINE_CAFE_WIDTH EQU 4

-OLIVINE_MART_HEIGHT EQU 4

-OLIVINE_MART_WIDTH EQU 6

-ROUTE_38_ECRUTEAK_GATE_HEIGHT EQU 4

-ROUTE_38_ECRUTEAK_GATE_WIDTH EQU 5

-ROUTE_39_BARN_HEIGHT EQU 4

-ROUTE_39_BARN_WIDTH EQU 4

-ROUTE_39_FARMHOUSE_HEIGHT EQU 4

-ROUTE_39_FARMHOUSE_WIDTH EQU 4

-ROUTE_38_HEIGHT EQU 9

-ROUTE_38_WIDTH EQU 20

-ROUTE_39_HEIGHT EQU 18

-ROUTE_39_WIDTH EQU 10

-OLIVINE_CITY_HEIGHT EQU 18

-OLIVINE_CITY_WIDTH EQU 20

-MAHOGANY_RED_GYARADOS_SPEECH_HOUSE_HEIGHT EQU 4

-MAHOGANY_RED_GYARADOS_SPEECH_HOUSE_WIDTH EQU 4

-MAHOGANY_GYM_HEIGHT EQU 9

-MAHOGANY_GYM_WIDTH EQU 5

-MAHOGANY_POKECENTER_1F_HEIGHT EQU 4

-MAHOGANY_POKECENTER_1F_WIDTH EQU 5

-ROUTE_42_ECRUTEAK_GATE_HEIGHT EQU 4

-ROUTE_42_ECRUTEAK_GATE_WIDTH EQU 5

-ROUTE_42_HEIGHT EQU 9

-ROUTE_42_WIDTH EQU 30

-ROUTE_44_HEIGHT EQU 9

-ROUTE_44_WIDTH EQU 30

-MAHOGANY_TOWN_HEIGHT EQU 9

-MAHOGANY_TOWN_WIDTH EQU 10

-SPROUT_TOWER_1F_HEIGHT EQU 8

-SPROUT_TOWER_1F_WIDTH EQU 10

-SPROUT_TOWER_2F_HEIGHT EQU 8

-SPROUT_TOWER_2F_WIDTH EQU 10

-SPROUT_TOWER_3F_HEIGHT EQU 8

-SPROUT_TOWER_3F_WIDTH EQU 10

-TIN_TOWER_1F_HEIGHT EQU 9

-TIN_TOWER_1F_WIDTH EQU 10

-TIN_TOWER_2F_HEIGHT EQU 9

-TIN_TOWER_2F_WIDTH EQU 10

-TIN_TOWER_3F_HEIGHT EQU 9

-TIN_TOWER_3F_WIDTH EQU 10

-TIN_TOWER_4F_HEIGHT EQU 9

-TIN_TOWER_4F_WIDTH EQU 10

-TIN_TOWER_5F_HEIGHT EQU 9

-TIN_TOWER_5F_WIDTH EQU 10

-TIN_TOWER_6F_HEIGHT EQU 9

-TIN_TOWER_6F_WIDTH EQU 10

-TIN_TOWER_7F_HEIGHT EQU 9

-TIN_TOWER_7F_WIDTH EQU 10

-TIN_TOWER_8F_HEIGHT EQU 9

-TIN_TOWER_8F_WIDTH EQU 10

-TIN_TOWER_9F_HEIGHT EQU 9

-TIN_TOWER_9F_WIDTH EQU 10

-BURNED_TOWER_1F_HEIGHT EQU 9

-BURNED_TOWER_1F_WIDTH EQU 10

-BURNED_TOWER_B1F_HEIGHT EQU 9

-BURNED_TOWER_B1F_WIDTH EQU 10

-NATIONAL_PARK_HEIGHT EQU 27

-NATIONAL_PARK_WIDTH EQU 20

-NATIONAL_PARK_BUG_CONTEST_HEIGHT EQU 27

-NATIONAL_PARK_BUG_CONTEST_WIDTH EQU 20

-RADIO_TOWER_1F_HEIGHT EQU 4

-RADIO_TOWER_1F_WIDTH EQU 9

-RADIO_TOWER_2F_HEIGHT EQU 4

-RADIO_TOWER_2F_WIDTH EQU 9

-RADIO_TOWER_3F_HEIGHT EQU 4

-RADIO_TOWER_3F_WIDTH EQU 9

-RADIO_TOWER_4F_HEIGHT EQU 4

-RADIO_TOWER_4F_WIDTH EQU 9

-RADIO_TOWER_5F_HEIGHT EQU 4

-RADIO_TOWER_5F_WIDTH EQU 9

-RUINS_OF_ALPH_OUTSIDE_HEIGHT EQU 18

-RUINS_OF_ALPH_OUTSIDE_WIDTH EQU 10

-RUINS_OF_ALPH_HO_OH_CHAMBER_HEIGHT EQU 5

-RUINS_OF_ALPH_HO_OH_CHAMBER_WIDTH EQU 4

-RUINS_OF_ALPH_KABUTO_CHAMBER_HEIGHT EQU 5

-RUINS_OF_ALPH_KABUTO_CHAMBER_WIDTH EQU 4

-RUINS_OF_ALPH_OMANYTE_CHAMBER_HEIGHT EQU 5

-RUINS_OF_ALPH_OMANYTE_CHAMBER_WIDTH EQU 4

-RUINS_OF_ALPH_AERODACTYL_CHAMBER_HEIGHT EQU 5

-RUINS_OF_ALPH_AERODACTYL_CHAMBER_WIDTH EQU 4

-RUINS_OF_ALPH_INNER_CHAMBER_HEIGHT EQU 14

-RUINS_OF_ALPH_INNER_CHAMBER_WIDTH EQU 10

-RUINS_OF_ALPH_RESEARCH_CENTER_HEIGHT EQU 4

-RUINS_OF_ALPH_RESEARCH_CENTER_WIDTH EQU 4

-RUINS_OF_ALPH_HO_OH_ITEM_ROOM_HEIGHT EQU 5

-RUINS_OF_ALPH_HO_OH_ITEM_ROOM_WIDTH EQU 4

-RUINS_OF_ALPH_KABUTO_ITEM_ROOM_HEIGHT EQU 5

-RUINS_OF_ALPH_KABUTO_ITEM_ROOM_WIDTH EQU 4

-RUINS_OF_ALPH_OMANYTE_ITEM_ROOM_HEIGHT EQU 5

-RUINS_OF_ALPH_OMANYTE_ITEM_ROOM_WIDTH EQU 4

-RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM_HEIGHT EQU 5

-RUINS_OF_ALPH_AERODACTYL_ITEM_ROOM_WIDTH EQU 4

-RUINS_OF_ALPH_HO_OH_WORD_ROOM_HEIGHT EQU 12

-RUINS_OF_ALPH_HO_OH_WORD_ROOM_WIDTH EQU 10

-RUINS_OF_ALPH_KABUTO_WORD_ROOM_HEIGHT EQU 7

-RUINS_OF_ALPH_KABUTO_WORD_ROOM_WIDTH EQU 10

-RUINS_OF_ALPH_OMANYTE_WORD_ROOM_HEIGHT EQU 8

-RUINS_OF_ALPH_OMANYTE_WORD_ROOM_WIDTH EQU 10

-RUINS_OF_ALPH_AERODACTYL_WORD_ROOM_HEIGHT EQU 7

-RUINS_OF_ALPH_AERODACTYL_WORD_ROOM_WIDTH EQU 10

-UNION_CAVE_1F_HEIGHT EQU 18

-UNION_CAVE_1F_WIDTH EQU 10

-UNION_CAVE_B1F_HEIGHT EQU 18

-UNION_CAVE_B1F_WIDTH EQU 10

-UNION_CAVE_B2F_HEIGHT EQU 18

-UNION_CAVE_B2F_WIDTH EQU 10

-SLOWPOKE_WELL_B1F_HEIGHT EQU 9

-SLOWPOKE_WELL_B1F_WIDTH EQU 10

-SLOWPOKE_WELL_B2F_HEIGHT EQU 9

-SLOWPOKE_WELL_B2F_WIDTH EQU 10

-OLIVINE_LIGHTHOUSE_1F_HEIGHT EQU 9

-OLIVINE_LIGHTHOUSE_1F_WIDTH EQU 10

-OLIVINE_LIGHTHOUSE_2F_HEIGHT EQU 9

-OLIVINE_LIGHTHOUSE_2F_WIDTH EQU 10

-OLIVINE_LIGHTHOUSE_3F_HEIGHT EQU 9

-OLIVINE_LIGHTHOUSE_3F_WIDTH EQU 10

-OLIVINE_LIGHTHOUSE_4F_HEIGHT EQU 9

-OLIVINE_LIGHTHOUSE_4F_WIDTH EQU 10

-OLIVINE_LIGHTHOUSE_5F_HEIGHT EQU 9

-OLIVINE_LIGHTHOUSE_5F_WIDTH EQU 10

-OLIVINE_LIGHTHOUSE_6F_HEIGHT EQU 9

-OLIVINE_LIGHTHOUSE_6F_WIDTH EQU 10

-MAHOGANY_MART_1F_HEIGHT EQU 4

-MAHOGANY_MART_1F_WIDTH EQU 4

-TEAM_ROCKET_BASE_B1F_HEIGHT EQU 9

-TEAM_ROCKET_BASE_B1F_WIDTH EQU 15

-TEAM_ROCKET_BASE_B2F_HEIGHT EQU 9

-TEAM_ROCKET_BASE_B2F_WIDTH EQU 15

-TEAM_ROCKET_BASE_B3F_HEIGHT EQU 9

-TEAM_ROCKET_BASE_B3F_WIDTH EQU 15

-ILEX_FOREST_HEIGHT EQU 27

-ILEX_FOREST_WIDTH EQU 15

-WAREHOUSE_ENTRANCE_HEIGHT EQU 18

-WAREHOUSE_ENTRANCE_WIDTH EQU 15

-UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_HEIGHT EQU 18

-UNDERGROUND_PATH_SWITCH_ROOM_ENTRANCES_WIDTH EQU 15

-GOLDENROD_DEPT_STORE_B1F_HEIGHT EQU 9

-GOLDENROD_DEPT_STORE_B1F_WIDTH EQU 10

-UNDERGROUND_WAREHOUSE_HEIGHT EQU 9

-UNDERGROUND_WAREHOUSE_WIDTH EQU 10

-MOUNT_MORTAR_1F_OUTSIDE_HEIGHT EQU 18

-MOUNT_MORTAR_1F_OUTSIDE_WIDTH EQU 20

-MOUNT_MORTAR_1F_INSIDE_HEIGHT EQU 27

-MOUNT_MORTAR_1F_INSIDE_WIDTH EQU 20

-MOUNT_MORTAR_2F_INSIDE_HEIGHT EQU 18

-MOUNT_MORTAR_2F_INSIDE_WIDTH EQU 20

-MOUNT_MORTAR_B1F_HEIGHT EQU 18

-MOUNT_MORTAR_B1F_WIDTH EQU 20

-ICE_PATH_1F_HEIGHT EQU 18

-ICE_PATH_1F_WIDTH EQU 20

-ICE_PATH_B1F_HEIGHT EQU 18

-ICE_PATH_B1F_WIDTH EQU 10

-ICE_PATH_B2F_MAHOGANY_SIDE_HEIGHT EQU 9

-ICE_PATH_B2F_MAHOGANY_SIDE_WIDTH EQU 10

-ICE_PATH_B2F_BLACKTHORN_SIDE_HEIGHT EQU 9

-ICE_PATH_B2F_BLACKTHORN_SIDE_WIDTH EQU 5

-ICE_PATH_B3F_HEIGHT EQU 9

-ICE_PATH_B3F_WIDTH EQU 10

-WHIRL_ISLAND_NW_HEIGHT EQU 9

-WHIRL_ISLAND_NW_WIDTH EQU 5

-WHIRL_ISLAND_NE_HEIGHT EQU 9

-WHIRL_ISLAND_NE_WIDTH EQU 10

-WHIRL_ISLAND_SW_HEIGHT EQU 9

-WHIRL_ISLAND_SW_WIDTH EQU 10

-WHIRL_ISLAND_CAVE_HEIGHT EQU 9

-WHIRL_ISLAND_CAVE_WIDTH EQU 5

-WHIRL_ISLAND_SE_HEIGHT EQU 9

-WHIRL_ISLAND_SE_WIDTH EQU 5

-WHIRL_ISLAND_B1F_HEIGHT EQU 18

-WHIRL_ISLAND_B1F_WIDTH EQU 20

-WHIRL_ISLAND_B2F_HEIGHT EQU 18

-WHIRL_ISLAND_B2F_WIDTH EQU 10

-WHIRL_ISLAND_LUGIA_CHAMBER_HEIGHT EQU 9

-WHIRL_ISLAND_LUGIA_CHAMBER_WIDTH EQU 10

-SILVER_CAVE_ROOM_1_HEIGHT EQU 18

-SILVER_CAVE_ROOM_1_WIDTH EQU 10

-SILVER_CAVE_ROOM_2_HEIGHT EQU 18

-SILVER_CAVE_ROOM_2_WIDTH EQU 15

-SILVER_CAVE_ROOM_3_HEIGHT EQU 18

-SILVER_CAVE_ROOM_3_WIDTH EQU 10

-SILVER_CAVE_ITEM_ROOMS_HEIGHT EQU 9

-SILVER_CAVE_ITEM_ROOMS_WIDTH EQU 10

-DARK_CAVE_VIOLET_ENTRANCE_HEIGHT EQU 18

-DARK_CAVE_VIOLET_ENTRANCE_WIDTH EQU 20

-DARK_CAVE_BLACKTHORN_ENTRANCE_HEIGHT EQU 18

-DARK_CAVE_BLACKTHORN_ENTRANCE_WIDTH EQU 15

-DRAGONS_DEN_1F_HEIGHT EQU 9

-DRAGONS_DEN_1F_WIDTH EQU 5

-DRAGONS_DEN_B1F_HEIGHT EQU 18

-DRAGONS_DEN_B1F_WIDTH EQU 20

-DRAGON_SHRINE_HEIGHT EQU 5

-DRAGON_SHRINE_WIDTH EQU 5

-TOHJO_FALLS_HEIGHT EQU 9

-TOHJO_FALLS_WIDTH EQU 15

-DIGLETTS_CAVE_HEIGHT EQU 18

-DIGLETTS_CAVE_WIDTH EQU 10

-MOUNT_MOON_HEIGHT EQU 9

-MOUNT_MOON_WIDTH EQU 15

-UNDERGROUND_HEIGHT EQU 14

-UNDERGROUND_WIDTH EQU 3

-ROCK_TUNNEL_1F_HEIGHT EQU 18

-ROCK_TUNNEL_1F_WIDTH EQU 15

-ROCK_TUNNEL_B1F_HEIGHT EQU 18

-ROCK_TUNNEL_B1F_WIDTH EQU 15

-SAFARI_ZONE_FUCHSIA_GATE_BETA_HEIGHT EQU 4

-SAFARI_ZONE_FUCHSIA_GATE_BETA_WIDTH EQU 5

-SAFARI_ZONE_BETA_HEIGHT EQU 18

-SAFARI_ZONE_BETA_WIDTH EQU 10

-VICTORY_ROAD_HEIGHT EQU 36

-VICTORY_ROAD_WIDTH EQU 10

-ECRUTEAK_HOUSE_HEIGHT EQU 9

-ECRUTEAK_HOUSE_WIDTH EQU 10

-WISE_TRIOS_ROOM_HEIGHT EQU 4

-WISE_TRIOS_ROOM_WIDTH EQU 4

-ECRUTEAK_POKECENTER_1F_HEIGHT EQU 4

-ECRUTEAK_POKECENTER_1F_WIDTH EQU 5

-ECRUTEAK_LUGIA_SPEECH_HOUSE_HEIGHT EQU 4

-ECRUTEAK_LUGIA_SPEECH_HOUSE_WIDTH EQU 4

-DANCE_THEATRE_HEIGHT EQU 7

-DANCE_THEATRE_WIDTH EQU 6

-ECRUTEAK_MART_HEIGHT EQU 4

-ECRUTEAK_MART_WIDTH EQU 6

-ECRUTEAK_GYM_HEIGHT EQU 9

-ECRUTEAK_GYM_WIDTH EQU 5

-ECRUTEAK_ITEMFINDER_HOUSE_HEIGHT EQU 4

-ECRUTEAK_ITEMFINDER_HOUSE_WIDTH EQU 4

-ECRUTEAK_CITY_HEIGHT EQU 18

-ECRUTEAK_CITY_WIDTH EQU 20

-BLACKTHORN_GYM_1F_HEIGHT EQU 9

-BLACKTHORN_GYM_1F_WIDTH EQU 5

-BLACKTHORN_GYM_2F_HEIGHT EQU 9

-BLACKTHORN_GYM_2F_WIDTH EQU 5

-BLACKTHORN_DRAGON_SPEECH_HOUSE_HEIGHT EQU 4

-BLACKTHORN_DRAGON_SPEECH_HOUSE_WIDTH EQU 4

-BLACKTHORN_DODRIO_TRADE_HOUSE_HEIGHT EQU 4

-BLACKTHORN_DODRIO_TRADE_HOUSE_WIDTH EQU 4

-BLACKTHORN_MART_HEIGHT EQU 4

-BLACKTHORN_MART_WIDTH EQU 6

-BLACKTHORN_POKECENTER_1F_HEIGHT EQU 4

-BLACKTHORN_POKECENTER_1F_WIDTH EQU 5

-MOVE_DELETERS_HOUSE_HEIGHT EQU 4

-MOVE_DELETERS_HOUSE_WIDTH EQU 4

-ROUTE_45_HEIGHT EQU 45

-ROUTE_45_WIDTH EQU 10

-ROUTE_46_HEIGHT EQU 18

-ROUTE_46_WIDTH EQU 10

-BLACKTHORN_CITY_HEIGHT EQU 18

-BLACKTHORN_CITY_WIDTH EQU 20

-CINNABAR_POKECENTER_1F_HEIGHT EQU 4

-CINNABAR_POKECENTER_1F_WIDTH EQU 5

-CINNABAR_POKECENTER_2F_BETA_HEIGHT EQU 4

-CINNABAR_POKECENTER_2F_BETA_WIDTH EQU 8

-ROUTE_19___FUCHSIA_GATE_HEIGHT EQU 4

-ROUTE_19___FUCHSIA_GATE_WIDTH EQU 5

-SEAFOAM_GYM_HEIGHT EQU 4

-SEAFOAM_GYM_WIDTH EQU 5

-ROUTE_19_HEIGHT EQU 18

-ROUTE_19_WIDTH EQU 10

-ROUTE_20_HEIGHT EQU 9

-ROUTE_20_WIDTH EQU 30

-ROUTE_21_HEIGHT EQU 18

-ROUTE_21_WIDTH EQU 10

-CINNABAR_ISLAND_HEIGHT EQU 9

-CINNABAR_ISLAND_WIDTH EQU 10

-CERULEAN_GYM_BADGE_SPEECH_HOUSE_HEIGHT EQU 4

-CERULEAN_GYM_BADGE_SPEECH_HOUSE_WIDTH EQU 4

-CERULEAN_POLICE_STATION_HEIGHT EQU 4

-CERULEAN_POLICE_STATION_WIDTH EQU 4

-CERULEAN_TRADE_SPEECH_HOUSE_HEIGHT EQU 4

-CERULEAN_TRADE_SPEECH_HOUSE_WIDTH EQU 4

-CERULEAN_POKECENTER_1F_HEIGHT EQU 4

-CERULEAN_POKECENTER_1F_WIDTH EQU 5

-CERULEAN_POKECENTER_2F_BETA_HEIGHT EQU 4

-CERULEAN_POKECENTER_2F_BETA_WIDTH EQU 8

-CERULEAN_GYM_HEIGHT EQU 8

-CERULEAN_GYM_WIDTH EQU 5

-CERULEAN_MART_HEIGHT EQU 4

-CERULEAN_MART_WIDTH EQU 6

-ROUTE_10_POKECENTER_1F_HEIGHT EQU 4

-ROUTE_10_POKECENTER_1F_WIDTH EQU 5

-ROUTE_10_POKECENTER_2F_BETA_HEIGHT EQU 4

-ROUTE_10_POKECENTER_2F_BETA_WIDTH EQU 8

-POWER_PLANT_HEIGHT EQU 9

-POWER_PLANT_WIDTH EQU 10

-BILLS_HOUSE_HEIGHT EQU 4

-BILLS_HOUSE_WIDTH EQU 4

-ROUTE_4_HEIGHT EQU 9

-ROUTE_4_WIDTH EQU 20

-ROUTE_9_HEIGHT EQU 9

-ROUTE_9_WIDTH EQU 30

-ROUTE_10_NORTH_HEIGHT EQU 9

-ROUTE_10_NORTH_WIDTH EQU 10

-ROUTE_24_HEIGHT EQU 9

-ROUTE_24_WIDTH EQU 10

-ROUTE_25_HEIGHT EQU 9

-ROUTE_25_WIDTH EQU 30

-CERULEAN_CITY_HEIGHT EQU 18

-CERULEAN_CITY_WIDTH EQU 20

-AZALEA_POKECENTER_1F_HEIGHT EQU 4

-AZALEA_POKECENTER_1F_WIDTH EQU 5

-CHARCOAL_KILN_HEIGHT EQU 4

-CHARCOAL_KILN_WIDTH EQU 4

-AZALEA_MART_HEIGHT EQU 4

-AZALEA_MART_WIDTH EQU 6

-KURTS_HOUSE_HEIGHT EQU 4

-KURTS_HOUSE_WIDTH EQU 8

-AZALEA_GYM_HEIGHT EQU 8

-AZALEA_GYM_WIDTH EQU 5

-ROUTE_33_HEIGHT EQU 9

-ROUTE_33_WIDTH EQU 10

-AZALEA_TOWN_HEIGHT EQU 9

-AZALEA_TOWN_WIDTH EQU 20

-LAKE_OF_RAGE_HIDDEN_POWER_HOUSE_HEIGHT EQU 4

-LAKE_OF_RAGE_HIDDEN_POWER_HOUSE_WIDTH EQU 4

-LAKE_OF_RAGE_MAGIKARP_HOUSE_HEIGHT EQU 4

-LAKE_OF_RAGE_MAGIKARP_HOUSE_WIDTH EQU 4

-ROUTE_43_MAHOGANY_GATE_HEIGHT EQU 4

-ROUTE_43_MAHOGANY_GATE_WIDTH EQU 5

-ROUTE_43_GATE_HEIGHT EQU 4

-ROUTE_43_GATE_WIDTH EQU 5

-ROUTE_43_HEIGHT EQU 27

-ROUTE_43_WIDTH EQU 10

-LAKE_OF_RAGE_HEIGHT EQU 18

-LAKE_OF_RAGE_WIDTH EQU 20

-ROUTE_32_HEIGHT EQU 45

-ROUTE_32_WIDTH EQU 10

-ROUTE_35_HEIGHT EQU 18

-ROUTE_35_WIDTH EQU 10

-ROUTE_36_HEIGHT EQU 9

-ROUTE_36_WIDTH EQU 30

-ROUTE_37_HEIGHT EQU 9

-ROUTE_37_WIDTH EQU 10

-VIOLET_CITY_HEIGHT EQU 18

-VIOLET_CITY_WIDTH EQU 20

-VIOLET_MART_HEIGHT EQU 4

-VIOLET_MART_WIDTH EQU 6

-VIOLET_GYM_HEIGHT EQU 8

-VIOLET_GYM_WIDTH EQU 5

-EARLS_POKEMON_ACADEMY_HEIGHT EQU 8

-EARLS_POKEMON_ACADEMY_WIDTH EQU 4

-VIOLET_NICKNAME_SPEECH_HOUSE_HEIGHT EQU 4

-VIOLET_NICKNAME_SPEECH_HOUSE_WIDTH EQU 4

-VIOLET_POKECENTER_1F_HEIGHT EQU 4

-VIOLET_POKECENTER_1F_WIDTH EQU 5

-VIOLET_ONIX_TRADE_HOUSE_HEIGHT EQU 4

-VIOLET_ONIX_TRADE_HOUSE_WIDTH EQU 4

-ROUTE_32_RUINS_OF_ALPH_GATE_HEIGHT EQU 4

-ROUTE_32_RUINS_OF_ALPH_GATE_WIDTH EQU 5

-ROUTE_32_POKECENTER_1F_HEIGHT EQU 4

-ROUTE_32_POKECENTER_1F_WIDTH EQU 5

-ROUTE_35_GOLDENROD_GATE_HEIGHT EQU 4

-ROUTE_35_GOLDENROD_GATE_WIDTH EQU 5

-ROUTE_35_NATIONAL_PARK_GATE_HEIGHT EQU 4

-ROUTE_35_NATIONAL_PARK_GATE_WIDTH EQU 4

-ROUTE_36_RUINS_OF_ALPH_GATE_HEIGHT EQU 4

-ROUTE_36_RUINS_OF_ALPH_GATE_WIDTH EQU 5

-ROUTE_36_NATIONAL_PARK_GATE_HEIGHT EQU 4

-ROUTE_36_NATIONAL_PARK_GATE_WIDTH EQU 5

-ROUTE_34_HEIGHT EQU 27

-ROUTE_34_WIDTH EQU 10

-GOLDENROD_CITY_HEIGHT EQU 18

-GOLDENROD_CITY_WIDTH EQU 20

-GOLDENROD_GYM_HEIGHT EQU 9

-GOLDENROD_GYM_WIDTH EQU 10

-GOLDENROD_BIKE_SHOP_HEIGHT EQU 4

-GOLDENROD_BIKE_SHOP_WIDTH EQU 4

-GOLDENROD_HAPPINESS_RATER_HEIGHT EQU 4

-GOLDENROD_HAPPINESS_RATER_WIDTH EQU 4

-GOLDENROD_BILLS_HOUSE_HEIGHT EQU 4

-GOLDENROD_BILLS_HOUSE_WIDTH EQU 4

-GOLDENROD_MAGNET_TRAIN_STATION_HEIGHT EQU 9

-GOLDENROD_MAGNET_TRAIN_STATION_WIDTH EQU 10

-GOLDENROD_FLOWER_SHOP_HEIGHT EQU 4

-GOLDENROD_FLOWER_SHOP_WIDTH EQU 4

-GOLDENROD_PP_SPEECH_HOUSE_HEIGHT EQU 4

-GOLDENROD_PP_SPEECH_HOUSE_WIDTH EQU 4

-GOLDENROD_NAME_RATERS_HOUSE_HEIGHT EQU 4

-GOLDENROD_NAME_RATERS_HOUSE_WIDTH EQU 4

-GOLDENROD_DEPT_STORE_1F_HEIGHT EQU 4

-GOLDENROD_DEPT_STORE_1F_WIDTH EQU 8

-GOLDENROD_DEPT_STORE_2F_HEIGHT EQU 4

-GOLDENROD_DEPT_STORE_2F_WIDTH EQU 8

-GOLDENROD_DEPT_STORE_3F_HEIGHT EQU 4

-GOLDENROD_DEPT_STORE_3F_WIDTH EQU 8

-GOLDENROD_DEPT_STORE_4F_HEIGHT EQU 4

-GOLDENROD_DEPT_STORE_4F_WIDTH EQU 8

-GOLDENROD_DEPT_STORE_5F_HEIGHT EQU 4

-GOLDENROD_DEPT_STORE_5F_WIDTH EQU 8

-GOLDENROD_DEPT_STORE_6F_HEIGHT EQU 4

-GOLDENROD_DEPT_STORE_6F_WIDTH EQU 8

-GOLDENROD_DEPT_STORE_ELEVATOR_HEIGHT EQU 2

-GOLDENROD_DEPT_STORE_ELEVATOR_WIDTH EQU 2

-GOLDENROD_DEPT_STORE_ROOF_HEIGHT EQU 4

-GOLDENROD_DEPT_STORE_ROOF_WIDTH EQU 8

-GOLDENROD_GAME_CORNER_HEIGHT EQU 7

-GOLDENROD_GAME_CORNER_WIDTH EQU 10

-GOLDENROD_POKECENTER_1F_HEIGHT EQU 4

-GOLDENROD_POKECENTER_1F_WIDTH EQU 5

-GOLDENROD_POKECOM_CENTER_2F_MOBILE_HEIGHT EQU 16

-GOLDENROD_POKECOM_CENTER_2F_MOBILE_WIDTH EQU 16

-ILEX_FOREST_AZALEA_GATE_HEIGHT EQU 4

-ILEX_FOREST_AZALEA_GATE_WIDTH EQU 5

-ROUTE_34_ILEX_FOREST_GATE_HEIGHT EQU 4

-ROUTE_34_ILEX_FOREST_GATE_WIDTH EQU 5

-DAY_CARE_HEIGHT EQU 4

-DAY_CARE_WIDTH EQU 5

-ROUTE_6_HEIGHT EQU 9

-ROUTE_6_WIDTH EQU 10

-ROUTE_11_HEIGHT EQU 9

-ROUTE_11_WIDTH EQU 20

-VERMILION_CITY_HEIGHT EQU 18

-VERMILION_CITY_WIDTH EQU 20

-VERMILION_HOUSE_FISHING_SPEECH_HOUSE_HEIGHT EQU 4

-VERMILION_HOUSE_FISHING_SPEECH_HOUSE_WIDTH EQU 4

-VERMILION_POKECENTER_1F_HEIGHT EQU 4

-VERMILION_POKECENTER_1F_WIDTH EQU 5

-VERMILION_POKECENTER_2F_BETA_HEIGHT EQU 4

-VERMILION_POKECENTER_2F_BETA_WIDTH EQU 8

-POKEMON_FAN_CLUB_HEIGHT EQU 4

-POKEMON_FAN_CLUB_WIDTH EQU 5

-VERMILION_MAGNET_TRAIN_SPEECH_HOUSE_HEIGHT EQU 4

-VERMILION_MAGNET_TRAIN_SPEECH_HOUSE_WIDTH EQU 4

-VERMILION_MART_HEIGHT EQU 4

-VERMILION_MART_WIDTH EQU 6

-VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE_HEIGHT EQU 4

-VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE_WIDTH EQU 4

-VERMILION_GYM_HEIGHT EQU 9

-VERMILION_GYM_WIDTH EQU 5

-ROUTE_6_SAFFRON_GATE_HEIGHT EQU 4

-ROUTE_6_SAFFRON_GATE_WIDTH EQU 5

-ROUTE_6_UNDERGROUND_ENTRANCE_HEIGHT EQU 4

-ROUTE_6_UNDERGROUND_ENTRANCE_WIDTH EQU 4

-ROUTE_1_HEIGHT EQU 18

-ROUTE_1_WIDTH EQU 10

-PALLET_TOWN_HEIGHT EQU 9

-PALLET_TOWN_WIDTH EQU 10

-REDS_HOUSE_1F_HEIGHT EQU 4

-REDS_HOUSE_1F_WIDTH EQU 4

-REDS_HOUSE_2F_HEIGHT EQU 4

-REDS_HOUSE_2F_WIDTH EQU 4

-BLUES_HOUSE_HEIGHT EQU 4

-BLUES_HOUSE_WIDTH EQU 4

-OAKS_LAB_HEIGHT EQU 6

-OAKS_LAB_WIDTH EQU 5

-ROUTE_3_HEIGHT EQU 9

-ROUTE_3_WIDTH EQU 30

-PEWTER_CITY_HEIGHT EQU 18

-PEWTER_CITY_WIDTH EQU 20

-PEWTER_NIDORAN_SPEECH_HOUSE_HEIGHT EQU 4

-PEWTER_NIDORAN_SPEECH_HOUSE_WIDTH EQU 4

-PEWTER_GYM_HEIGHT EQU 7

-PEWTER_GYM_WIDTH EQU 5

-PEWTER_MART_HEIGHT EQU 4

-PEWTER_MART_WIDTH EQU 6

-PEWTER_POKECENTER_1F_HEIGHT EQU 4

-PEWTER_POKECENTER_1F_WIDTH EQU 5

-PEWTER_POKECENTER_2F_BETA_HEIGHT EQU 4

-PEWTER_POKECENTER_2F_BETA_WIDTH EQU 8

-PEWTER_SNOOZE_SPEECH_HOUSE_HEIGHT EQU 4

-PEWTER_SNOOZE_SPEECH_HOUSE_WIDTH EQU 4

-OLIVINE_PORT_HEIGHT EQU 18

-OLIVINE_PORT_WIDTH EQU 10

-VERMILION_PORT_HEIGHT EQU 18

-VERMILION_PORT_WIDTH EQU 10

-FAST_SHIP_1F_HEIGHT EQU 9

-FAST_SHIP_1F_WIDTH EQU 16

-FAST_SHIP_CABINS_NNW_NNE_NE_HEIGHT EQU 16

-FAST_SHIP_CABINS_NNW_NNE_NE_WIDTH EQU 4

-FAST_SHIP_CABINS_SW_SSW_NW_HEIGHT EQU 16

-FAST_SHIP_CABINS_SW_SSW_NW_WIDTH EQU 4

-FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_HEIGHT EQU 17

-FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN_WIDTH EQU 5

-FAST_SHIP_B1F_HEIGHT EQU 8

-FAST_SHIP_B1F_WIDTH EQU 16

-OLIVINE_PORT_PASSAGE_HEIGHT EQU 9

-OLIVINE_PORT_PASSAGE_WIDTH EQU 10

-VERMILION_PORT_PASSAGE_HEIGHT EQU 9

-VERMILION_PORT_PASSAGE_WIDTH EQU 10

-MOUNT_MOON_SQUARE_HEIGHT EQU 9

-MOUNT_MOON_SQUARE_WIDTH EQU 15

-MOUNT_MOON_GIFT_SHOP_HEIGHT EQU 4

-MOUNT_MOON_GIFT_SHOP_WIDTH EQU 4

-TIN_TOWER_ROOF_HEIGHT EQU 9

-TIN_TOWER_ROOF_WIDTH EQU 10

-ROUTE_23_HEIGHT EQU 9

-ROUTE_23_WIDTH EQU 10

-INDIGO_PLATEAU_POKECENTER_1F_HEIGHT EQU 7

-INDIGO_PLATEAU_POKECENTER_1F_WIDTH EQU 9

-WILLS_ROOM_HEIGHT EQU 9

-WILLS_ROOM_WIDTH EQU 5

-KOGAS_ROOM_HEIGHT EQU 9

-KOGAS_ROOM_WIDTH EQU 5

-BRUNOS_ROOM_HEIGHT EQU 9

-BRUNOS_ROOM_WIDTH EQU 5

-KARENS_ROOM_HEIGHT EQU 9

-KARENS_ROOM_WIDTH EQU 5

-LANCES_ROOM_HEIGHT EQU 12

-LANCES_ROOM_WIDTH EQU 5

-HALL_OF_FAME_HEIGHT EQU 7

-HALL_OF_FAME_WIDTH EQU 5

-ROUTE_13_HEIGHT EQU 9

-ROUTE_13_WIDTH EQU 30

-ROUTE_14_HEIGHT EQU 18

-ROUTE_14_WIDTH EQU 10

-ROUTE_15_HEIGHT EQU 9

-ROUTE_15_WIDTH EQU 20

-ROUTE_18_HEIGHT EQU 9

-ROUTE_18_WIDTH EQU 10

-FUCHSIA_CITY_HEIGHT EQU 18

-FUCHSIA_CITY_WIDTH EQU 20

-FUCHSIA_MART_HEIGHT EQU 4

-FUCHSIA_MART_WIDTH EQU 6

-SAFARI_ZONE_MAIN_OFFICE_HEIGHT EQU 4

-SAFARI_ZONE_MAIN_OFFICE_WIDTH EQU 4

-FUCHSIA_GYM_HEIGHT EQU 9

-FUCHSIA_GYM_WIDTH EQU 5

-FUCHSIA_BILL_SPEECH_HOUSE_HEIGHT EQU 4

-FUCHSIA_BILL_SPEECH_HOUSE_WIDTH EQU 4

-FUCHSIA_POKECENTER_1F_HEIGHT EQU 4

-FUCHSIA_POKECENTER_1F_WIDTH EQU 5

-FUCHSIA_POKECENTER_2F_BETA_HEIGHT EQU 4

-FUCHSIA_POKECENTER_2F_BETA_WIDTH EQU 8

-SAFARI_ZONE_WARDENS_HOME_HEIGHT EQU 4

-SAFARI_ZONE_WARDENS_HOME_WIDTH EQU 5

-ROUTE_15_FUCHSIA_GATE_HEIGHT EQU 4

-ROUTE_15_FUCHSIA_GATE_WIDTH EQU 5

-ROUTE_8_HEIGHT EQU 9

-ROUTE_8_WIDTH EQU 20

-ROUTE_12_HEIGHT EQU 27

-ROUTE_12_WIDTH EQU 10

-ROUTE_10_SOUTH_HEIGHT EQU 9

-ROUTE_10_SOUTH_WIDTH EQU 10

-LAVENDER_TOWN_HEIGHT EQU 9

-LAVENDER_TOWN_WIDTH EQU 10

-LAVENDER_POKECENTER_1F_HEIGHT EQU 4

-LAVENDER_POKECENTER_1F_WIDTH EQU 5

-LAVENDER_POKECENTER_2F_BETA_HEIGHT EQU 4

-LAVENDER_POKECENTER_2F_BETA_WIDTH EQU 8

-MR_FUJIS_HOUSE_HEIGHT EQU 4

-MR_FUJIS_HOUSE_WIDTH EQU 5

-LAVENDER_TOWN_SPEECH_HOUSE_HEIGHT EQU 4

-LAVENDER_TOWN_SPEECH_HOUSE_WIDTH EQU 4

-LAVENDER_NAME_RATER_HEIGHT EQU 4

-LAVENDER_NAME_RATER_WIDTH EQU 4

-LAVENDER_MART_HEIGHT EQU 4

-LAVENDER_MART_WIDTH EQU 6

-SOUL_HOUSE_HEIGHT EQU 4

-SOUL_HOUSE_WIDTH EQU 5

-LAV_RADIO_TOWER_1F_HEIGHT EQU 4

-LAV_RADIO_TOWER_1F_WIDTH EQU 10

-ROUTE_8_SAFFRON_GATE_HEIGHT EQU 4

-ROUTE_8_SAFFRON_GATE_WIDTH EQU 5

-ROUTE_12_SUPER_ROD_HOUSE_HEIGHT EQU 4

-ROUTE_12_SUPER_ROD_HOUSE_WIDTH EQU 4

-ROUTE_28_HEIGHT EQU 9

-ROUTE_28_WIDTH EQU 20

-SILVER_CAVE_OUTSIDE_HEIGHT EQU 18

-SILVER_CAVE_OUTSIDE_WIDTH EQU 20

-SILVER_CAVE_POKECENTER_1F_HEIGHT EQU 4

-SILVER_CAVE_POKECENTER_1F_WIDTH EQU 5

-ROUTE_28_FAMOUS_SPEECH_HOUSE_HEIGHT EQU 4

-ROUTE_28_FAMOUS_SPEECH_HOUSE_WIDTH EQU 4

-POKECENTER_2F_HEIGHT EQU 4

-POKECENTER_2F_WIDTH EQU 8

-TRADE_CENTER_HEIGHT EQU 4

-TRADE_CENTER_WIDTH EQU 5

-COLOSSEUM_HEIGHT EQU 4

-COLOSSEUM_WIDTH EQU 5

-TIME_CAPSULE_HEIGHT EQU 4

-TIME_CAPSULE_WIDTH EQU 5

-MOBILE_TRADE_ROOM_MOBILE_HEIGHT EQU 4

-MOBILE_TRADE_ROOM_MOBILE_WIDTH EQU 5

-MOBILE_BATTLE_ROOM_HEIGHT EQU 4

-MOBILE_BATTLE_ROOM_WIDTH EQU 5

-ROUTE_7_HEIGHT EQU 9

-ROUTE_7_WIDTH EQU 10

-ROUTE_16_HEIGHT EQU 9

-ROUTE_16_WIDTH EQU 10

-ROUTE_17_HEIGHT EQU 45

-ROUTE_17_WIDTH EQU 10

-CELADON_CITY_HEIGHT EQU 18

-CELADON_CITY_WIDTH EQU 20

-CELADON_DEPT_STORE_1F_HEIGHT EQU 4

-CELADON_DEPT_STORE_1F_WIDTH EQU 8

-CELADON_DEPT_STORE_2F_HEIGHT EQU 4

-CELADON_DEPT_STORE_2F_WIDTH EQU 8

-CELADON_DEPT_STORE_3F_HEIGHT EQU 4

-CELADON_DEPT_STORE_3F_WIDTH EQU 8

-CELADON_DEPT_STORE_4F_HEIGHT EQU 4

-CELADON_DEPT_STORE_4F_WIDTH EQU 8

-CELADON_DEPT_STORE_5F_HEIGHT EQU 4

-CELADON_DEPT_STORE_5F_WIDTH EQU 8

-CELADON_DEPT_STORE_6F_HEIGHT EQU 4

-CELADON_DEPT_STORE_6F_WIDTH EQU 8

-CELADON_DEPT_STORE_ELEVATOR_HEIGHT EQU 2

-CELADON_DEPT_STORE_ELEVATOR_WIDTH EQU 2

-CELADON_MANSION_1F_HEIGHT EQU 5

-CELADON_MANSION_1F_WIDTH EQU 4

-CELADON_MANSION_2F_HEIGHT EQU 5

-CELADON_MANSION_2F_WIDTH EQU 4

-CELADON_MANSION_3F_HEIGHT EQU 5

-CELADON_MANSION_3F_WIDTH EQU 4

-CELADON_MANSION_ROOF_HEIGHT EQU 5

-CELADON_MANSION_ROOF_WIDTH EQU 4

-CELADON_MANSION_ROOF_HOUSE_HEIGHT EQU 4

-CELADON_MANSION_ROOF_HOUSE_WIDTH EQU 4

-CELADON_POKECENTER_1F_HEIGHT EQU 4

-CELADON_POKECENTER_1F_WIDTH EQU 5

-CELADON_POKECENTER_2F_BETA_HEIGHT EQU 4

-CELADON_POKECENTER_2F_BETA_WIDTH EQU 8

-CELADON_GAME_CORNER_HEIGHT EQU 7

-CELADON_GAME_CORNER_WIDTH EQU 10

-CELADON_GAME_CORNER_PRIZE_ROOM_HEIGHT EQU 3

-CELADON_GAME_CORNER_PRIZE_ROOM_WIDTH EQU 3

-CELADON_GYM_HEIGHT EQU 9

-CELADON_GYM_WIDTH EQU 5

-CELADON_CAFE_HEIGHT EQU 4

-CELADON_CAFE_WIDTH EQU 6

-ROUTE_16_FUCHSIA_SPEECH_HOUSE_HEIGHT EQU 4

-ROUTE_16_FUCHSIA_SPEECH_HOUSE_WIDTH EQU 4

-ROUTE_16_GATE_HEIGHT EQU 4

-ROUTE_16_GATE_WIDTH EQU 5

-ROUTE_7_SAFFRON_GATE_HEIGHT EQU 4

-ROUTE_7_SAFFRON_GATE_WIDTH EQU 5

-ROUTE_17_18_GATE_HEIGHT EQU 4

-ROUTE_17_18_GATE_WIDTH EQU 5

-ROUTE_40_HEIGHT EQU 18

-ROUTE_40_WIDTH EQU 10

-ROUTE_41_HEIGHT EQU 27

-ROUTE_41_WIDTH EQU 25

-CIANWOOD_CITY_HEIGHT EQU 27

-CIANWOOD_CITY_WIDTH EQU 15

-MANIAS_HOUSE_HEIGHT EQU 4

-MANIAS_HOUSE_WIDTH EQU 4

-CIANWOOD_GYM_HEIGHT EQU 9

-CIANWOOD_GYM_WIDTH EQU 5

-CIANWOOD_POKECENTER_1F_HEIGHT EQU 4

-CIANWOOD_POKECENTER_1F_WIDTH EQU 5

-CIANWOOD_PHARMACY_HEIGHT EQU 4

-CIANWOOD_PHARMACY_WIDTH EQU 4

-CIANWOOD_CITY_PHOTO_STUDIO_HEIGHT EQU 4

-CIANWOOD_CITY_PHOTO_STUDIO_WIDTH EQU 4

-CIANWOOD_LUGIA_SPEECH_HOUSE_HEIGHT EQU 4

-CIANWOOD_LUGIA_SPEECH_HOUSE_WIDTH EQU 4

-POKE_SEERS_HOUSE_HEIGHT EQU 4

-POKE_SEERS_HOUSE_WIDTH EQU 4

-BATTLE_TOWER_1F_HEIGHT EQU 5

-BATTLE_TOWER_1F_WIDTH EQU 8

-BATTLE_TOWER_BATTLE_ROOM_HEIGHT EQU 4

-BATTLE_TOWER_BATTLE_ROOM_WIDTH EQU 4

-BATTLE_TOWER_ELEVATOR_HEIGHT EQU 2

-BATTLE_TOWER_ELEVATOR_WIDTH EQU 2

-BATTLE_TOWER_HALLWAY_HEIGHT EQU 2

-BATTLE_TOWER_HALLWAY_WIDTH EQU 11

-ROUTE_40_BATTLE_TOWER_GATE_HEIGHT EQU 4

-ROUTE_40_BATTLE_TOWER_GATE_WIDTH EQU 5

-BATTLE_TOWER_OUTSIDE_HEIGHT EQU 14

-BATTLE_TOWER_OUTSIDE_WIDTH EQU 10

-ROUTE_2_HEIGHT EQU 27

-ROUTE_2_WIDTH EQU 10

-ROUTE_22_HEIGHT EQU 9

-ROUTE_22_WIDTH EQU 20

-VIRIDIAN_CITY_HEIGHT EQU 18

-VIRIDIAN_CITY_WIDTH EQU 20

-VIRIDIAN_GYM_HEIGHT EQU 9

-VIRIDIAN_GYM_WIDTH EQU 5

-VIRIDIAN_NICKNAME_SPEECH_HOUSE_HEIGHT EQU 4

-VIRIDIAN_NICKNAME_SPEECH_HOUSE_WIDTH EQU 4

-TRAINER_HOUSE_1F_HEIGHT EQU 7

-TRAINER_HOUSE_1F_WIDTH EQU 5

-TRAINER_HOUSE_B1F_HEIGHT EQU 8

-TRAINER_HOUSE_B1F_WIDTH EQU 5

-VIRIDIAN_MART_HEIGHT EQU 4

-VIRIDIAN_MART_WIDTH EQU 6

-VIRIDIAN_POKECENTER_1F_HEIGHT EQU 4

-VIRIDIAN_POKECENTER_1F_WIDTH EQU 5

-VIRIDIAN_POKECENTER_2F_BETA_HEIGHT EQU 4

-VIRIDIAN_POKECENTER_2F_BETA_WIDTH EQU 8

-ROUTE_2_NUGGET_SPEECH_HOUSE_HEIGHT EQU 4

-ROUTE_2_NUGGET_SPEECH_HOUSE_WIDTH EQU 4

-ROUTE_2_GATE_HEIGHT EQU 4

-ROUTE_2_GATE_WIDTH EQU 5

-VICTORY_ROAD_GATE_HEIGHT EQU 9

-VICTORY_ROAD_GATE_WIDTH EQU 10

-ROUTE_26_HEIGHT EQU 54

-ROUTE_26_WIDTH EQU 10

-ROUTE_27_HEIGHT EQU 9

-ROUTE_27_WIDTH EQU 40

-ROUTE_29_HEIGHT EQU 9

-ROUTE_29_WIDTH EQU 30

-NEW_BARK_TOWN_HEIGHT EQU 9

-NEW_BARK_TOWN_WIDTH EQU 10

-ELMS_LAB_HEIGHT EQU 6

-ELMS_LAB_WIDTH EQU 5

-KRISS_HOUSE_1F_HEIGHT EQU 4

-KRISS_HOUSE_1F_WIDTH EQU 5

-KRISS_HOUSE_2F_HEIGHT EQU 3

-KRISS_HOUSE_2F_WIDTH EQU 4

-KRISS_NEIGHBORS_HOUSE_HEIGHT EQU 4

-KRISS_NEIGHBORS_HOUSE_WIDTH EQU 4

-ELMS_HOUSE_HEIGHT EQU 4

-ELMS_HOUSE_WIDTH EQU 4

-ROUTE_26_HEAL_SPEECH_HOUSE_HEIGHT EQU 4

-ROUTE_26_HEAL_SPEECH_HOUSE_WIDTH EQU 4

-ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE_HEIGHT EQU 4

-ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE_WIDTH EQU 4

-ROUTE_27_SANDSTORM_HOUSE_HEIGHT EQU 4

-ROUTE_27_SANDSTORM_HOUSE_WIDTH EQU 4

-ROUTE_29_46_GATE_HEIGHT EQU 4

-ROUTE_29_46_GATE_WIDTH EQU 5

-ROUTE_5_HEIGHT EQU 9

-ROUTE_5_WIDTH EQU 10

-SAFFRON_CITY_HEIGHT EQU 18

-SAFFRON_CITY_WIDTH EQU 20

-FIGHTING_DOJO_HEIGHT EQU 6

-FIGHTING_DOJO_WIDTH EQU 5

-SAFFRON_GYM_HEIGHT EQU 9

-SAFFRON_GYM_WIDTH EQU 10

-SAFFRON_MART_HEIGHT EQU 4

-SAFFRON_MART_WIDTH EQU 6

-SAFFRON_POKECENTER_1F_HEIGHT EQU 4

-SAFFRON_POKECENTER_1F_WIDTH EQU 5

-SAFFRON_POKECENTER_2F_BETA_HEIGHT EQU 4

-SAFFRON_POKECENTER_2F_BETA_WIDTH EQU 8

-MR_PSYCHICS_HOUSE_HEIGHT EQU 4

-MR_PSYCHICS_HOUSE_WIDTH EQU 4

-SAFFRON_TRAIN_STATION_HEIGHT EQU 9

-SAFFRON_TRAIN_STATION_WIDTH EQU 10

-SILPH_CO_1F_HEIGHT EQU 4

-SILPH_CO_1F_WIDTH EQU 8

-COPYCATS_HOUSE_1F_HEIGHT EQU 4

-COPYCATS_HOUSE_1F_WIDTH EQU 4

-COPYCATS_HOUSE_2F_HEIGHT EQU 3

-COPYCATS_HOUSE_2F_WIDTH EQU 5

-ROUTE_5_UNDERGROUND_ENTRANCE_HEIGHT EQU 4

-ROUTE_5_UNDERGROUND_ENTRANCE_WIDTH EQU 4

-ROUTE_5_SAFFRON_CITY_GATE_HEIGHT EQU 4

-ROUTE_5_SAFFRON_CITY_GATE_WIDTH EQU 5

-ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE_HEIGHT EQU 4

-ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE_WIDTH EQU 4

-ROUTE_30_HEIGHT EQU 27

-ROUTE_30_WIDTH EQU 10

-ROUTE_31_HEIGHT EQU 9

-ROUTE_31_WIDTH EQU 20

-CHERRYGROVE_CITY_HEIGHT EQU 9

-CHERRYGROVE_CITY_WIDTH EQU 20

-CHERRYGROVE_MART_HEIGHT EQU 4

-CHERRYGROVE_MART_WIDTH EQU 6

-CHERRYGROVE_POKECENTER_1F_HEIGHT EQU 4

-CHERRYGROVE_POKECENTER_1F_WIDTH EQU 5

-CHERRYGROVE_GYM_SPEECH_HOUSE_HEIGHT EQU 4

-CHERRYGROVE_GYM_SPEECH_HOUSE_WIDTH EQU 4

-GUIDE_GENTS_HOUSE_HEIGHT EQU 4

-GUIDE_GENTS_HOUSE_WIDTH EQU 4

-CHERRYGROVE_EVOLUTION_SPEECH_HOUSE_HEIGHT EQU 4

-CHERRYGROVE_EVOLUTION_SPEECH_HOUSE_WIDTH EQU 4

-ROUTE_30_BERRY_SPEECH_HOUSE_HEIGHT EQU 4

-ROUTE_30_BERRY_SPEECH_HOUSE_WIDTH EQU 4

-MR_POKEMONS_HOUSE_HEIGHT EQU 4

-MR_POKEMONS_HOUSE_WIDTH EQU 4

-ROUTE_31_VIOLET_GATE_HEIGHT EQU 4

-ROUTE_31_VIOLET_GATE_WIDTH EQU 5

+	newgroup

+	mapgroup ECRUTEAK_HOUSE, 9, 10

+	mapgroup WISE_TRIOS_ROOM, 4, 4

+	mapgroup ECRUTEAK_POKECENTER_1F, 4, 5

+	mapgroup ECRUTEAK_LUGIA_SPEECH_HOUSE, 4, 4

+	mapgroup DANCE_THEATRE, 7, 6

+	mapgroup ECRUTEAK_MART, 4, 6

+	mapgroup ECRUTEAK_GYM, 9, 5

+	mapgroup ECRUTEAK_ITEMFINDER_HOUSE, 4, 4

+	mapgroup ECRUTEAK_CITY, 18, 20

+	newgroup

+	mapgroup BLACKTHORN_GYM_1F, 9, 5

+	mapgroup BLACKTHORN_GYM_2F, 9, 5

+	mapgroup BLACKTHORN_DRAGON_SPEECH_HOUSE, 4, 4

+	mapgroup BLACKTHORN_DODRIO_TRADE_HOUSE, 4, 4

+	mapgroup BLACKTHORN_MART, 4, 6

+	mapgroup BLACKTHORN_POKECENTER_1F, 4, 5

+	mapgroup MOVE_DELETERS_HOUSE, 4, 4

+	mapgroup ROUTE_45, 45, 10

+	mapgroup ROUTE_46, 18, 10

+	mapgroup BLACKTHORN_CITY, 18, 20

+	newgroup

+	mapgroup CINNABAR_POKECENTER_1F, 4, 5

+	mapgroup CINNABAR_POKECENTER_2F_BETA, 4, 8

+	mapgroup ROUTE_19___FUCHSIA_GATE, 4, 5

+	mapgroup SEAFOAM_GYM, 4, 5

+	mapgroup ROUTE_19, 18, 10

+	mapgroup ROUTE_20, 9, 30

+	mapgroup ROUTE_21, 18, 10

+	mapgroup CINNABAR_ISLAND, 9, 10

+	newgroup

+	mapgroup CERULEAN_GYM_BADGE_SPEECH_HOUSE, 4, 4

+	mapgroup CERULEAN_POLICE_STATION, 4, 4

+	mapgroup CERULEAN_TRADE_SPEECH_HOUSE, 4, 4

+	mapgroup CERULEAN_POKECENTER_1F, 4, 5

+	mapgroup CERULEAN_POKECENTER_2F_BETA, 4, 8

+	mapgroup CERULEAN_GYM, 8, 5

+	mapgroup CERULEAN_MART, 4, 6

+	mapgroup ROUTE_10_POKECENTER_1F, 4, 5

+	mapgroup ROUTE_10_POKECENTER_2F_BETA, 4, 8

+	mapgroup POWER_PLANT, 9, 10

+	mapgroup BILLS_HOUSE, 4, 4

+	mapgroup ROUTE_4, 9, 20

+	mapgroup ROUTE_9, 9, 30

+	mapgroup ROUTE_10_NORTH, 9, 10

+	mapgroup ROUTE_24, 9, 10

+	mapgroup ROUTE_25, 9, 30

+	mapgroup CERULEAN_CITY, 18, 20

+	newgroup

+	mapgroup AZALEA_POKECENTER_1F, 4, 5

+	mapgroup CHARCOAL_KILN, 4, 4

+	mapgroup AZALEA_MART, 4, 6

+	mapgroup KURTS_HOUSE, 4, 8

+	mapgroup AZALEA_GYM, 8, 5

+	mapgroup ROUTE_33, 9, 10

+	mapgroup AZALEA_TOWN, 9, 20

+	newgroup

+	mapgroup LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 4, 4

+	mapgroup LAKE_OF_RAGE_MAGIKARP_HOUSE, 4, 4

+	mapgroup ROUTE_43_MAHOGANY_GATE, 4, 5

+	mapgroup ROUTE_43_GATE, 4, 5

+	mapgroup ROUTE_43, 27, 10

+	mapgroup LAKE_OF_RAGE, 18, 20

+	newgroup

+	mapgroup ROUTE_32, 45, 10

+	mapgroup ROUTE_35, 18, 10

+	mapgroup ROUTE_36, 9, 30

+	mapgroup ROUTE_37, 9, 10

+	mapgroup VIOLET_CITY, 18, 20

+	mapgroup VIOLET_MART, 4, 6

+	mapgroup VIOLET_GYM, 8, 5

+	mapgroup EARLS_POKEMON_ACADEMY, 8, 4

+	mapgroup VIOLET_NICKNAME_SPEECH_HOUSE, 4, 4

+	mapgroup VIOLET_POKECENTER_1F, 4, 5

+	mapgroup VIOLET_ONIX_TRADE_HOUSE, 4, 4

+	mapgroup ROUTE_32_RUINS_OF_ALPH_GATE, 4, 5

+	mapgroup ROUTE_32_POKECENTER_1F, 4, 5

+	mapgroup ROUTE_35_GOLDENROD_GATE, 4, 5

+	mapgroup ROUTE_35_NATIONAL_PARK_GATE, 4, 4

+	mapgroup ROUTE_36_RUINS_OF_ALPH_GATE, 4, 5

+	mapgroup ROUTE_36_NATIONAL_PARK_GATE, 4, 5

+	newgroup

+	mapgroup ROUTE_34, 27, 10

+	mapgroup GOLDENROD_CITY, 18, 20

+	mapgroup GOLDENROD_GYM, 9, 10

+	mapgroup GOLDENROD_BIKE_SHOP, 4, 4

+	mapgroup GOLDENROD_HAPPINESS_RATER, 4, 4

+	mapgroup GOLDENROD_BILLS_HOUSE, 4, 4

+	mapgroup GOLDENROD_MAGNET_TRAIN_STATION, 9, 10

+	mapgroup GOLDENROD_FLOWER_SHOP, 4, 4

+	mapgroup GOLDENROD_PP_SPEECH_HOUSE, 4, 4

+	mapgroup GOLDENROD_NAME_RATERS_HOUSE, 4, 4

+	mapgroup GOLDENROD_DEPT_STORE_1F, 4, 8

+	mapgroup GOLDENROD_DEPT_STORE_2F, 4, 8

+	mapgroup GOLDENROD_DEPT_STORE_3F, 4, 8

+	mapgroup GOLDENROD_DEPT_STORE_4F, 4, 8

+	mapgroup GOLDENROD_DEPT_STORE_5F, 4, 8

+	mapgroup GOLDENROD_DEPT_STORE_6F, 4, 8

+	mapgroup GOLDENROD_DEPT_STORE_ELEVATOR, 2, 2

+	mapgroup GOLDENROD_DEPT_STORE_ROOF, 4, 8

+	mapgroup GOLDENROD_GAME_CORNER, 7, 10

+	mapgroup GOLDENROD_POKECENTER_1F, 4, 5

+	mapgroup GOLDENROD_POKECOM_CENTER_2F_MOBILE, 16, 16

+	mapgroup ILEX_FOREST_AZALEA_GATE, 4, 5

+	mapgroup ROUTE_34_ILEX_FOREST_GATE, 4, 5

+	mapgroup DAY_CARE, 4, 5

+	newgroup

+	mapgroup ROUTE_6, 9, 10

+	mapgroup ROUTE_11, 9, 20

+	mapgroup VERMILION_CITY, 18, 20

+	mapgroup VERMILION_HOUSE_FISHING_SPEECH_HOUSE, 4, 4

+	mapgroup VERMILION_POKECENTER_1F, 4, 5

+	mapgroup VERMILION_POKECENTER_2F_BETA, 4, 8

+	mapgroup POKEMON_FAN_CLUB, 4, 5

+	mapgroup VERMILION_MAGNET_TRAIN_SPEECH_HOUSE, 4, 4

+	mapgroup VERMILION_MART, 4, 6

+	mapgroup VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE, 4, 4

+	mapgroup VERMILION_GYM, 9, 5

+	mapgroup ROUTE_6_SAFFRON_GATE, 4, 5

+	mapgroup ROUTE_6_UNDERGROUND_ENTRANCE, 4, 4

+	newgroup

+	mapgroup ROUTE_1, 18, 10

+	mapgroup PALLET_TOWN, 9, 10

+	mapgroup REDS_HOUSE_1F, 4, 4

+	mapgroup REDS_HOUSE_2F, 4, 4

+	mapgroup BLUES_HOUSE, 4, 4

+	mapgroup OAKS_LAB, 6, 5

+	newgroup

+	mapgroup ROUTE_3, 9, 30

+	mapgroup PEWTER_CITY, 18, 20

+	mapgroup PEWTER_NIDORAN_SPEECH_HOUSE, 4, 4

+	mapgroup PEWTER_GYM, 7, 5

+	mapgroup PEWTER_MART, 4, 6

+	mapgroup PEWTER_POKECENTER_1F, 4, 5

+	mapgroup PEWTER_POKECENTER_2F_BETA, 4, 8

+	mapgroup PEWTER_SNOOZE_SPEECH_HOUSE, 4, 4

+	newgroup

+	mapgroup OLIVINE_PORT, 18, 10

+	mapgroup VERMILION_PORT, 18, 10

+	mapgroup FAST_SHIP_1F, 9, 16

+	mapgroup FAST_SHIP_CABINS_NNW_NNE_NE, 16, 4

+	mapgroup FAST_SHIP_CABINS_SW_SSW_NW, 16, 4

+	mapgroup FAST_SHIP_CABINS_SE_SSE_CAPTAINS_CABIN, 17, 5

+	mapgroup FAST_SHIP_B1F, 8, 16

+	mapgroup OLIVINE_PORT_PASSAGE, 9, 10

+	mapgroup VERMILION_PORT_PASSAGE, 9, 10

+	mapgroup MOUNT_MOON_SQUARE, 9, 15

+	mapgroup MOUNT_MOON_GIFT_SHOP, 4, 4

+	mapgroup TIN_TOWER_ROOF, 9, 10

+	newgroup

+	mapgroup ROUTE_23, 9, 10

+	mapgroup INDIGO_PLATEAU_POKECENTER_1F, 7, 9

+	mapgroup WILLS_ROOM, 9, 5

+	mapgroup KOGAS_ROOM, 9, 5

+	mapgroup BRUNOS_ROOM, 9, 5

+	mapgroup KARENS_ROOM, 9, 5

+	mapgroup LANCES_ROOM, 12, 5

+	mapgroup HALL_OF_FAME, 7, 5

+	newgroup

+	mapgroup ROUTE_13, 9, 30

+	mapgroup ROUTE_14, 18, 10

+	mapgroup ROUTE_15, 9, 20

+	mapgroup ROUTE_18, 9, 10

+	mapgroup FUCHSIA_CITY, 18, 20

+	mapgroup FUCHSIA_MART, 4, 6

+	mapgroup SAFARI_ZONE_MAIN_OFFICE, 4, 4

+	mapgroup FUCHSIA_GYM, 9, 5

+	mapgroup FUCHSIA_BILL_SPEECH_HOUSE, 4, 4

+	mapgroup FUCHSIA_POKECENTER_1F, 4, 5

+	mapgroup FUCHSIA_POKECENTER_2F_BETA, 4, 8

+	mapgroup SAFARI_ZONE_WARDENS_HOME, 4, 5

+	mapgroup ROUTE_15_FUCHSIA_GATE, 4, 5

+	newgroup

+	mapgroup ROUTE_8, 9, 20

+	mapgroup ROUTE_12, 27, 10

+	mapgroup ROUTE_10_SOUTH, 9, 10

+	mapgroup LAVENDER_TOWN, 9, 10

+	mapgroup LAVENDER_POKECENTER_1F, 4, 5

+	mapgroup LAVENDER_POKECENTER_2F_BETA, 4, 8

+	mapgroup MR_FUJIS_HOUSE, 4, 5

+	mapgroup LAVENDER_TOWN_SPEECH_HOUSE, 4, 4

+	mapgroup LAVENDER_NAME_RATER, 4, 4

+	mapgroup LAVENDER_MART, 4, 6

+	mapgroup SOUL_HOUSE, 4, 5

+	mapgroup LAV_RADIO_TOWER_1F, 4, 10

+	mapgroup ROUTE_8_SAFFRON_GATE, 4, 5

+	mapgroup ROUTE_12_SUPER_ROD_HOUSE, 4, 4

+	newgroup

+	mapgroup ROUTE_28, 9, 20

+	mapgroup SILVER_CAVE_OUTSIDE, 18, 20

+	mapgroup SILVER_CAVE_POKECENTER_1F, 4, 5

+	mapgroup ROUTE_28_FAMOUS_SPEECH_HOUSE, 4, 4

+	newgroup

+	mapgroup POKECENTER_2F, 4, 8

+	mapgroup TRADE_CENTER, 4, 5

+	mapgroup COLOSSEUM, 4, 5

+	mapgroup TIME_CAPSULE, 4, 5

+	mapgroup MOBILE_TRADE_ROOM_MOBILE, 4, 5

+	mapgroup MOBILE_BATTLE_ROOM, 4, 5

+	newgroup

+	mapgroup ROUTE_7, 9, 10

+	mapgroup ROUTE_16, 9, 10

+	mapgroup ROUTE_17, 45, 10

+	mapgroup CELADON_CITY, 18, 20

+	mapgroup CELADON_DEPT_STORE_1F, 4, 8

+	mapgroup CELADON_DEPT_STORE_2F, 4, 8

+	mapgroup CELADON_DEPT_STORE_3F, 4, 8

+	mapgroup CELADON_DEPT_STORE_4F, 4, 8

+	mapgroup CELADON_DEPT_STORE_5F, 4, 8

+	mapgroup CELADON_DEPT_STORE_6F, 4, 8

+	mapgroup CELADON_DEPT_STORE_ELEVATOR, 2, 2

+	mapgroup CELADON_MANSION_1F, 5, 4

+	mapgroup CELADON_MANSION_2F, 5, 4

+	mapgroup CELADON_MANSION_3F, 5, 4

+	mapgroup CELADON_MANSION_ROOF, 5, 4

+	mapgroup CELADON_MANSION_ROOF_HOUSE, 4, 4

+	mapgroup CELADON_POKECENTER_1F, 4, 5

+	mapgroup CELADON_POKECENTER_2F_BETA, 4, 8

+	mapgroup CELADON_GAME_CORNER, 7, 10

+	mapgroup CELADON_GAME_CORNER_PRIZE_ROOM, 3, 3

+	mapgroup CELADON_GYM, 9, 5

+	mapgroup CELADON_CAFE, 4, 6

+	mapgroup ROUTE_16_FUCHSIA_SPEECH_HOUSE, 4, 4

+	mapgroup ROUTE_16_GATE, 4, 5

+	mapgroup ROUTE_7_SAFFRON_GATE, 4, 5

+	mapgroup ROUTE_17_18_GATE, 4, 5

+	newgroup

+	mapgroup ROUTE_40, 18, 10

+	mapgroup ROUTE_41, 27, 25

+	mapgroup CIANWOOD_CITY, 27, 15

+	mapgroup MANIAS_HOUSE, 4, 4

+	mapgroup CIANWOOD_GYM, 9, 5

+	mapgroup CIANWOOD_POKECENTER_1F, 4, 5

+	mapgroup CIANWOOD_PHARMACY, 4, 4

+	mapgroup CIANWOOD_CITY_PHOTO_STUDIO, 4, 4

+	mapgroup CIANWOOD_LUGIA_SPEECH_HOUSE, 4, 4

+	mapgroup POKE_SEERS_HOUSE, 4, 4

+	mapgroup BATTLE_TOWER_1F, 5, 8

+	mapgroup BATTLE_TOWER_BATTLE_ROOM, 4, 4

+	mapgroup BATTLE_TOWER_ELEVATOR, 2, 2

+	mapgroup BATTLE_TOWER_HALLWAY, 2, 11

+	mapgroup ROUTE_40_BATTLE_TOWER_GATE, 4, 5

+	mapgroup BATTLE_TOWER_OUTSIDE, 14, 10

+	newgroup

+	mapgroup ROUTE_2, 27, 10

+	mapgroup ROUTE_22, 9, 20

+	mapgroup VIRIDIAN_CITY, 18, 20

+	mapgroup VIRIDIAN_GYM, 9, 5

+	mapgroup VIRIDIAN_NICKNAME_SPEECH_HOUSE, 4, 4

+	mapgroup TRAINER_HOUSE_1F, 7, 5

+	mapgroup TRAINER_HOUSE_B1F, 8, 5

+	mapgroup VIRIDIAN_MART, 4, 6

+	mapgroup VIRIDIAN_POKECENTER_1F, 4, 5

+	mapgroup VIRIDIAN_POKECENTER_2F_BETA, 4, 8

+	mapgroup ROUTE_2_NUGGET_SPEECH_HOUSE, 4, 4

+	mapgroup ROUTE_2_GATE, 4, 5

+	mapgroup VICTORY_ROAD_GATE, 9, 10

+	newgroup

+	mapgroup ROUTE_26, 54, 10

+	mapgroup ROUTE_27, 9, 40

+	mapgroup ROUTE_29, 9, 30

+	mapgroup NEW_BARK_TOWN, 9, 10

+	mapgroup ELMS_LAB, 6, 5

+	mapgroup KRISS_HOUSE_1F, 4, 5

+	mapgroup KRISS_HOUSE_2F, 3, 4

+	mapgroup KRISS_NEIGHBORS_HOUSE, 4, 4

+	mapgroup ELMS_HOUSE, 4, 4

+	mapgroup ROUTE_26_HEAL_SPEECH_HOUSE, 4, 4

+	mapgroup ROUTE_26_DAY_OF_WEEK_SIBLINGS_HOUSE, 4, 4

+	mapgroup ROUTE_27_SANDSTORM_HOUSE, 4, 4

+	mapgroup ROUTE_29_46_GATE, 4, 5

+	newgroup

+	mapgroup ROUTE_5, 9, 10

+	mapgroup SAFFRON_CITY, 18, 20

+	mapgroup FIGHTING_DOJO, 6, 5

+	mapgroup SAFFRON_GYM, 9, 10

+	mapgroup SAFFRON_MART, 4, 6

+	mapgroup SAFFRON_POKECENTER_1F, 4, 5

+	mapgroup SAFFRON_POKECENTER_2F_BETA, 4, 8

+	mapgroup MR_PSYCHICS_HOUSE, 4, 4

+	mapgroup SAFFRON_TRAIN_STATION, 9, 10

+	mapgroup SILPH_CO_1F, 4, 8

+	mapgroup COPYCATS_HOUSE_1F, 4, 4

+	mapgroup COPYCATS_HOUSE_2F, 3, 5

+	mapgroup ROUTE_5_UNDERGROUND_ENTRANCE, 4, 4

+	mapgroup ROUTE_5_SAFFRON_CITY_GATE, 4, 5

+	mapgroup ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, 4, 4

+	newgroup

+	mapgroup ROUTE_30, 27, 10

+	mapgroup ROUTE_31, 9, 20

+	mapgroup CHERRYGROVE_CITY, 9, 20

+	mapgroup CHERRYGROVE_MART, 4, 6

+	mapgroup CHERRYGROVE_POKECENTER_1F, 4, 5

+	mapgroup CHERRYGROVE_GYM_SPEECH_HOUSE, 4, 4

+	mapgroup GUIDE_GENTS_HOUSE, 4, 4

+	mapgroup CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 4, 4

+	mapgroup ROUTE_30_BERRY_SPEECH_HOUSE, 4, 4

+	mapgroup MR_POKEMONS_HOUSE, 4, 4

+	mapgroup ROUTE_31_VIOLET_GATE, 4, 5

 ; elevator floors

-_B4F  EQU $0

-_B3F  EQU $1

-_B2F  EQU $2

-_B1F  EQU $3

-_1F   EQU $4

-_2F   EQU $5

-_3F   EQU $6

-_4F   EQU $7

-_5F   EQU $8

-_6F   EQU $9

-_7F   EQU $a

-_8F   EQU $b

-_9F   EQU $c

-_10F  EQU $d

-_11F  EQU $e

-_ROOF EQU $f

+	const_def

+	const _B4F

+	const _B3F

+	const _B2F

+	const _B1F

+	const _1F

+	const _2F

+	const _3F

+	const _4F

+	const _5F

+	const _6F

+	const _7F

+	const _8F

+	const _9F

+	const _10F

+	const _11F

+	const _ROOF

 ; connection directions

-EAST EQU 1

-WEST EQU 2

-SOUTH EQU 4

-NORTH EQU 8

+	const_def

+	shift_const EAST

+	shift_const WEST

+	shift_const SOUTH

+	shift_const NORTH

 ; sprites

-SPRITE_CHRIS                 EQU $01

-SPRITE_CHRIS_BIKE            EQU $02

-SPRITE_GAMEBOY_KID           EQU $03

-SPRITE_SILVER                EQU $04

-SPRITE_OAK                   EQU $05

-SPRITE_RED                   EQU $06

-SPRITE_BLUE                  EQU $07

-SPRITE_BILL                  EQU $08

-SPRITE_ELDER                 EQU $09

-SPRITE_JANINE                EQU $0a

-SPRITE_KURT                  EQU $0b

-SPRITE_MOM                   EQU $0c

-SPRITE_BLAINE                EQU $0d

-SPRITE_REDS_MOM              EQU $0e

-SPRITE_DAISY                 EQU $0f

-SPRITE_ELM                   EQU $10

-SPRITE_WILL                  EQU $11

-SPRITE_FALKNER               EQU $12

-SPRITE_WHITNEY               EQU $13

-SPRITE_BUGSY                 EQU $14

-SPRITE_MORTY                 EQU $15

-SPRITE_CHUCK                 EQU $16

-SPRITE_JASMINE               EQU $17

-SPRITE_PRYCE                 EQU $18

-SPRITE_CLAIR                 EQU $19

-SPRITE_BROCK                 EQU $1a

-SPRITE_KAREN                 EQU $1b

-SPRITE_BRUNO                 EQU $1c

-SPRITE_MISTY                 EQU $1d

-SPRITE_LANCE                 EQU $1e

-SPRITE_SURGE                 EQU $1f

-SPRITE_ERIKA                 EQU $20

-SPRITE_KOGA                  EQU $21

-SPRITE_SABRINA               EQU $22

-SPRITE_COOLTRAINER_M         EQU $23

-SPRITE_COOLTRAINER_F         EQU $24

-SPRITE_BUG_CATCHER           EQU $25

-SPRITE_TWIN                  EQU $26

-SPRITE_YOUNGSTER             EQU $27

-SPRITE_LASS                  EQU $28

-SPRITE_TEACHER               EQU $29

-SPRITE_BUENA                 EQU $2a

-SPRITE_SUPER_NERD            EQU $2b

-SPRITE_ROCKER                EQU $2c

-SPRITE_POKEFAN_M             EQU $2d

-SPRITE_POKEFAN_F             EQU $2e

-SPRITE_GRAMPS                EQU $2f

-SPRITE_GRANNY                EQU $30

-SPRITE_SWIMMER_GUY           EQU $31

-SPRITE_SWIMMER_GIRL          EQU $32

-SPRITE_BIG_SNORLAX           EQU $33

-SPRITE_SURFING_PIKACHU       EQU $34

-SPRITE_ROCKET                EQU $35

-SPRITE_ROCKET_GIRL           EQU $36

-SPRITE_NURSE                 EQU $37

-SPRITE_LINK_RECEPTIONIST     EQU $38

-SPRITE_CLERK                 EQU $39

-SPRITE_FISHER                EQU $3a

-SPRITE_FISHING_GURU          EQU $3b

-SPRITE_SCIENTIST             EQU $3c

-SPRITE_KIMONO_GIRL           EQU $3d

-SPRITE_SAGE                  EQU $3e

-SPRITE_UNUSED_GUY            EQU $3f

-SPRITE_GENTLEMAN             EQU $40

-SPRITE_BLACK_BELT            EQU $41

-SPRITE_RECEPTIONIST          EQU $42

-SPRITE_OFFICER               EQU $43

-SPRITE_CAL                   EQU $44

-SPRITE_SLOWPOKE              EQU $45

-SPRITE_CAPTAIN               EQU $46

-SPRITE_BIG_LAPRAS            EQU $47

-SPRITE_GYM_GUY               EQU $48

-SPRITE_SAILOR                EQU $49

-SPRITE_BIKER                 EQU $4a

-SPRITE_PHARMACIST            EQU $4b

-SPRITE_MONSTER               EQU $4c

-SPRITE_FAIRY                 EQU $4d

-SPRITE_BIRD                  EQU $4e

-SPRITE_DRAGON                EQU $4f

-SPRITE_BIG_ONIX              EQU $50

-SPRITE_N64                   EQU $51

-SPRITE_SUDOWOODO             EQU $52

-SPRITE_SURF                  EQU $53

-SPRITE_POKE_BALL             EQU $54

-SPRITE_POKEDEX               EQU $55

-SPRITE_PAPER                 EQU $56

-SPRITE_VIRTUAL_BOY           EQU $57

-SPRITE_OLD_LINK_RECEPTIONIST EQU $58

-SPRITE_ROCK                  EQU $59

-SPRITE_BOULDER               EQU $5a

-SPRITE_SNES                  EQU $5b

-SPRITE_FAMICOM               EQU $5c

-SPRITE_FRUIT_TREE            EQU $5d

-SPRITE_GOLD_TROPHY           EQU $5e

-SPRITE_SILVER_TROPHY         EQU $5f

-SPRITE_KRIS                  EQU $60

-SPRITE_KRIS_BIKE             EQU $61

-SPRITE_KURT_OUTSIDE          EQU $62

-SPRITE_SUICUNE               EQU $63

-SPRITE_ENTEI                 EQU $64

-SPRITE_RAIKOU                EQU $65

-SPRITE_STANDING_YOUNGSTER    EQU $66

+	const_def

+	const SPRITE_NONE

+	const SPRITE_CHRIS

+	const SPRITE_CHRIS_BIKE

+	const SPRITE_GAMEBOY_KID

+	const SPRITE_SILVER

+	const SPRITE_OAK

+	const SPRITE_RED

+	const SPRITE_BLUE

+	const SPRITE_BILL

+	const SPRITE_ELDER

+	const SPRITE_JANINE

+	const SPRITE_KURT

+	const SPRITE_MOM

+	const SPRITE_BLAINE

+	const SPRITE_REDS_MOM

+	const SPRITE_DAISY

+	const SPRITE_ELM

+	const SPRITE_WILL

+	const SPRITE_FALKNER

+	const SPRITE_WHITNEY

+	const SPRITE_BUGSY

+	const SPRITE_MORTY

+	const SPRITE_CHUCK

+	const SPRITE_JASMINE

+	const SPRITE_PRYCE

+	const SPRITE_CLAIR

+	const SPRITE_BROCK

+	const SPRITE_KAREN

+	const SPRITE_BRUNO

+	const SPRITE_MISTY

+	const SPRITE_LANCE

+	const SPRITE_SURGE

+	const SPRITE_ERIKA

+	const SPRITE_KOGA

+	const SPRITE_SABRINA

+	const SPRITE_COOLTRAINER_M

+	const SPRITE_COOLTRAINER_F

+	const SPRITE_BUG_CATCHER

+	const SPRITE_TWIN

+	const SPRITE_YOUNGSTER

+	const SPRITE_LASS

+	const SPRITE_TEACHER

+	const SPRITE_BUENA

+	const SPRITE_SUPER_NERD

+	const SPRITE_ROCKER

+	const SPRITE_POKEFAN_M

+	const SPRITE_POKEFAN_F

+	const SPRITE_GRAMPS

+	const SPRITE_GRANNY

+	const SPRITE_SWIMMER_GUY

+	const SPRITE_SWIMMER_GIRL

+	const SPRITE_BIG_SNORLAX

+	const SPRITE_SURFING_PIKACHU

+	const SPRITE_ROCKET

+	const SPRITE_ROCKET_GIRL

+	const SPRITE_NURSE

+	const SPRITE_LINK_RECEPTIONIST

+	const SPRITE_CLERK

+	const SPRITE_FISHER

+	const SPRITE_FISHING_GURU

+	const SPRITE_SCIENTIST

+	const SPRITE_KIMONO_GIRL

+	const SPRITE_SAGE

+	const SPRITE_UNUSED_GUY

+	const SPRITE_GENTLEMAN

+	const SPRITE_BLACK_BELT

+	const SPRITE_RECEPTIONIST

+	const SPRITE_OFFICER

+	const SPRITE_CAL

+	const SPRITE_SLOWPOKE

+	const SPRITE_CAPTAIN

+	const SPRITE_BIG_LAPRAS

+	const SPRITE_GYM_GUY

+	const SPRITE_SAILOR

+	const SPRITE_BIKER

+	const SPRITE_PHARMACIST

+	const SPRITE_MONSTER

+	const SPRITE_FAIRY

+	const SPRITE_BIRD

+	const SPRITE_DRAGON

+	const SPRITE_BIG_ONIX

+	const SPRITE_N64

+	const SPRITE_SUDOWOODO

+	const SPRITE_SURF

+	const SPRITE_POKE_BALL

+	const SPRITE_POKEDEX

+	const SPRITE_PAPER

+	const SPRITE_VIRTUAL_BOY

+	const SPRITE_OLD_LINK_RECEPTIONIST

+	const SPRITE_ROCK

+	const SPRITE_BOULDER

+	const SPRITE_SNES

+	const SPRITE_FAMICOM

+	const SPRITE_FRUIT_TREE

+	const SPRITE_GOLD_TROPHY

+	const SPRITE_SILVER_TROPHY

+	const SPRITE_KRIS

+	const SPRITE_KRIS_BIKE

+	const SPRITE_KURT_OUTSIDE

+	const SPRITE_SUICUNE

+	const SPRITE_ENTEI

+	const SPRITE_RAIKOU

+	const SPRITE_STANDING_YOUNGSTER

+const_value = $80

+SPRITE_POKEMON EQU const_value

+	const SPRITE_UNOWN

+	const SPRITE_GEODUDE

+	const SPRITE_GROWLITHE

+	const SPRITE_WEEDLE

+	const SPRITE_SHELLDER

+	const SPRITE_ODDISH

+	const SPRITE_GENGAR

+	const SPRITE_ZUBAT

+	const SPRITE_MAGIKARP

+	const SPRITE_SQUIRTLE

+	const SPRITE_TOGEPI

+	const SPRITE_BUTTERFREE

+	const SPRITE_DIGLETT

+	const SPRITE_POLIWAG

+	const SPRITE_PIKACHU

+	const SPRITE_CLEFAIRY

+	const SPRITE_CHARMANDER

+	const SPRITE_JYNX

+	const SPRITE_STARMIE

+	const SPRITE_BULBASAUR

+	const SPRITE_JIGGLYPUFF

+	const SPRITE_GRIMER

+	const SPRITE_EKANS

+	const SPRITE_PARAS

+	const SPRITE_TENTACOOL

+	const SPRITE_TAUROS

+	const SPRITE_MACHOP

+	const SPRITE_VOLTORB

+	const SPRITE_LAPRAS

+	const SPRITE_RHYDON

+	const SPRITE_MOLTRES

+	const SPRITE_SNORLAX

+	const SPRITE_GYARADOS

+	const SPRITE_LUGIA

+	const SPRITE_HO_OH

-SPRITE_POKEMON EQU $80

-SPRITE_UNOWN      EQU $80

-SPRITE_GEODUDE    EQU $81

-SPRITE_GROWLITHE  EQU $82

-SPRITE_WEEDLE     EQU $83

-SPRITE_SHELLDER   EQU $84

-SPRITE_ODDISH     EQU $85

-SPRITE_GENGAR     EQU $86

-SPRITE_ZUBAT      EQU $87

-SPRITE_MAGIKARP   EQU $88

-SPRITE_SQUIRTLE   EQU $89

-SPRITE_TOGEPI     EQU $8a

-SPRITE_BUTTERFREE EQU $8b

-SPRITE_DIGLETT    EQU $8c

-SPRITE_POLIWAG    EQU $8d

-SPRITE_PIKACHU    EQU $8e

-SPRITE_CLEFAIRY   EQU $8f

-SPRITE_CHARMANDER EQU $90

-SPRITE_JYNX       EQU $91

-SPRITE_STARMIE    EQU $92

-SPRITE_BULBASAUR  EQU $93

-SPRITE_JIGGLYPUFF EQU $94

-SPRITE_GRIMER     EQU $95

-SPRITE_EKANS      EQU $96

-SPRITE_PARAS      EQU $97

-SPRITE_TENTACOOL  EQU $98

-SPRITE_TAUROS     EQU $99

-SPRITE_MACHOP     EQU $9a

-SPRITE_VOLTORB    EQU $9b

-SPRITE_LAPRAS     EQU $9c

-SPRITE_RHYDON     EQU $9d

-SPRITE_MOLTRES    EQU $9e

-SPRITE_SNORLAX    EQU $9f

-SPRITE_GYARADOS   EQU $a0

-SPRITE_LUGIA      EQU $a1

-SPRITE_HO_OH      EQU $a2

+const_value = $e0

+	const SPRITE_DAYCARE_MON_1

+	const SPRITE_DAYCARE_MON_2

-SPRITE_DAYCARE_MON_1 EQU $e0

-SPRITE_DAYCARE_MON_2 EQU $e1

+const_value = $f0

+SPRITE_VARS EQU const_value

+	const SPRITE_CONSOLE

+	const SPRITE_DOLL_1

+	const SPRITE_DOLL_2

+	const SPRITE_BIG_DOLL

+	const SPRITE_WEIRD_TREE

+	const SPRITE_OLIVINE_RIVAL

+	const SPRITE_AZALEA_ROCKET

+	const SPRITE_FUSCHIA_GYM_1

+	const SPRITE_FUSCHIA_GYM_2

+	const SPRITE_FUSCHIA_GYM_3

+	const SPRITE_FUSCHIA_GYM_4

+	const SPRITE_COPYCAT

+	const SPRITE_JANINE_IMPERSONATOR

-SPRITE_VARS EQU $f0

-SPRITE_CONSOLE EQU $f0

-SPRITE_DOLL_1 EQU $f1

-SPRITE_DOLL_2 EQU $f2

-SPRITE_BIG_DOLL EQU $f3

-SPRITE_WEIRD_TREE EQU $f4

-SPRITE_OLIVINE_RIVAL EQU $f5

-SPRITE_AZALEA_ROCKET EQU $f6

-SPRITE_FUSCHIA_GYM_1 EQU $f7

-SPRITE_FUSCHIA_GYM_2 EQU $f8

-SPRITE_FUSCHIA_GYM_3 EQU $f9

-SPRITE_FUSCHIA_GYM_4 EQU $fa

-SPRITE_COPYCAT EQU $fb

-SPRITE_JANINE_IMPERSONATOR EQU $fc

 ; sprite types

-WALKING_SPRITE  EQU 1

-STANDING_SPRITE EQU 2

-STILL_SPRITE    EQU 3

+const_value = 1

+	const WALKING_SPRITE

+	const STANDING_SPRITE

+	const STILL_SPRITE

 ; sprite palettes

-PAL_OW_RED    EQU 0

-PAL_OW_BLUE   EQU 1

-PAL_OW_GREEN  EQU 2

-PAL_OW_BROWN  EQU 3

-PAL_OW_PINK   EQU 4

-PAL_OW_SILVER EQU 5

-PAL_OW_TREE   EQU 6

-PAL_OW_ROCK   EQU 7

+	const_def

+	const PAL_OW_RED

+	const PAL_OW_BLUE

+	const PAL_OW_GREEN

+	const PAL_OW_BROWN

+	const PAL_OW_PINK

+	const PAL_OW_SILVER

+	const PAL_OW_TREE

+	const PAL_OW_ROCK

 ; permissions

-TOWN EQU 1

-ROUTE EQU 2

-INDOOR EQU 3

-CAVE EQU 4

+const_value = 1

+	const TOWN

+	const ROUTE

+	const INDOOR

+	const CAVE

+	const PERM_5

+	const GATE

+	const DUNGEON

-GATE EQU 6

-DUNGEON EQU 7

 ; object struct

-OBJECT_00 EQU $0

-OBJECT_01 EQU $1

-OBJECT_SPRITE EQU $2

-OBJECT_03 EQU $3

-OBJECT_04 EQU $4

-OBJECT_FLAGS EQU $5

-OBJECT_PALETTE EQU $6

-OBJECT_07 EQU $7

-OBJECT_08 EQU $8

-OBJECT_09 EQU $9

-OBJECT_STEP_DURATION EQU $a

-OBJECT_11 EQU $b

-OBJECT_12 EQU $c

-OBJECT_FACING EQU $d

-OBJECT_STANDING_TILE EQU $e

-OBJECT_NEXT_TILE EQU $f

-OBJECT_MAP_X EQU $10

-OBJECT_MAP_Y EQU $11

-OBJECT_NEXT_MAP_X EQU $12

-OBJECT_NEXT_MAP_Y EQU $13

-OBJECT_20 EQU $14

-OBJECT_21 EQU $15

-OBJECT_22 EQU $16

-OBJECT_SPRITE_X EQU $17

-OBJECT_SPRITE_Y EQU $18

-OBJECT_SPRITE_X_OFFSET EQU $19

-OBJECT_SPRITE_Y_OFFSET EQU $1a

-OBJECT_27 EQU $1b

-OBJECT_28 EQU $1c

-OBJECT_29 EQU $1d

-OBJECT_30 EQU $1e

-OBJECT_31 EQU $1f

-OBJECT_32 EQU $20

+	const_def

+	const OBJECT_00

+	const OBJECT_01

+	const OBJECT_SPRITE

+	const OBJECT_03

+	const OBJECT_04

+	const OBJECT_FLAGS

+	const OBJECT_PALETTE

+	const OBJECT_07

+	const OBJECT_08

+	const OBJECT_09

+	const OBJECT_STEP_DURATION

+	const OBJECT_11

+	const OBJECT_12

+	const OBJECT_FACING

+	const OBJECT_STANDING_TILE

+	const OBJECT_NEXT_TILE

+	const OBJECT_MAP_X

+	const OBJECT_MAP_Y

+	const OBJECT_NEXT_MAP_X

+	const OBJECT_NEXT_MAP_Y

+	const OBJECT_20

+	const OBJECT_21

+	const OBJECT_22

+	const OBJECT_SPRITE_X

+	const OBJECT_SPRITE_Y

+	const OBJECT_SPRITE_X_OFFSET

+	const OBJECT_SPRITE_Y_OFFSET

+	const OBJECT_27

+	const OBJECT_28

+	const OBJECT_29

+	const OBJECT_30

+	const OBJECT_31

+	const OBJECT_32

 ; 33-39 are not used

--- a/constants/music_constants.asm

+++ b/constants/music_constants.asm

@@ -1,106 +1,107 @@

-MUSIC_NONE EQU 0

-MUSIC_TITLE EQU 1

-MUSIC_ROUTE_1 EQU 2

-MUSIC_ROUTE_3 EQU 3

-MUSIC_ROUTE_12 EQU 4

-MUSIC_MAGNET_TRAIN EQU 5

-MUSIC_KANTO_GYM_LEADER_BATTLE EQU 6

-MUSIC_KANTO_TRAINER_BATTLE EQU 7

-MUSIC_KANTO_WILD_BATTLE EQU 8

-MUSIC_POKEMON_CENTER EQU 9

-MUSIC_HIKER_ENCOUNTER EQU 10

-MUSIC_LASS_ENCOUNTER EQU 11

-MUSIC_OFFICER_ENCOUNTER EQU 12

-MUSIC_HEAL EQU 13

-MUSIC_LAVENDER_TOWN EQU 14

-MUSIC_ROUTE_2 EQU 15

-MUSIC_MT_MOON EQU 16

-MUSIC_SHOW_ME_AROUND EQU 17

-MUSIC_GAME_CORNER EQU 18

-MUSIC_BICYCLE EQU 19

-MUSIC_HALL_OF_FAME EQU 20

-MUSIC_VIRIDIAN_CITY EQU 21

-MUSIC_CELADON_CITY EQU 22

-MUSIC_TRAINER_VICTORY EQU 23

-MUSIC_WILD_VICTORY EQU 24

-MUSIC_GYM_VICTORY EQU 25

-MUSIC_MT_MOON_SQUARE EQU 26

-MUSIC_GYM EQU 27

-MUSIC_PALLET_TOWN EQU 28

-MUSIC_POKEMON_TALK EQU 29

-MUSIC_PROF_OAK EQU 30

-MUSIC_RIVAL_ENCOUNTER EQU 31

-MUSIC_RIVAL_AFTER EQU 32

-MUSIC_SURF EQU 33

-MUSIC_EVOLUTION EQU 34

-MUSIC_NATIONAL_PARK EQU 35

-MUSIC_CREDITS EQU 36

-MUSIC_AZALEA_TOWN EQU 37

-MUSIC_CHERRYGROVE_CITY EQU 38

-MUSIC_KIMONO_ENCOUNTER EQU 39

-MUSIC_UNION_CAVE EQU 40

-MUSIC_JOHTO_WILD_BATTLE EQU 41

-MUSIC_JOHTO_TRAINER_BATTLE EQU 42

-MUSIC_ROUTE_30 EQU 43

-MUSIC_ECRUTEAK_CITY EQU 44

-MUSIC_VIOLET_CITY EQU 45

-MUSIC_JOHTO_GYM_LEADER_BATTLE EQU 46

-MUSIC_CHAMPION_BATTLE EQU 47

-MUSIC_RIVAL_BATTLE EQU 48

-MUSIC_ROCKET_BATTLE EQU 49

-MUSIC_PROF_ELM EQU 50

-MUSIC_DARK_CAVE EQU 51

-MUSIC_ROUTE_29 EQU 52

-MUSIC_ROUTE_36 EQU 53

-MUSIC_SS_AQUA EQU 54

-MUSIC_YOUNGSTER_ENCOUNTER EQU 55

-MUSIC_BEAUTY_ENCOUNTER EQU 56

-MUSIC_ROCKET_ENCOUNTER EQU 57

-MUSIC_POKEMANIAC_ENCOUNTER EQU 58

-MUSIC_SAGE_ENCOUNTER EQU 59

-MUSIC_NEW_BARK_TOWN EQU 60

-MUSIC_GOLDENROD_CITY EQU 61

-MUSIC_VERMILION_CITY EQU 62

-MUSIC_POKEMON_CHANNEL EQU 63

-MUSIC_POKE_FLUTE_CHANNEL EQU 64

-MUSIC_TIN_TOWER EQU 65

-MUSIC_SPROUT_TOWER EQU 66

-MUSIC_BURNED_TOWER EQU 67

-MUSIC_LIGHTHOUSE EQU 68

-MUSIC_LAKE_OF_RAGE EQU 69

-MUSIC_INDIGO_PLATEAU EQU 70

-MUSIC_ROUTE_37 EQU 71

-MUSIC_ROCKET_HIDEOUT EQU 72

-MUSIC_DRAGONS_DEN EQU 73

-MUSIC_JOHTO_WILD_BATTLE_NIGHT EQU 74

-MUSIC_RUINS_OF_ALPH_RADIO EQU 75

-MUSIC_CAPTURE EQU 76

-MUSIC_ROUTE_26 EQU 77

-MUSIC_MOM EQU 78

-MUSIC_VICTORY_ROAD EQU 79

-MUSIC_POKEMON_LULLABY EQU 80

-MUSIC_POKEMON_MARCH EQU 81

-MUSIC_GS_OPENING EQU 82

-MUSIC_GS_OPENING_2 EQU 83

-MUSIC_MAIN_MENU EQU 84

-MUSIC_RUINS_OF_ALPH_INTERIOR EQU 85

-MUSIC_ROCKET_OVERTURE EQU 86

-MUSIC_DANCING_HALL EQU 87

-MUSIC_BUG_CATCHING_CONTEST_RANKING EQU 88

-MUSIC_BUG_CATCHING_CONTEST EQU 89

-MUSIC_LAKE_OF_RAGE_ROCKET_RADIO EQU 90

-MUSIC_PRINTER EQU 91

-MUSIC_POST_CREDITS EQU 92

+	const_def

-MUSIC_CLAIR EQU 93

-MUSIC_MOBILE_ADAPTER_MENU EQU 94

-MUSIC_MOBILE_ADAPTER EQU 95

-MUSIC_BUENAS_PASSWORD EQU 96

-MUSIC_MYSTICALMAN_ENCOUNTER EQU 97

-MUSIC_CRYSTAL_OPENING EQU 98

-MUSIC_BATTLE_TOWER_THEME EQU 99

-MUSIC_SUICUNE_BATTLE EQU 100

-MUSIC_BATTLE_TOWER_LOBBY EQU 101

-MUSIC_MOBILE_CENTER EQU 102

+	const MUSIC_NONE

+	const MUSIC_TITLE

+	const MUSIC_ROUTE_1

+	const MUSIC_ROUTE_3

+	const MUSIC_ROUTE_12

+	const MUSIC_MAGNET_TRAIN

+	const MUSIC_KANTO_GYM_LEADER_BATTLE

+	const MUSIC_KANTO_TRAINER_BATTLE

+	const MUSIC_KANTO_WILD_BATTLE

+	const MUSIC_POKEMON_CENTER

+	const MUSIC_HIKER_ENCOUNTER

+	const MUSIC_LASS_ENCOUNTER

+	const MUSIC_OFFICER_ENCOUNTER

+	const MUSIC_HEAL

+	const MUSIC_LAVENDER_TOWN

+	const MUSIC_ROUTE_2

+	const MUSIC_MT_MOON

+	const MUSIC_SHOW_ME_AROUND

+	const MUSIC_GAME_CORNER

+	const MUSIC_BICYCLE

+	const MUSIC_HALL_OF_FAME

+	const MUSIC_VIRIDIAN_CITY

+	const MUSIC_CELADON_CITY

+	const MUSIC_TRAINER_VICTORY

+	const MUSIC_WILD_VICTORY

+	const MUSIC_GYM_VICTORY

+	const MUSIC_MT_MOON_SQUARE

+	const MUSIC_GYM

+	const MUSIC_PALLET_TOWN

+	const MUSIC_POKEMON_TALK

+	const MUSIC_PROF_OAK

+	const MUSIC_RIVAL_ENCOUNTER

+	const MUSIC_RIVAL_AFTER

+	const MUSIC_SURF

+	const MUSIC_EVOLUTION

+	const MUSIC_NATIONAL_PARK

+	const MUSIC_CREDITS

+	const MUSIC_AZALEA_TOWN

+	const MUSIC_CHERRYGROVE_CITY

+	const MUSIC_KIMONO_ENCOUNTER

+	const MUSIC_UNION_CAVE

+	const MUSIC_JOHTO_WILD_BATTLE

+	const MUSIC_JOHTO_TRAINER_BATTLE

+	const MUSIC_ROUTE_30

+	const MUSIC_ECRUTEAK_CITY

+	const MUSIC_VIOLET_CITY

+	const MUSIC_JOHTO_GYM_LEADER_BATTLE

+	const MUSIC_CHAMPION_BATTLE

+	const MUSIC_RIVAL_BATTLE

+	const MUSIC_ROCKET_BATTLE

+	const MUSIC_PROF_ELM

+	const MUSIC_DARK_CAVE

+	const MUSIC_ROUTE_29

+	const MUSIC_ROUTE_36

+	const MUSIC_SS_AQUA

+	const MUSIC_YOUNGSTER_ENCOUNTER

+	const MUSIC_BEAUTY_ENCOUNTER

+	const MUSIC_ROCKET_ENCOUNTER

+	const MUSIC_POKEMANIAC_ENCOUNTER

+	const MUSIC_SAGE_ENCOUNTER

+	const MUSIC_NEW_BARK_TOWN

+	const MUSIC_GOLDENROD_CITY

+	const MUSIC_VERMILION_CITY

+	const MUSIC_POKEMON_CHANNEL

+	const MUSIC_POKE_FLUTE_CHANNEL

+	const MUSIC_TIN_TOWER

+	const MUSIC_SPROUT_TOWER

+	const MUSIC_BURNED_TOWER

+	const MUSIC_LIGHTHOUSE

+	const MUSIC_LAKE_OF_RAGE

+	const MUSIC_INDIGO_PLATEAU

+	const MUSIC_ROUTE_37

+	const MUSIC_ROCKET_HIDEOUT

+	const MUSIC_DRAGONS_DEN

+	const MUSIC_JOHTO_WILD_BATTLE_NIGHT

+	const MUSIC_RUINS_OF_ALPH_RADIO

+	const MUSIC_CAPTURE

+	const MUSIC_ROUTE_26

+	const MUSIC_MOM

+	const MUSIC_VICTORY_ROAD

+	const MUSIC_POKEMON_LULLABY

+	const MUSIC_POKEMON_MARCH

+	const MUSIC_GS_OPENING

+	const MUSIC_GS_OPENING_2

+	const MUSIC_MAIN_MENU

+	const MUSIC_RUINS_OF_ALPH_INTERIOR

+	const MUSIC_ROCKET_OVERTURE

+	const MUSIC_DANCING_HALL

+	const MUSIC_BUG_CATCHING_CONTEST_RANKING

+	const MUSIC_BUG_CATCHING_CONTEST

+	const MUSIC_LAKE_OF_RAGE_ROCKET_RADIO

+	const MUSIC_PRINTER

+	const MUSIC_POST_CREDITS

+	const MUSIC_CLAIR

+	const MUSIC_MOBILE_ADAPTER_MENU

+	const MUSIC_MOBILE_ADAPTER

+	const MUSIC_BUENAS_PASSWORD

+	const MUSIC_MYSTICALMAN_ENCOUNTER

+	const MUSIC_CRYSTAL_OPENING

+	const MUSIC_BATTLE_TOWER_THEME

+	const MUSIC_SUICUNE_BATTLE

+	const MUSIC_BATTLE_TOWER_LOBBY

+	const MUSIC_MOBILE_CENTER

 MUSIC_MAHOGANY_MART EQU 100 ; leftover from gold

--- a/constants/std_constants.asm

+++ b/constants/std_constants.asm

@@ -48,6 +48,6 @@

 	enum gymstatue2

 	enum receiveitem

 	enum receivetogepiegg

-	enum pc

+	enum pcscript

 	enum gamecornercoinvendor

 	enum happinesschecknpc

--- a/engine/spawn_points.asm

+++ b/engine/spawn_points.asm

@@ -18,7 +18,7 @@

 	spawn VIRIDIAN,    VIRIDIAN_CITY,              23, 26

 	spawn PEWTER,      PEWTER_CITY,                13, 26

 	spawn CERULEAN,    CERULEAN_CITY,              19, 22

-	spawn ROCK_TUNNEL, ROUTE_10A,                  11,  2

+	spawn ROCK_TUNNEL, ROUTE_10_NORTH,             11,  2

 	spawn VERMILION,   VERMILION_CITY,              9,  6

 	spawn LAVENDER,    LAVENDER_TOWN,               5,  6

 	spawn SAFFRON,     SAFFRON_CITY,                9, 30

--- a/macros.asm

+++ b/macros.asm

@@ -44,6 +44,14 @@

 	dw \2, \3, \4

 	ENDM

+dbankaddr: MACRO

+	dbw BANK(\1), \1

+	ENDM

+daddrbank: MACRO

+	dwb \1, BANK(\1)

+	ENDM

 dn: MACRO

 	rept _NARG / 2

 	db (\1) << 4 + (\2)

--- a/macros/enum.asm

+++ b/macros/enum.asm

@@ -29,3 +29,8 @@

 \1 EQU const_value

 const_value = const_value + 1

 ENDM

+shift_const: MACRO

+\1 EQU 1 << const_value

+const_value = const_value + 1

+ENDM

--- a/macros/map.asm

+++ b/macros/map.asm

@@ -162,3 +162,17 @@

 endc

 ENDM

+mapgroup: MACRO

+\1\@  EQUS "GROUP_\1"

+\1\@2 EQUS "MAP_\1"

+\1\@ EQU const_value

+	enum \1\@2

+\1_HEIGHT EQU \2

+\1_WIDTH EQU \3

+ENDM

+newgroup: MACRO

+const_value = const_value + 1

+	enum_start 1

+ENDM

--- a/maps/AzaleaGym.asm

+++ b/maps/AzaleaGym.asm

@@ -451,10 +451,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_BUGSY, 11, 9, $3, $0, 255, 255, $a0, 0, BugsyScript_0x18ec1e, -1

+	person_event SPRITE_BUG_CATCHER, 7, 9, $a, $0, 255, 255, $b2, 2, TrainerBug_catcherBug_catcher_benny, -1

+	person_event SPRITE_BUG_CATCHER, 12, 12, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherAl, -1

+	person_event SPRITE_BUG_CATCHER, 6, 4, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherJosh, -1

+	person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay1, -1

+	person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsAmyandmay2, -1

+	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, AzaleaGymGuyScript, -1

--- a/maps/AzaleaMart.asm

+++ b/maps/AzaleaMart.asm

@@ -57,6 +57,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18e040, -1

+	person_event SPRITE_COOLTRAINER_M, 9, 6, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x18e047, -1

+	person_event SPRITE_BUG_CATCHER, 6, 11, $5, $2, 255, 255, $80, 0, BugCatcherScript_0x18e04a, -1

--- a/maps/AzaleaPokeCenter1F.asm

+++ b/maps/AzaleaPokeCenter1F.asm

@@ -90,7 +90,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18db28, -1

+	person_event SPRITE_GENTLEMAN, 10, 13, $4, $10, 255, 255, $0, 0, GentlemanScript_0x18db2b, -1

+	person_event SPRITE_FISHING_GURU, 5, 10, $6, $0, 255, 255, $0, 0, FishingGuruScript_0x18db2e, -1

+	person_event SPRITE_POKEFAN_F, 8, 5, $2, $21, 255, 255, $0, 0, PokefanFScript_0x18db31, -1

--- a/maps/AzaleaTown.asm

+++ b/maps/AzaleaTown.asm

@@ -483,14 +483,14 @@

 	; people-events

 	db 12

 	person_event SPRITE_AZALEA_ROCKET, 13, 35, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ab, EVENT_6FA

-	person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 13, 25, $2, $21, 255, 255, $0, 0, GrampsScript_0x1980b1, -1

+	person_event SPRITE_TEACHER, 17, 19, $4, $20, 255, 255, $90, 0, TeacherScript_0x1980c5, -1

+	person_event SPRITE_YOUNGSTER, 13, 11, $5, $1, 255, 255, $a0, 0, YoungsterScript_0x1980c8, -1

 	person_event SPRITE_SLOWPOKE, 21, 12, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9

 	person_event SPRITE_SLOWPOKE, 13, 22, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9

 	person_event SPRITE_SLOWPOKE, 13, 33, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9

 	person_event SPRITE_SLOWPOKE, 19, 19, $1, $0, 255, 255, $0, 0, SlowpokeScript_0x1980cb, EVENT_6F9

-	person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, EVENT_ALWAYS_THERE

+	person_event SPRITE_FRUIT_TREE, 6, 12, $1, $0, 255, 255, $0, 0, WhiteApricornTree, -1

 	person_event SPRITE_AZALEA_ROCKET, 14, 15, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BF

 	person_event SPRITE_AZALEA_ROCKET, 20, 14, $6, $0, 255, 255, $0, 0, AzaleaRocketScript_0x1980ae, EVENT_6FC

 	person_event SPRITE_KURT_OUTSIDE, 9, 10, $8, $0, 255, 255, $0, 0, KurtOutsideScript_0x19810c, EVENT_7A4

--- a/maps/BattleTower1F.asm

+++ b/maps/BattleTower1F.asm

@@ -810,8 +810,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 10, 11, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x9e3e2, -1

+	person_event SPRITE_YOUNGSTER, 13, 18, $9, $0, 255, 255, $b0, 0, YoungsterScript_0x9e55d, -1

+	person_event SPRITE_COOLTRAINER_F, 13, 8, $5, $1, 255, 255, $80, 0, CooltrainerFScript_0x9e568, -1

+	person_event SPRITE_BUG_CATCHER, 7, 5, $2, $11, 255, 255, $90, 0, BugCatcherScript_0x9e56b, -1

+	person_event SPRITE_GRANNY, 7, 18, $4, $10, 255, 255, $0, 0, GrannyScript_0x9e56e, -1

--- a/maps/BattleTowerBattleRoom.asm

+++ b/maps/BattleTowerBattleRoom.asm

@@ -156,4 +156,4 @@

 	; people-events

 	db 2

 	person_event SPRITE_YOUNGSTER, 4, 8, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_791

-	person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 10, 5, $9, $0, 255, 255, $0, 0, ObjectEvent, -1

--- a/maps/BattleTowerElevator.asm

+++ b/maps/BattleTowerElevator.asm

@@ -60,4 +60,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 6, 5, $9, $0, 255, 255, $0, 0, MovementData_0x9f58f, -1

--- a/maps/BattleTowerHallway.asm

+++ b/maps/BattleTowerHallway.asm

@@ -96,4 +96,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 6, 15, $6, $0, 255, 255, $0, 0, BattleTowerHallway_MapEventHeader, -1

--- a/maps/BattleTowerOutside.asm

+++ b/maps/BattleTowerOutside.asm

@@ -142,7 +142,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, EVENT_ALWAYS_THERE

+	person_event SPRITE_STANDING_YOUNGSTER, 16, 10, $7, $0, 255, 255, $80, 0, StandingYoungsterScript_0x9f85f, -1

+	person_event SPRITE_BUENA, 15, 17, $2, $11, 255, 255, $a0, 0, BuenaScript_0x9f862, -1

 	person_event SPRITE_SAILOR, 22, 16, $5, $1, 255, 255, $0, 0, SailorScript_0x9f865, EVENT_7CF

-	person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 28, 16, $3, $0, 255, 255, $a0, 0, ObjectEvent, -1

--- a/maps/BillsHouse.asm

+++ b/maps/BillsHouse.asm

@@ -367,4 +367,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 7, 6, $7, $20, 255, 255, $90, 0, GrampsScript_0x189538, -1

--- a/maps/BlackthornCity.asm

+++ b/maps/BlackthornCity.asm

@@ -337,8 +337,8 @@

 	person_event SPRITE_SUPER_NERD, 16, 23, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x1a46e8, EVENT_6E4

 	person_event SPRITE_GRAMPS, 6, 24, $6, $0, 255, 255, $0, 0, GrampsScript_0x1a4708, EVENT_74C

 	person_event SPRITE_GRAMPS, 6, 25, $8, $0, 255, 255, $0, 0, GrampsScript_0x1a470b, EVENT_74D

-	person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, EVENT_ALWAYS_THERE

+	person_event SPRITE_BLACK_BELT, 35, 28, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x1a470e, -1

+	person_event SPRITE_COOLTRAINER_F, 29, 13, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1a4722, -1

+	person_event SPRITE_YOUNGSTER, 19, 17, $5, $1, 255, 255, $0, 0, YoungsterScript_0x1a4725, -1

 	person_event SPRITE_YOUNGSTER, 24, 26, $6, $0, 255, 255, $0, 0, SantosScript, EVENT_75D

-	person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_F, 23, 39, $7, $0, 255, 255, $a0, 0, CooltrainerFScript_0x1a4728, -1

--- a/maps/BlackthornDodrioTradeHouse.asm

+++ b/maps/BlackthornDodrioTradeHouse.asm

@@ -35,4 +35,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 7, 6, $3, $0, 255, 255, $a0, 0, Emy, -1

--- a/maps/BlackthornDragonSpeechHouse.asm

+++ b/maps/BlackthornDragonSpeechHouse.asm

@@ -58,5 +58,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, EVENT_ALWAYS_THERE

-	person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRANNY, 7, 6, $3, $0, 255, 255, $0, 0, GrannyScript_0x195949, -1

+	person_event SPRITE_EKANS, 9, 9, $16, $0, 255, 255, $90, 0, EkansScript_0x19594c, -1

--- a/maps/BlackthornGym1F.asm

+++ b/maps/BlackthornGym1F.asm

@@ -452,8 +452,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLAIR, 7, 9, $6, $0, 255, 255, $90, 0, ClairScript_0x194e24, -1

+	person_event SPRITE_COOLTRAINER_M, 10, 10, $6, $0, 255, 255, $82, 3, TrainerCooltrainermMike, -1

+	person_event SPRITE_COOLTRAINER_M, 18, 5, $6, $0, 255, 255, $82, 3, TrainerCooltrainermPaul, -1

+	person_event SPRITE_COOLTRAINER_F, 6, 13, $6, $0, 255, 255, $82, 1, TrainerCooltrainerfLola, -1

+	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, BlackthornGymGuyScript, -1

--- a/maps/BlackthornGym2F.asm

+++ b/maps/BlackthornGym2F.asm

@@ -177,11 +177,11 @@

 	; people-events

 	db 8

-	person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_M, 5, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermCody, -1

+	person_event SPRITE_COOLTRAINER_F, 15, 8, $8, $0, 255, 255, $82, 1, TrainerCooltrainerfFran, -1

 	person_event SPRITE_BOULDER, 6, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_1

 	person_event SPRITE_BOULDER, 7, 6, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_2

 	person_event SPRITE_BOULDER, 20, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_BOULDER_IN_BLACKTHORN_GYM_3

-	person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE

-	person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE

-	person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, EVENT_ALWAYS_THERE

+	person_event SPRITE_BOULDER, 7, 7, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1

+	person_event SPRITE_BOULDER, 5, 10, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1

+	person_event SPRITE_BOULDER, 18, 12, $19, $0, 255, 255, $0, 0, BlackthornGymBoulder, -1

--- a/maps/BlackthornMart.asm

+++ b/maps/BlackthornMart.asm

@@ -58,6 +58,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195a5d, -1

+	person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x195a64, -1

+	person_event SPRITE_BLACK_BELT, 6, 9, $6, $0, 255, 255, $a0, 0, BlackBeltScript_0x195a67, -1

--- a/maps/BlackthornPokeCenter1F.asm

+++ b/maps/BlackthornPokeCenter1F.asm

@@ -61,7 +61,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x195b79, -1

+	person_event SPRITE_GENTLEMAN, 7, 9, $6, $0, 255, 255, $0, 0, GentlemanScript_0x195b7c, -1

+	person_event SPRITE_TWIN, 8, 5, $3, $0, 255, 255, $a0, 0, TwinScript_0x195b7f, -1

+	person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x195b82, -1

--- a/maps/BluesHouse.asm

+++ b/maps/BluesHouse.asm

@@ -158,4 +158,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, EVENT_ALWAYS_THERE

+	person_event SPRITE_DAISY, 7, 6, $3, $0, 255, 255, $0, 0, DaisyScript_0x19b0d0, -1

--- a/maps/BrunosRoom.asm

+++ b/maps/BrunosRoom.asm

@@ -145,4 +145,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, EVENT_ALWAYS_THERE

+	person_event SPRITE_BRUNO, 11, 9, $6, $0, 255, 255, $b0, 0, BrunoScript_0x1809c5, -1

--- a/maps/BurnedTower1F.asm

+++ b/maps/BurnedTower1F.asm

@@ -311,7 +311,7 @@

 	; people-events

 	db 5

-	person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, EVENT_ALWAYS_THERE

+	person_event SPRITE_ROCK, 8, 19, $18, $0, 255, 255, $0, 0, BurnedTower1FRock, -1

 	person_event SPRITE_SUPER_NERD, 16, 16, $3, $0, 255, 255, $90, 0, SuperNerdScript_0x185cbc, EVENT_765

 	person_event SPRITE_SILVER, 13, 12, $8, $0, 255, 255, $2, 3, ObjectEvent, EVENT_6C5

 	person_event SPRITE_MORTY, 18, 18, $2, $11, 255, 255, $b0, 0, MortyScript_0x185cbf, EVENT_764

--- a/maps/BurnedTowerB1F.asm

+++ b/maps/BurnedTowerB1F.asm

@@ -251,7 +251,7 @@

 	; people-events

 	db 9

-	person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, EVENT_ALWAYS_THERE

+	person_event SPRITE_BOULDER, 12, 21, $19, $0, 255, 255, $0, 0, BurnedTowerB1FBoulder, -1

 	person_event SPRITE_RAIKOU, 7, 11, $16, $0, 255, 255, $b0, 0, ObjectEvent, EVENT_74A

 	person_event SPRITE_ENTEI, 7, 16, $16, $0, 255, 255, $80, 0, ObjectEvent, EVENT_74A

 	person_event SPRITE_SUICUNE, 8, 14, $16, $0, 255, 255, $90, 0, ObjectEvent, EVENT_74A

--- a/maps/CeladonCafe.asm

+++ b/maps/CeladonCafe.asm

@@ -219,8 +219,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 7, 13, $8, $0, 255, 255, $b0, 0, SuperNerdScript_0x73049, -1

+	person_event SPRITE_FISHER, 10, 8, $8, $0, 255, 255, $0, 0, FisherScript_0x73051, -1

+	person_event SPRITE_FISHER, 11, 5, $9, $0, 255, 255, $a0, 0, FisherScript_0x73062, -1

+	person_event SPRITE_FISHER, 6, 5, $9, $0, 255, 255, $0, 0, FisherScript_0x73073, -1

+	person_event SPRITE_TEACHER, 7, 8, $8, $0, 255, 255, $0, 0, TeacherScript_0x73084, -1

--- a/maps/CeladonCity.asm

+++ b/maps/CeladonCity.asm

@@ -258,12 +258,12 @@

 	; people-events

 	db 9

-	person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, EVENT_ALWAYS_THERE

-	person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 15, 30, $9, $0, 255, 255, $a0, 0, FisherScript_0x1a9f43, -1

+	person_event SPRITE_POLIWAG, 15, 31, $16, $0, 255, 255, $90, 0, CeladonCityPoliwrath, -1

+	person_event SPRITE_TEACHER, 28, 24, $5, $2, 255, 255, $80, 0, TeacherScript_0x1a9f50, -1

+	person_event SPRITE_GRAMPS, 20, 18, $6, $0, 255, 255, $b0, 0, GrampsScript_0x1a9f53, -1

+	person_event SPRITE_GRAMPS, 35, 12, $7, $0, 255, 255, $80, 0, GrampsScript_0x1a9f56, -1

+	person_event SPRITE_YOUNGSTER, 17, 22, $5, $2, 255, 255, $90, 0, YoungsterScript_0x1a9f59, -1

+	person_event SPRITE_YOUNGSTER, 37, 28, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x1a9f5c, -1

+	person_event SPRITE_TEACHER, 18, 10, $2, $22, 255, 255, $a0, 0, TeacherScript_0x1a9f5f, -1

+	person_event SPRITE_LASS, 26, 11, $4, $20, 255, 255, $80, 0, LassScript_0x1a9f62, -1

--- a/maps/CeladonDeptStore1F.asm

+++ b/maps/CeladonDeptStore1F.asm

@@ -89,6 +89,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x709e0, -1

+	person_event SPRITE_GENTLEMAN, 8, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x709e3, -1

+	person_event SPRITE_TEACHER, 7, 9, $5, $1, 255, 255, $a0, 0, TeacherScript_0x709e6, -1

--- a/maps/CeladonDeptStore2F.asm

+++ b/maps/CeladonDeptStore2F.asm

@@ -82,7 +82,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, EVENT_ALWAYS_THERE

-	person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bad, -1

+	person_event SPRITE_CLERK, 9, 18, $7, $0, 255, 255, $90, 0, ClerkScript_0x70bb5, -1

+	person_event SPRITE_POKEFAN_M, 6, 9, $7, $0, 255, 255, $80, 0, PokefanMScript_0x70bbd, -1

+	person_event SPRITE_YOUNGSTER, 6, 10, $8, $0, 255, 255, $a0, 0, YoungsterScript_0x70bc0, -1

--- a/maps/CeladonDeptStore3F.asm

+++ b/maps/CeladonDeptStore3F.asm

@@ -107,8 +107,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, EVENT_ALWAYS_THERE

-	person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, EVENT_ALWAYS_THERE

-	person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 5, 11, $6, $0, 255, 255, $90, 0, ClerkScript_0x70d29, -1

+	person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x70d31, -1

+	person_event SPRITE_GAMEBOY_KID, 5, 13, $6, $0, 255, 255, $80, 0, GameboyKidScript_0x70d34, -1

+	person_event SPRITE_GAMEBOY_KID, 5, 14, $6, $0, 255, 255, $90, 0, GameboyKidScript_0x70d3f, -1

+	person_event SPRITE_SUPER_NERD, 8, 17, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x70d4a, -1

--- a/maps/CeladonDeptStore4F.asm

+++ b/maps/CeladonDeptStore4F.asm

@@ -65,6 +65,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $90, 0, ClerkScript_0x70f0d, -1

+	person_event SPRITE_SUPER_NERD, 10, 11, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x70f15, -1

+	person_event SPRITE_YOUNGSTER, 6, 12, $7, $0, 255, 255, $0, 0, YoungsterScript_0x70f18, -1

--- a/maps/CeladonDeptStore5F.asm

+++ b/maps/CeladonDeptStore5F.asm

@@ -84,8 +84,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, EVENT_ALWAYS_THERE

-	person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 9, 11, $7, $0, 255, 255, $90, 0, ClerkScript_0x71004, -1

+	person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $90, 0, ClerkScript_0x7100c, -1

+	person_event SPRITE_GENTLEMAN, 9, 17, $2, $11, 255, 255, $80, 0, GentlemanScript_0x71014, -1

+	person_event SPRITE_SAILOR, 8, 7, $2, $11, 255, 255, $90, 0, SailorScript_0x71017, -1

+	person_event SPRITE_TEACHER, 11, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x7101a, -1

--- a/maps/CeladonDeptStore6F.asm

+++ b/maps/CeladonDeptStore6F.asm

@@ -168,5 +168,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 6, 13, $7, $0, 255, 255, $0, 0, SuperNerdScript_0x7117a, -1

+	person_event SPRITE_YOUNGSTER, 9, 16, $2, $12, 255, 255, $80, 0, YoungsterScript_0x7117d, -1

--- a/maps/CeladonGameCorner.asm

+++ b/maps/CeladonGameCorner.asm

@@ -325,12 +325,12 @@

 	; people-events

 	db 9

-	person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, EVENT_ALWAYS_THERE

-	person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 6, 9, $6, $0, 255, 255, $a0, 0, ClerkScript_0x7211d, -1

+	person_event SPRITE_RECEPTIONIST, 6, 7, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x72120, -1

+	person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $80, 0, PokefanMScript_0x72123, -1

+	person_event SPRITE_TEACHER, 11, 21, $9, $0, 255, 255, $90, 0, TeacherScript_0x7212e, -1

+	person_event SPRITE_FISHING_GURU, 11, 15, $9, $0, 255, 255, $a0, 0, FishingGuruScript_0x72139, -1

+	person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 2, $80, 0, FisherScript_0x72144, -1

+	person_event SPRITE_FISHER, 14, 12, $8, $0, 255, 4, $80, 0, FisherScript_0x72144, -1

+	person_event SPRITE_GYM_GUY, 7, 15, $6, $0, 255, 255, $80, 0, CeladonGymGuyScript, -1

+	person_event SPRITE_GRAMPS, 12, 6, $8, $0, 255, 255, $a0, 0, GrampsScript_0x72190, -1

--- a/maps/CeladonGameCornerPrizeRoom.asm

+++ b/maps/CeladonGameCornerPrizeRoom.asm

@@ -284,5 +284,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, EVENT_ALWAYS_THERE

-	person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, EVENT_ALWAYS_THERE

+	person_event SPRITE_GENTLEMAN, 6, 4, $6, $0, 255, 255, $80, 0, GentlemanScript_0x726e9, -1

+	person_event SPRITE_PHARMACIST, 8, 8, $4, $10, 255, 255, $a0, 0, PharmacistScript_0x726ec, -1

--- a/maps/CeladonGym.asm

+++ b/maps/CeladonGym.asm

@@ -358,9 +358,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, EVENT_ALWAYS_THERE

+	person_event SPRITE_ERIKA, 7, 9, $6, $0, 255, 255, $a0, 0, ErikaScript_0x72a6a, -1

+	person_event SPRITE_LASS, 12, 11, $8, $0, 255, 255, $92, 2, TrainerLassMichelle, -1

+	person_event SPRITE_LASS, 12, 6, $9, $0, 255, 255, $a2, 2, TrainerPicnickerTanya, -1

+	person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, -1

+	person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, -1

+	person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, -1

--- a/maps/CeladonMansion1F.asm

+++ b/maps/CeladonMansion1F.asm

@@ -91,7 +91,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, EVENT_ALWAYS_THERE

-	person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, EVENT_ALWAYS_THERE

-	person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, EVENT_ALWAYS_THERE

-	person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRANNY, 9, 5, $3, $0, 255, 255, $0, 0, CeladonMansionManager, -1

+	person_event SPRITE_GROWLITHE, 10, 6, $16, $0, 255, 255, $0, 0, CeladonMansion1FMeowth, -1

+	person_event SPRITE_CLEFAIRY, 8, 7, $16, $0, 255, 255, $0, 0, CeladonMansion1FClefairy, -1

+	person_event SPRITE_GROWLITHE, 8, 8, $16, $2, 255, 255, $90, 0, CeladonMansion1FNidoranF, -1

--- a/maps/CeladonMansion3F.asm

+++ b/maps/CeladonMansion3F.asm

@@ -206,7 +206,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_M, 10, 7, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x71670, -1

+	person_event SPRITE_GYM_GUY, 8, 7, $7, $0, 255, 255, $90, 0, GymGuyScript_0x71696, -1

+	person_event SPRITE_SUPER_NERD, 11, 4, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x716bc, -1

+	person_event SPRITE_FISHER, 8, 4, $7, $2, 255, 255, $80, 0, FisherScript_0x716bf, -1

--- a/maps/CeladonMansionRoof.asm

+++ b/maps/CeladonMansionRoof.asm

@@ -49,4 +49,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 9, 11, $4, $10, 255, 255, $90, 0, FisherScript_0x71a39, -1

--- a/maps/CeladonMansionRoofHouse.asm

+++ b/maps/CeladonMansionRoofHouse.asm

@@ -130,4 +130,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, EVENT_ALWAYS_THERE

+	person_event SPRITE_PHARMACIST, 6, 7, $6, $20, 255, 255, $a0, 0, PharmacistScript_0x71afd, -1

--- a/maps/CeladonPokeCenter1F.asm

+++ b/maps/CeladonPokeCenter1F.asm

@@ -156,8 +156,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, EVENT_ALWAYS_THERE

-	person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x71e22, -1

+	person_event SPRITE_GENTLEMAN, 9, 5, $5, $1, 255, 255, $0, 0, GentlemanScript_0x71e25, -1

+	person_event SPRITE_PHARMACIST, 7, 4, $6, $0, 255, 255, $80, 0, PharmacistScript_0x71e2b, -1

+	person_event SPRITE_COOLTRAINER_F, 10, 12, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x71e28, -1

 	person_event SPRITE_SUPER_NERD, 7, 8, $6, $0, 255, 255, $90, 0, SuperNerdScript_0x71e2e, EVENT_SET_WHEN_FOUGHT_HO_OH

--- a/maps/CeruleanCity.asm

+++ b/maps/CeruleanCity.asm

@@ -300,9 +300,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, EVENT_ALWAYS_THERE

-	person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_M, 27, 19, $2, $22, 255, 255, $90, 0, CooltrainerMScript_0x184009, -1

+	person_event SPRITE_SUPER_NERD, 19, 27, $2, $11, 255, 255, $90, 0, SuperNerdScript_0x18401d, -1

+	person_event SPRITE_SLOWPOKE, 28, 24, $1, $0, 255, 255, $0, 0, CeruleanCitySlowbro, -1

+	person_event SPRITE_COOLTRAINER_F, 28, 25, $8, $0, 255, 255, $a0, 0, CooltrainerFScript_0x18402a, -1

+	person_event SPRITE_FISHER, 30, 34, $5, $1, 255, 255, $80, 0, FisherScript_0x18404a, -1

+	person_event SPRITE_YOUNGSTER, 16, 10, $3, $1, 255, 255, $80, 0, YoungsterScript_0x184064, -1

--- a/maps/CeruleanGymBadgeSpeechHouse.asm

+++ b/maps/CeruleanGymBadgeSpeechHouse.asm

@@ -30,4 +30,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 7, 6, $9, $0, 255, 255, $0, 0, PokefanMScript_0x188002, -1

--- a/maps/CeruleanMart.asm

+++ b/maps/CeruleanMart.asm

@@ -57,6 +57,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x188ac0, -1

+	person_event SPRITE_COOLTRAINER_M, 10, 5, $6, $0, 255, 255, $a0, 0, CooltrainerMScript_0x188ac7, -1

+	person_event SPRITE_COOLTRAINER_F, 6, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x188aca, -1

--- a/maps/CeruleanPokeCenter1F.asm

+++ b/maps/CeruleanPokeCenter1F.asm

@@ -75,6 +75,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18820f, -1

+	person_event SPRITE_SUPER_NERD, 8, 12, $5, $1, 255, 255, $0, 0, SuperNerdScript_0x188212, -1

+	person_event SPRITE_GYM_GUY, 9, 5, $2, $11, 255, 255, $a0, 0, GymGuyScript_0x18821e, -1

--- a/maps/CeruleanPoliceStation.asm

+++ b/maps/CeruleanPoliceStation.asm

@@ -55,6 +55,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, EVENT_ALWAYS_THERE

-	person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHING_GURU, 5, 9, $7, $0, 255, 255, $a0, 0, FishingGuruScript_0x18804a, -1

+	person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $90, 0, PokefanFScript_0x18804d, -1

+	person_event SPRITE_DIGLETT, 9, 7, $16, $0, 255, 255, $b0, 0, DiglettScript_0x188050, -1

--- a/maps/CeruleanTradeSpeechHouse.asm

+++ b/maps/CeruleanTradeSpeechHouse.asm

@@ -64,7 +64,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, EVENT_ALWAYS_THERE

-	person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, EVENT_ALWAYS_THERE

-	person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRANNY, 8, 6, $9, $0, 255, 255, $90, 0, GrannyScript_0x188133, -1

+	person_event SPRITE_GRAMPS, 6, 5, $2, $0, 255, 255, $a0, 0, GrampsScript_0x188136, -1

+	person_event SPRITE_RHYDON, 6, 9, $16, $0, 255, 255, $b0, 0, RhydonScript_0x188139, -1

+	person_event SPRITE_ZUBAT, 10, 9, $16, $0, 255, 255, $0, 0, ZubatScript_0x188143, -1

--- a/maps/CherrygroveCity.asm

+++ b/maps/CherrygroveCity.asm

@@ -572,6 +572,6 @@

 	db 5

 	person_event SPRITE_GRAMPS, 10, 36, $6, $0, 255, 255, $0, 0, CherrygroveCityGuideGent, EVENT_6FE

 	person_event SPRITE_SILVER, 10, 43, $3, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6BE

-	person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 16, 31, $5, $1, 255, 255, $90, 0, TeacherScript_0x19c146, -1

+	person_event SPRITE_YOUNGSTER, 11, 27, $5, $1, 255, 255, $80, 0, YoungsterScript_0x19c15a, -1

+	person_event SPRITE_FISHER, 16, 11, $9, $0, 255, 255, $a0, 0, MysticWaterGuy, -1

--- a/maps/CherrygroveEvolutionSpeechHouse.asm

+++ b/maps/CherrygroveEvolutionSpeechHouse.asm

@@ -56,5 +56,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 9, 7, $8, $0, 255, 255, $a0, 0, LassScript_0x196cb9, -1

+	person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $80, 0, YoungsterScript_0x196cb2, -1

--- a/maps/CherrygroveGymSpeechHouse.asm

+++ b/maps/CherrygroveGymSpeechHouse.asm

@@ -59,5 +59,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, -1

+	person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, -1

--- a/maps/CherrygroveMart.asm

+++ b/maps/CherrygroveMart.asm

@@ -83,6 +83,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x19680a, -1

+	person_event SPRITE_COOLTRAINER_M, 10, 11, $5, $2, 255, 255, $0, 0, CooltrainerMScript_0x19681d, -1

+	person_event SPRITE_YOUNGSTER, 9, 6, $6, $0, 255, 255, $80, 0, YoungsterScript_0x196831, -1

--- a/maps/CherrygrovePokeCenter1F.asm

+++ b/maps/CherrygrovePokeCenter1F.asm

@@ -80,7 +80,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19696d, -1

+	person_event SPRITE_FISHER, 7, 6, $7, $0, 255, 255, $80, 0, FisherScript_0x196970, -1

+	person_event SPRITE_GENTLEMAN, 10, 12, $7, $0, 255, 255, $0, 0, GentlemanScript_0x196973, -1

+	person_event SPRITE_TEACHER, 10, 5, $9, $0, 255, 255, $a0, 0, TeacherScript_0x196976, -1

--- a/maps/CianwoodCity.asm

+++ b/maps/CianwoodCity.asm

@@ -403,15 +403,15 @@

 	; people-events

 	db 12

-	person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, EVENT_ALWAYS_THERE

+	person_event SPRITE_STANDING_YOUNGSTER, 41, 25, $3, $0, 255, 255, $a0, 0, StandingYoungsterScript_0x1a00b3, -1

+	person_event SPRITE_POKEFAN_M, 37, 21, $5, $1, 255, 255, $0, 0, PokefanMScript_0x1a00b6, -1

+	person_event SPRITE_LASS, 46, 18, $4, $20, 255, 255, $0, 0, LassScript_0x1a00b9, -1

+	person_event SPRITE_ROCK, 20, 12, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1

+	person_event SPRITE_ROCK, 21, 13, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1

+	person_event SPRITE_ROCK, 29, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1

+	person_event SPRITE_ROCK, 33, 9, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1

+	person_event SPRITE_ROCK, 31, 14, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1

+	person_event SPRITE_ROCK, 23, 8, $18, $0, 255, 255, $0, 0, CianwoodCityRock, -1

+	person_event SPRITE_POKEFAN_F, 50, 14, $5, $1, 255, 255, $0, 0, PokefanFScript_0x1a0084, -1

 	person_event SPRITE_SUPER_NERD, 25, 15, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_7AD

 	person_event SPRITE_SUICUNE, 18, 14, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY

--- a/maps/CianwoodCityPhotoStudio.asm

+++ b/maps/CianwoodCityPhotoStudio.asm

@@ -62,4 +62,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x9e0e0, -1

--- a/maps/CianwoodGym.asm

+++ b/maps/CianwoodGym.asm

@@ -377,12 +377,12 @@

 	; people-events

 	db 9

-	person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, EVENT_ALWAYS_THERE

-	person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE

-	person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE

-	person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE

-	person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, EVENT_ALWAYS_THERE

+	person_event SPRITE_CHUCK, 5, 8, $6, $0, 255, 255, $b0, 0, ChuckScript_0x9d60f, -1

+	person_event SPRITE_BLACK_BELT, 16, 6, $9, $0, 255, 255, $b2, 3, TrainerBlackbeltYoshi, -1

+	person_event SPRITE_BLACK_BELT, 16, 11, $8, $0, 255, 255, $b2, 3, TrainerBlackbeltLao, -1

+	person_event SPRITE_BLACK_BELT, 13, 7, $9, $0, 255, 255, $b2, 2, TrainerBlackbeltNob, -1

+	person_event SPRITE_BLACK_BELT, 9, 9, $8, $0, 255, 255, $b2, 1, TrainerBlackbeltLung, -1

+	person_event SPRITE_BOULDER, 5, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1

+	person_event SPRITE_BOULDER, 11, 7, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1

+	person_event SPRITE_BOULDER, 11, 8, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1

+	person_event SPRITE_BOULDER, 11, 9, $19, $0, 255, 255, $0, 0, CianwoodGymBoulder, -1

--- a/maps/CianwoodLugiaSpeechHouse.asm

+++ b/maps/CianwoodLugiaSpeechHouse.asm

@@ -75,6 +75,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $0, 0, TeacherScript_0x9e1b0, -1

+	person_event SPRITE_LASS, 9, 10, $5, $1, 255, 255, $a0, 0, LassScript_0x9e1b3, -1

+	person_event SPRITE_TWIN, 6, 4, $7, $0, 255, 255, $90, 0, TwinScript_0x9e1b6, -1

--- a/maps/CianwoodPharmacy.asm

+++ b/maps/CianwoodPharmacy.asm

@@ -90,4 +90,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, EVENT_ALWAYS_THERE

+	person_event SPRITE_PHARMACIST, 7, 6, $6, $0, 255, 255, $80, 0, CianwoodPharmacist, -1

--- a/maps/CianwoodPokeCenter1F.asm

+++ b/maps/CianwoodPokeCenter1F.asm

@@ -143,7 +143,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9dbcf, -1

+	person_event SPRITE_LASS, 9, 5, $4, $10, 255, 255, $a0, 0, LassScript_0x9dbd2, -1

+	person_event SPRITE_GYM_GUY, 7, 9, $6, $0, 255, 255, $80, 0, CianwoodGymGuyScript, -1

+	person_event SPRITE_SUPER_NERD, 10, 12, $5, $1, 255, 255, $90, 0, SuperNerdScript_0x9dbea, -1

--- a/maps/CinnabarPokeCenter1F.asm

+++ b/maps/CinnabarPokeCenter1F.asm

@@ -47,6 +47,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ab32c, -1

+	person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x1ab32f, -1

+	person_event SPRITE_FISHER, 8, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x1ab332, -1

--- a/maps/CopycatsHouse1F.asm

+++ b/maps/CopycatsHouse1F.asm

@@ -85,6 +85,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, EVENT_ALWAYS_THERE

-	person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x18ad13, -1

+	person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $a0, 0, PokefanFScript_0x18ad16, -1

+	person_event SPRITE_CLEFAIRY, 10, 10, $16, $0, 255, 255, $0, 0, ClefairyScript_0x18ad2a, -1

--- a/maps/CopycatsHouse2F.asm

+++ b/maps/CopycatsHouse2F.asm

@@ -374,8 +374,8 @@

 	; people-events

 	db 6

 	person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $80, 0, Copycat, EVENT_6EE

-	person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, EVENT_ALWAYS_THERE

+	person_event SPRITE_MOLTRES, 8, 10, $16, $0, 255, 255, $b0, 0, CopycatsDodrio, -1

 	person_event SPRITE_FAIRY, 5, 10, $6, $0, 255, 255, $80, 0, CopycatsHouse2FDoll, EVENT_773

-	person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, EVENT_ALWAYS_THERE

-	person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, EVENT_ALWAYS_THERE

+	person_event SPRITE_MONSTER, 5, 6, $6, $0, 255, 255, $a0, 0, CopycatsHouse2FDoll, -1

+	person_event SPRITE_BIRD, 5, 11, $6, $0, 255, 255, $90, 0, CopycatsHouse2FDoll, -1

 	person_event SPRITE_COPYCAT, 7, 8, $8, $0, 255, 255, $90, 0, Copycat, EVENT_6EF

--- a/maps/DanceTheatre.asm

+++ b/maps/DanceTheatre.asm

@@ -425,12 +425,12 @@

 	; people-events

 	db 9

-	person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, EVENT_ALWAYS_THERE

-	person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, EVENT_ALWAYS_THERE

-	person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, EVENT_ALWAYS_THERE

-	person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, EVENT_ALWAYS_THERE

-	person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, EVENT_ALWAYS_THERE

-	person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, EVENT_ALWAYS_THERE

+	person_event SPRITE_KIMONO_GIRL, 6, 4, $1e, $0, 255, 255, $a2, 0, TrainerKimono_girlNaoko2, -1

+	person_event SPRITE_KIMONO_GIRL, 5, 6, $a, $0, 255, 255, $92, 0, TrainerKimono_girlSayo, -1

+	person_event SPRITE_KIMONO_GIRL, 6, 10, $3, $0, 255, 255, $82, 0, TrainerKimono_girlZuki, -1

+	person_event SPRITE_KIMONO_GIRL, 5, 13, $a, $0, 255, 255, $92, 0, TrainerKimono_girlKuni, -1

+	person_event SPRITE_KIMONO_GIRL, 6, 15, $1f, $0, 255, 255, $a2, 0, TrainerKimono_girlMiki, -1

+	person_event SPRITE_GENTLEMAN, 14, 11, $7, $0, 255, 255, $0, 0, GentlemanScript_0x994c6, -1

+	person_event SPRITE_RHYDON, 12, 10, $16, $0, 255, 255, $90, 0, RhydonScript_0x9951b, -1

+	person_event SPRITE_COOLTRAINER_M, 14, 14, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x99525, -1

+	person_event SPRITE_GRANNY, 10, 7, $7, $0, 255, 255, $0, 0, GrannyScript_0x99528, -1

--- a/maps/DarkCaveBlackthornEntrance.asm

+++ b/maps/DarkCaveBlackthornEntrance.asm

@@ -73,6 +73,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, EVENT_ALWAYS_THERE

+	person_event SPRITE_PHARMACIST, 7, 11, $3, $0, 255, 255, $0, 0, PharmacistScript_0x18c720, -1

 	person_event SPRITE_POKE_BALL, 28, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73b, EVENT_6A1

 	person_event SPRITE_POKE_BALL, 26, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c73d, EVENT_6A2

--- a/maps/DarkCaveVioletEntrance.asm

+++ b/maps/DarkCaveVioletEntrance.asm

@@ -45,10 +45,10 @@

 	; people-events

 	db 8

 	person_event SPRITE_POKE_BALL, 12, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c68e, EVENT_69E

-	person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, EVENT_ALWAYS_THERE

+	person_event SPRITE_ROCK, 18, 20, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1

+	person_event SPRITE_ROCK, 10, 31, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1

+	person_event SPRITE_ROCK, 18, 11, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1

+	person_event SPRITE_ROCK, 35, 40, $18, $0, 255, 255, $0, 0, DarkCaveVioletEntranceRock, -1

 	person_event SPRITE_POKE_BALL, 26, 40, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c690, EVENT_69F

 	person_event SPRITE_POKE_BALL, 13, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c692, EVENT_6A0

 	person_event SPRITE_POKE_BALL, 32, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c694, EVENT_7CE

--- a/maps/DayCare.asm

+++ b/maps/DayCare.asm

@@ -176,4 +176,4 @@

 	; people-events

 	db 2

 	person_event SPRITE_GRAMPS, 7, 6, $9, $0, 255, 255, $0, 0, GrampsScript_0x62f8f, EVENT_6E5

-	person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRANNY, 7, 9, $8, $0, 255, 255, $80, 0, GrannyScript_0x62fc3, -1

--- a/maps/DiglettsCave.asm

+++ b/maps/DiglettsCave.asm

@@ -43,4 +43,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 35, 7, $6, $0, 255, 255, $0, 0, PokefanMScript_0x74002, -1

--- a/maps/DragonsDenB1F.asm

+++ b/maps/DragonsDenB1F.asm

@@ -489,9 +489,9 @@

 	person_event SPRITE_POKE_BALL, 20, 39, $1, $0, 255, 255, $0, 0, PokeBallScript_0x18c95a, EVENT_6A8

 	person_event SPRITE_CLAIR, 34, 18, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_6D8

 	person_event SPRITE_SILVER, 27, 24, $2, $22, 255, 255, $0, 0, SilverScript_0x18c97e, EVENT_6C6

-	person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_M, 12, 24, $7, $0, 255, 255, $82, 4, TrainerCooltrainermDarin, -1

+	person_event SPRITE_COOLTRAINER_F, 12, 12, $6, $0, 255, 255, $82, 3, TrainerCooltrainerfCara, -1

+	person_event SPRITE_TWIN, 21, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia1, -1

+	person_event SPRITE_TWIN, 22, 8, $9, $0, 255, 255, $82, 1, TrainerTwinsLeaandpia2, -1

 	person_event SPRITE_POKE_BALL, 8, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a1, EVENT_7BF

 	person_event SPRITE_POKE_BALL, 24, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c9a3, EVENT_7C0

--- a/maps/EarlsPokemonAcademy.asm

+++ b/maps/EarlsPokemonAcademy.asm

@@ -426,8 +426,8 @@

 	; people-events

 	db 6

 	person_event SPRITE_FISHER, 6, 8, $6, $0, 255, 255, $a0, 0, AcademyEarl, EVENT_6CB

-	person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, EVENT_ALWAYS_THERE

-	person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, EVENT_ALWAYS_THERE

-	person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 9, 6, $7, $0, 255, 255, $80, 0, YoungsterScript_0x68a83, -1

+	person_event SPRITE_GAMEBOY_KID, 15, 7, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x68a86, -1

+	person_event SPRITE_GAMEBOY_KID, 15, 8, $8, $0, 255, 255, $80, 0, GameboyKidScript_0x68a91, -1

+	person_event SPRITE_YOUNGSTER, 11, 8, $7, $0, 255, 255, $0, 0, YoungsterScript_0x68a9c, -1

+	person_event SPRITE_POKEDEX, 8, 6, $1, $0, 255, 255, $0, 0, AcademyNotebook, -1

--- a/maps/EcruteakCity.asm

+++ b/maps/EcruteakCity.asm

@@ -291,10 +291,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 19, 22, $2, $11, 255, 255, $0, 0, GrampsScript_0x1a4009, -1

+	person_event SPRITE_GRAMPS, 25, 24, $3, $0, 255, 255, $0, 0, GrampsScript_0x1a400c, -1

+	person_event SPRITE_LASS, 33, 25, $5, $2, 255, 255, $90, 0, LassScript_0x1a4012, -1

+	person_event SPRITE_LASS, 13, 7, $7, $0, 255, 255, $0, 0, LassScript_0x1a4015, -1

+	person_event SPRITE_FISHER, 26, 13, $5, $1, 255, 255, $a0, 0, FisherScript_0x1a4029, -1

+	person_event SPRITE_YOUNGSTER, 18, 14, $2, $11, 255, 255, $80, 0, YoungsterScript_0x1a403d, -1

 	person_event SPRITE_GRAMPS, 11, 7, $2, $11, 255, 255, $a0, 0, GrampsScript_0x1a400f, EVENT_7A9

--- a/maps/EcruteakGym.asm

+++ b/maps/EcruteakGym.asm

@@ -493,10 +493,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_MORTY, 5, 9, $6, $0, 255, 255, $b0, 0, MortyScript_0x99d58, -1

+	person_event SPRITE_SAGE, 11, 6, $9, $0, 255, 255, $92, 1, TrainerSageJeffrey, -1

+	person_event SPRITE_SAGE, 17, 7, $9, $0, 255, 255, $92, 3, TrainerSagePing, -1

+	person_event SPRITE_GRANNY, 9, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumMartha, -1

+	person_event SPRITE_GRANNY, 13, 11, $8, $0, 255, 255, $b2, 1, TrainerMediumGrace, -1

+	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, EcruteakGymGuyScript, -1

 	person_event SPRITE_GRAMPS, 18, 8, $6, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_7A8

--- a/maps/EcruteakItemfinderHouse.asm

+++ b/maps/EcruteakItemfinderHouse.asm

@@ -176,5 +176,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_M, 7, 6, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x9a5fb, -1

+	person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x9a620, -1

--- a/maps/EcruteakLugiaSpeechHouse.asm

+++ b/maps/EcruteakLugiaSpeechHouse.asm

@@ -58,5 +58,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 7, 6, $3, $0, 255, 255, $0, 0, GrampsScript_0x99334, -1

+	person_event SPRITE_YOUNGSTER, 8, 9, $8, $0, 255, 255, $0, 0, YoungsterScript_0x99337, -1

--- a/maps/EcruteakMart.asm

+++ b/maps/EcruteakMart.asm

@@ -57,6 +57,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x99c3b, -1

+	person_event SPRITE_SUPER_NERD, 6, 9, $5, $1, 255, 255, $a0, 0, SuperNerdScript_0x99c42, -1

+	person_event SPRITE_GRANNY, 10, 10, $7, $0, 255, 255, $0, 0, GrannyScript_0x99c45, -1

--- a/maps/EcruteakPokeCenter1F.asm

+++ b/maps/EcruteakPokeCenter1F.asm

@@ -219,8 +219,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x98eb0, -1

+	person_event SPRITE_POKEFAN_M, 10, 11, $a, $0, 255, 255, $0, 0, PokefanMScript_0x98eb3, -1

+	person_event SPRITE_COOLTRAINER_F, 8, 5, $3, $0, 255, 255, $0, 0, CooltrainerFScript_0x98ebf, -1

+	person_event SPRITE_GYM_GUY, 5, 11, $6, $0, 255, 255, $a0, 0, GymGuyScript_0x98ec2, -1

 	person_event SPRITE_BILL, 11, 4, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_713

--- a/maps/ElmsHouse.asm

+++ b/maps/ElmsHouse.asm

@@ -99,5 +99,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 9, 5, $4, $10, 255, 255, $a0, 0, ElmsWife, -1

+	person_event SPRITE_BUG_CATCHER, 8, 9, $7, $0, 255, 255, $0, 0, ElmsSon, -1

--- a/maps/ElmsLab.asm

+++ b/maps/ElmsLab.asm

@@ -1408,7 +1408,7 @@

 	; people-events

 	db 6

-	person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_ELM, 6, 9, $6, $0, 255, 255, $0, 0, ProfElmScript, -1

 	person_event SPRITE_SCIENTIST, 13, 6, $3, $0, 255, 255, $90, 0, ElmsAideScript, EVENT_ELMS_AIDE_IN_LAB

 	person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $0, 0, CyndaquilPokeBallScript, EVENT_640

 	person_event SPRITE_POKE_BALL, 7, 11, $1, $0, 255, 255, $0, 0, TotodilePokeBallScript, EVENT_641

--- a/maps/FastShip1F.asm

+++ b/maps/FastShip1F.asm

@@ -310,7 +310,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 6, 29, $6, $0, 255, 255, $0, 0, SailorScript_0x75160, -1

+	person_event SPRITE_SAILOR, 11, 18, $9, $0, 255, 255, $0, 0, SailorScript_0x751d0, -1

+	person_event SPRITE_SAILOR, 21, 26, $5, $2, 255, 255, $0, 0, SailorScript_0x751e4, -1

 	person_event SPRITE_GENTLEMAN, 10, 23, $9, $0, 255, 255, $0, 0, ObjectEvent, EVENT_72C

--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm

+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm

@@ -583,7 +583,7 @@

 	; people-events

 	db 11

-	person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, EVENT_ALWAYS_THERE

+	person_event SPRITE_CAPTAIN, 29, 7, $6, $0, 255, 255, $90, 0, CaptainScript_0x75ea7, -1

 	person_event SPRITE_GENTLEMAN, 21, 6, $9, $0, 255, 255, $90, 0, GentlemanScript_0x75f1f, EVENT_730

 	person_event SPRITE_TWIN, 21, 7, $a, $0, 255, 255, $0, 0, TwinScript_0x75f6d, EVENT_731

 	person_event SPRITE_TWIN, 29, 6, $a, $0, 255, 255, $0, 0, TwinScript_0x75ebb, EVENT_732

--- a/maps/FightingDojo.asm

+++ b/maps/FightingDojo.asm

@@ -57,5 +57,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, EVENT_ALWAYS_THERE

+	person_event SPRITE_BLACK_BELT, 8, 8, $6, $0, 255, 255, $90, 0, BlackBeltScript_0x189b61, -1

 	person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x189b6a, EVENT_PICKED_UP_FOCUS_BAND

--- a/maps/FuchsiaBillSpeechHouse.asm

+++ b/maps/FuchsiaBillSpeechHouse.asm

@@ -40,5 +40,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_F, 7, 6, $9, $0, 255, 255, $80, 0, PokefanFScript_0x1963bd, -1

+	person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $0, 0, YoungsterScript_0x1963c0, -1

--- a/maps/FuchsiaCity.asm

+++ b/maps/FuchsiaCity.asm

@@ -154,7 +154,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 22, 27, $2, $11, 255, 255, $a0, 0, YoungsterScript_0x194b22, -1

+	person_event SPRITE_POKEFAN_M, 12, 17, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x194b25, -1

+	person_event SPRITE_TEACHER, 18, 20, $2, $11, 255, 255, $80, 0, TeacherScript_0x194b28, -1

+	person_event SPRITE_FRUIT_TREE, 5, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194b43, -1

--- a/maps/FuchsiaGym.asm

+++ b/maps/FuchsiaGym.asm

@@ -391,9 +391,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, EVENT_ALWAYS_THERE

-	person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, EVENT_ALWAYS_THERE

-	person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, EVENT_ALWAYS_THERE

-	person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, EVENT_ALWAYS_THERE

-	person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_JANINE, 14, 5, $3, $0, 255, 255, $90, 0, JanineScript_0x195db9, -1

+	person_event SPRITE_FUSCHIA_GYM_1, 11, 9, $a, $0, 255, 255, $90, 0, FuschiaGym1Script_0x195e1b, -1

+	person_event SPRITE_FUSCHIA_GYM_2, 15, 9, $a, $0, 255, 255, $90, 0, FuschiaGym2Script_0x195e55, -1

+	person_event SPRITE_FUSCHIA_GYM_3, 8, 13, $a, $0, 255, 255, $90, 0, FuschiaGym3Script_0x195e8f, -1

+	person_event SPRITE_FUSCHIA_GYM_4, 6, 8, $a, $0, 255, 255, $90, 0, FuschiaGym4Script_0x195ec9, -1

+	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 0, FuchsiaGymGuyScript, -1

--- a/maps/FuchsiaMart.asm

+++ b/maps/FuchsiaMart.asm

@@ -49,6 +49,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x195ce8, -1

+	person_event SPRITE_FISHER, 6, 7, $8, $0, 255, 255, $80, 0, FisherScript_0x195cef, -1

+	person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x195cf2, -1

--- a/maps/FuchsiaPokeCenter1F.asm

+++ b/maps/FuchsiaPokeCenter1F.asm

@@ -102,7 +102,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, EVENT_ALWAYS_THERE

-	person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $a0, 0, NurseScript_0x196459, -1

+	person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $0, 0, CooltrainerMScript_0x19645c, -1

+	person_event SPRITE_COOLTRAINER_F, 8, 5, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x19645f, -1

+	person_event SPRITE_JANINE_IMPERSONATOR, 7, 9, $6, $0, 255, 255, $90, 0, JanineImpersonatorScript_0x196462, -1

--- a/maps/GoldenrodBikeShop.asm

+++ b/maps/GoldenrodBikeShop.asm

@@ -125,4 +125,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 6, 11, $8, $0, 255, 255, $80, 0, ClerkScript_0x54750, -1

--- a/maps/GoldenrodBillsHouse.asm

+++ b/maps/GoldenrodBillsHouse.asm

@@ -258,5 +258,5 @@

 	; people-events

 	db 3

 	person_event SPRITE_BILL, 7, 6, $9, $0, 255, 255, $0, 0, BillsHouseBill, EVENT_MET_BILL

-	person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_F, 7, 9, $6, $0, 255, 255, $0, 0, BillsMom, -1

+	person_event SPRITE_TWIN, 8, 9, $2, $11, 255, 255, $a0, 0, BillsSister, -1

--- a/maps/GoldenrodDeptStore1F.asm

+++ b/maps/GoldenrodDeptStore1F.asm

@@ -93,7 +93,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 5, 14, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x55981, -1

+	person_event SPRITE_POKEFAN_F, 8, 9, $6, $0, 255, 255, $0, 0, PokefanFScript_0x55987, -1

+	person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $a0, 0, BugCatcherScript_0x5598a, -1

+	person_event SPRITE_GENTLEMAN, 9, 15, $2, $11, 255, 255, $0, 0, GentlemanScript_0x55984, -1

--- a/maps/GoldenrodDeptStore2F.asm

+++ b/maps/GoldenrodDeptStore2F.asm

@@ -113,8 +113,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, EVENT_ALWAYS_THERE

-	person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55b5d, -1

+	person_event SPRITE_CLERK, 10, 17, $8, $0, 255, 255, $0, 0, ClerkScript_0x55b65, -1

+	person_event SPRITE_YOUNGSTER, 10, 13, $4, $10, 255, 255, $0, 0, YoungsterScript_0x55b6d, -1

+	person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x55b70, -1

+	person_event SPRITE_GENTLEMAN, 10, 6, $3, $0, 255, 255, $0, 0, GentlemanScript_0x55b73, -1

--- a/maps/GoldenrodDeptStore3F.asm

+++ b/maps/GoldenrodDeptStore3F.asm

@@ -71,6 +71,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 5, 10, $6, $0, 255, 255, $0, 0, ClerkScript_0x55db8, -1

+	person_event SPRITE_SUPER_NERD, 9, 16, $a, $10, 255, 255, $80, 0, SuperNerdScript_0x55dc0, -1

+	person_event SPRITE_ROCKER, 9, 6, $4, $10, 255, 255, $0, 0, RockerScript_0x55dc3, -1

--- a/maps/GoldenrodDeptStore4F.asm

+++ b/maps/GoldenrodDeptStore4F.asm

@@ -91,7 +91,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, EVENT_ALWAYS_THERE

-	person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 9, 17, $7, $0, 255, 255, $0, 0, ClerkScript_0x55ee9, -1

+	person_event SPRITE_COOLTRAINER_M, 11, 15, $9, $0, 255, 255, $0, 0, CooltrainerMScript_0x55ef1, -1

+	person_event SPRITE_BUG_CATCHER, 6, 11, $5, $1, 255, 255, $0, 0, BugCatcherScript_0x55ef4, -1

+	person_event SPRITE_GAMEBOY_KID, 5, 9, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x55ef7, -1

--- a/maps/GoldenrodDeptStore5F.asm

+++ b/maps/GoldenrodDeptStore5F.asm

@@ -232,9 +232,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 9, 12, $7, $0, 255, 255, $0, 0, ClerkScript_0x5609c, -1

+	person_event SPRITE_LASS, 10, 7, $2, $11, 255, 255, $0, 0, LassScript_0x56130, -1

+	person_event SPRITE_COOLTRAINER_M, 7, 10, $3, $0, 255, 255, $0, 0, CooltrainerMScript_0x56133, -1

+	person_event SPRITE_POKEFAN_M, 9, 17, $2, $22, 255, 255, $0, 0, PokefanMScript_0x5613a, -1

+	person_event SPRITE_TWIN, 5, 13, $6, $0, 255, 255, $a0, 0, TwinScript_0x56118, -1

 	person_event SPRITE_RECEPTIONIST, 9, 11, $7, $0, 255, 255, $80, 0, ReceptionistScript_0x560ce, EVENT_763

--- a/maps/GoldenrodDeptStore6F.asm

+++ b/maps/GoldenrodDeptStore6F.asm

@@ -169,5 +169,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 6, 14, $5, $1, 255, 255, $a0, 0, LassScript_0x564bf, -1

+	person_event SPRITE_SUPER_NERD, 6, 12, $7, $0, 255, 255, $80, 0, SuperNerdScript_0x564c2, -1

--- a/maps/GoldenrodDeptStoreB1F.asm

+++ b/maps/GoldenrodDeptStoreB1F.asm

@@ -125,7 +125,7 @@

 	person_event SPRITE_POKE_BALL, 6, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c5, EVENT_676

 	person_event SPRITE_POKE_BALL, 7, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c7, EVENT_677

 	person_event SPRITE_POKE_BALL, 19, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d7c9, EVENT_678

-	person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, EVENT_ALWAYS_THERE

-	person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, EVENT_ALWAYS_THERE

+	person_event SPRITE_BLACK_BELT, 14, 13, $4, $10, 255, 255, $a0, 0, BlackBeltScript_0x7d7b0, -1

+	person_event SPRITE_BLACK_BELT, 12, 8, $3, $0, 255, 255, $80, 0, BlackBeltScript_0x7d7b3, -1

+	person_event SPRITE_BLACK_BELT, 17, 10, $5, $1, 255, 255, $90, 0, BlackBeltScript_0x7d7b6, -1

+	person_event SPRITE_MACHOP, 11, 11, $16, $0, 255, 255, $90, 0, MachopScript_0x7d7b9, -1

--- a/maps/GoldenrodDeptStoreRoof.asm

+++ b/maps/GoldenrodDeptStoreRoof.asm

@@ -226,8 +226,8 @@

 	; people-events

 	db 8

 	person_event SPRITE_CLERK, 8, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x5673f, EVENT_6F0

-	person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_F, 7, 14, $5, $1, 255, 255, $80, 0, PokefanFScript_0x56746, -1

+	person_event SPRITE_FISHER, 5, 6, $7, $0, 255, 255, $90, 0, FisherScript_0x56749, -1

 	person_event SPRITE_TWIN, 8, 7, $2, $11, 255, 255, $a0, 0, TwinScript_0x56754, EVENT_6F1

 	person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x56757, EVENT_6F1

 	person_event SPRITE_POKEFAN_M, 4, 11, $5, $1, 255, 255, $0, 0, PokefanMScript_0x5676a, EVENT_6F0

--- a/maps/GoldenrodFlowerShop.asm

+++ b/maps/GoldenrodFlowerShop.asm

@@ -172,5 +172,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 8, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x5535d, -1

 	person_event SPRITE_LASS, 10, 9, $2, $11, 255, 255, $90, 0, LassScript_0x553a2, EVENT_768

--- a/maps/GoldenrodGameCorner.asm

+++ b/maps/GoldenrodGameCorner.asm

@@ -479,15 +479,15 @@

 	; people-events

 	db 12

-	person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, EVENT_ALWAYS_THERE

-	person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, EVENT_ALWAYS_THERE

-	person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, EVENT_ALWAYS_THERE

-	person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, EVENT_ALWAYS_THERE

-	person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 6, 7, $6, $0, 255, 255, $80, 0, ClerkScript_0x56c25, -1

+	person_event SPRITE_RECEPTIONIST, 6, 20, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56c28, -1

+	person_event SPRITE_RECEPTIONIST, 6, 22, $6, $0, 255, 255, $80, 0, ReceptionistScript_0x56d01, -1

+	person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 2, $90, 0, PharmacistScript_0x56df1, -1

+	person_event SPRITE_PHARMACIST, 11, 12, $8, $0, 255, 4, $90, 0, PharmacistScript_0x56df1, -1

+	person_event SPRITE_POKEFAN_M, 14, 15, $9, $0, 255, 255, $b0, 0, PokefanMScript_0x56dfc, -1

+	person_event SPRITE_COOLTRAINER_M, 12, 18, $8, $0, 255, 255, $90, 0, CooltrainerMScript_0x56e07, -1

+	person_event SPRITE_POKEFAN_F, 10, 21, $9, $0, 255, 255, $80, 0, PokefanFScript_0x56e12, -1

+	person_event SPRITE_COOLTRAINER_F, 7, 14, $2, $12, 255, 255, $a0, 0, CooltrainerFScript_0x56e1d, -1

+	person_event SPRITE_GENTLEMAN, 14, 9, $9, $0, 255, 255, $90, 0, GentlemanScript_0x56e20, -1

+	person_event SPRITE_POKEFAN_M, 13, 6, $2, $11, 255, 255, $b0, 0, PokefanMScript_0x56e2b, -1

 	person_event SPRITE_POKEFAN_M, 14, 21, $9, $0, 255, 255, $80, 0, PokefanMScript_0x56c1a, EVENT_76B

--- a/maps/GoldenrodGym.asm

+++ b/maps/GoldenrodGym.asm

@@ -457,9 +457,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_WHITNEY, 7, 12, $6, $0, 255, 255, $80, 0, WhitneyScript_0x5400c, -1

+	person_event SPRITE_LASS, 17, 13, $9, $0, 255, 255, $92, 4, TrainerLassCarrie, -1

+	person_event SPRITE_LASS, 10, 13, $8, $0, 255, 255, $92, 1, TrainerLassBridget, -1

+	person_event SPRITE_BUENA, 6, 4, $6, $0, 255, 255, $92, 3, TrainerBeautyVictoria, -1

+	person_event SPRITE_BUENA, 9, 23, $6, $0, 255, 255, $92, 3, TrainerBeautySamantha, -1

+	person_event SPRITE_GYM_GUY, 19, 9, $6, $0, 255, 255, $80, 0, GoldenrodGymGuyScript, -1

--- a/maps/GoldenrodHappinessRater.asm

+++ b/maps/GoldenrodHappinessRater.asm

@@ -151,6 +151,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 8, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x54953, -1

+	person_event SPRITE_POKEFAN_M, 7, 9, $8, $0, 255, 255, $0, 0, PokefanMScript_0x54997, -1

+	person_event SPRITE_TWIN, 10, 9, $5, $1, 255, 255, $a0, 0, TwinScript_0x5499a, -1

--- a/maps/GoldenrodMagnetTrainStation.asm

+++ b/maps/GoldenrodMagnetTrainStation.asm

@@ -182,5 +182,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x550ec, -1

 	person_event SPRITE_GENTLEMAN, 18, 15, $2, $22, 255, 255, $0, 0, GentlemanScript_0x55143, EVENT_749

--- a/maps/GoldenrodNameRatersHouse.asm

+++ b/maps/GoldenrodNameRatersHouse.asm

@@ -41,4 +41,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, EVENT_ALWAYS_THERE

+	person_event SPRITE_GENTLEMAN, 8, 6, $6, $2, 255, 255, $0, 0, GentlemanScript_0x5577c, -1

--- a/maps/GoldenrodPPSpeechHouse.asm

+++ b/maps/GoldenrodPPSpeechHouse.asm

@@ -67,5 +67,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, -1

+	person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, -1

--- a/maps/GoldenrodPokeCenter1F.asm

+++ b/maps/GoldenrodPokeCenter1F.asm

@@ -818,8 +818,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, EVENT_ALWAYS_THERE

-	person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, EVENT_ALWAYS_THERE

-	person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x60f91, -1

+	person_event SPRITE_LINK_RECEPTIONIST, 12, 20, $6, $0, 255, 255, $90, 0, ObjectEvent, -1

+	person_event SPRITE_GAMEBOY_KID, 5, 10, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x6101e, -1

+	person_event SPRITE_LASS, 8, 5, $5, $1, 255, 255, $0, 0, LassScript_0x61021, -1

+	person_event SPRITE_POKEFAN_F, 9, 11, $6, $0, 255, 255, $b0, 0, PokefanFScript_0x61024, -1

--- a/maps/GoldenrodPokeComCenter2FMobile.asm

+++ b/maps/GoldenrodPokeComCenter2FMobile.asm

@@ -283,6 +283,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, EVENT_ALWAYS_THERE

-	person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, EVENT_ALWAYS_THERE

-	person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, EVENT_ALWAYS_THERE

+	person_event SPRITE_SCIENTIST, 32, 8, $4, $10, 255, 255, $80, 0, ScientistScript_0x625d1, -1

+	person_event SPRITE_SCIENTIST, 31, 11, $7, $0, 255, 255, $90, 0, ScientistScript_0x625d4, -1

+	person_event SPRITE_SCIENTIST, 33, 11, $7, $0, 255, 255, $a0, 0, ScientistScript_0x625d7, -1

--- a/maps/HallOfFame.asm

+++ b/maps/HallOfFame.asm

@@ -126,4 +126,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_ALWAYS_THERE

+	person_event SPRITE_LANCE, 16, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, -1

--- a/maps/IcePathB3F.asm

+++ b/maps/IcePathB3F.asm

@@ -29,4 +29,4 @@

 	; people-events

 	db 2

 	person_event SPRITE_POKE_BALL, 11, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e66f, EVENT_68E

-	person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, EVENT_ALWAYS_THERE

+	person_event SPRITE_ROCK, 10, 10, $18, $0, 255, 255, $0, 0, IcePathB3FRock, -1

--- a/maps/IlexForest.asm

+++ b/maps/IlexForest.asm

@@ -972,11 +972,11 @@

 	person_event SPRITE_BIRD, 35, 18, $3, $0, 255, 255, $b0, 0, BirdScript_0x6eb8f, EVENT_6E9

 	person_event SPRITE_YOUNGSTER, 32, 11, $6, $0, 255, 255, $a0, 0, YoungsterScript_0x6eb7b, EVENT_6F3

 	person_event SPRITE_BLACK_BELT, 32, 9, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x6edae, EVENT_6F4

-	person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, EVENT_ALWAYS_THERE

+	person_event SPRITE_ROCKER, 18, 19, $9, $0, 255, 255, $0, 0, RockerScript_0x6edde, -1

 	person_event SPRITE_POKE_BALL, 36, 24, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee10, EVENT_671

 	person_event SPRITE_KURT, 33, 12, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_7A5

 	person_event SPRITE_LASS, 28, 7, $9, $0, 255, 255, $a0, 0, LassScript_0x6ee0d, EVENT_6ED

-	person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 5, 16, $7, $0, 255, 255, $a2, 0, TrainerBug_catcherWayne, -1

 	person_event SPRITE_POKE_BALL, 21, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee12, EVENT_7B9

 	person_event SPRITE_POKE_BALL, 11, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee14, EVENT_7BA

 	person_event SPRITE_POKE_BALL, 5, 31, $1, $0, 255, 255, $1, 0, ItemFragment_0x6ee16, EVENT_7BB

--- a/maps/IlexForestAzaleaGate.asm

+++ b/maps/IlexForestAzaleaGate.asm

@@ -45,5 +45,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x62c7a, -1

+	person_event SPRITE_GRANNY, 7, 5, $6, $0, 255, 255, $b0, 0, GrannyScript_0x62c7d, -1

--- a/maps/IndigoPlateauPokeCenter1F.asm

+++ b/maps/IndigoPlateauPokeCenter1F.asm

@@ -319,9 +319,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, EVENT_ALWAYS_THERE

-	person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 11, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18012c, -1

+	person_event SPRITE_CLERK, 11, 15, $6, $0, 255, 255, $0, 0, ClerkScript_0x18012f, -1

+	person_event SPRITE_COOLTRAINER_M, 15, 15, $2, $22, 255, 255, $0, 0, CooltrainerMScript_0x180136, -1

 	person_event SPRITE_SILVER, 13, 20, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_77B

 	person_event SPRITE_GRAMPS, 13, 5, $6, $0, 255, 255, $90, 0, TeleportGuyScript, EVENT_TELEPORT_GUY

 	person_event SPRITE_JYNX, 13, 4, $16, $0, 255, 255, $b0, 0, AbraScript, EVENT_TELEPORT_GUY

--- a/maps/KarensRoom.asm

+++ b/maps/KarensRoom.asm

@@ -153,4 +153,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, EVENT_ALWAYS_THERE

+	person_event SPRITE_KAREN, 11, 9, $6, $0, 255, 255, $80, 0, KarenScript_0x180bee, -1

--- a/maps/KogasRoom.asm

+++ b/maps/KogasRoom.asm

@@ -150,4 +150,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, EVENT_ALWAYS_THERE

+	person_event SPRITE_KOGA, 11, 9, $6, $0, 255, 255, $90, 0, KogaScript_0x18075a, -1

--- a/maps/KrissNeighborsHouse.asm

+++ b/maps/KrissNeighborsHouse.asm

@@ -114,5 +114,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_F, 7, 6, $9, $0, 255, 255, $80, 0, KrissNeighborsDaughter, -1

 	person_event SPRITE_POKEFAN_F, 7, 9, $8, $0, 255, 255, $80, 0, KrissNeighbor, EVENT_793

--- a/maps/LakeofRage.asm

+++ b/maps/LakeofRage.asm

@@ -577,9 +577,9 @@

 	; people-events

 	db 12

 	person_event SPRITE_LANCE, 32, 25, $7, $0, 255, 255, $0, 0, LanceScript_0x70022, EVENT_6D4

-	person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 30, 24, $7, $0, 255, 255, $0, 0, GrampsScript_0x7008e, -1

+	person_event SPRITE_SUPER_NERD, 17, 40, $8, $0, 255, 255, $0, 0, SuperNerdScript_0x700a2, -1

+	person_event SPRITE_COOLTRAINER_F, 33, 29, $5, $1, 255, 255, $0, 0, CooltrainerFScript_0x700a5, -1

 	person_event SPRITE_FISHER, 27, 34, $8, $0, 255, 255, $92, 1, TrainerFisherAndre, EVENT_735

 	person_event SPRITE_FISHER, 30, 28, $7, $0, 255, 255, $92, 1, TrainerFisherRaymond, EVENT_735

 	person_event SPRITE_COOLTRAINER_M, 19, 8, $9, $0, 255, 255, $82, 1, TrainerCooltrainermAaron, EVENT_735

--- a/maps/LakeofRageHiddenPowerHouse.asm

+++ b/maps/LakeofRageHiddenPowerHouse.asm

@@ -83,4 +83,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 7, 6, $3, $0, 255, 255, $0, 0, HiddenPowerGuy, -1

--- a/maps/LakeofRageMagikarpHouse.asm

+++ b/maps/LakeofRageMagikarpHouse.asm

@@ -221,4 +221,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $0, 0, FishingGuruScript_0x19a6ae, -1

--- a/maps/LancesRoom.asm

+++ b/maps/LancesRoom.asm

@@ -358,6 +358,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, EVENT_ALWAYS_THERE

+	person_event SPRITE_LANCE, 7, 9, $6, $0, 255, 255, $0, 0, LanceScript_0x180e7b, -1

 	person_event SPRITE_TEACHER, 11, 8, $7, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_75F

 	person_event SPRITE_OAK, 11, 8, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_75F

--- a/maps/LavRadioTower1F.asm

+++ b/maps/LavRadioTower1F.asm

@@ -233,8 +233,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, EVENT_ALWAYS_THERE

-	person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 10, 10, $7, $0, 255, 255, $a0, 0, ReceptionistScript_0x7ee63, -1

+	person_event SPRITE_OFFICER, 5, 19, $6, $0, 255, 255, $a0, 0, OfficerScript_0x7ee66, -1

+	person_event SPRITE_SUPER_NERD, 7, 5, $2, $11, 255, 255, $80, 0, SuperNerdScript_0x7ee69, -1

+	person_event SPRITE_GENTLEMAN, 5, 13, $7, $0, 255, 255, $0, 0, GentlemanScript_0x7ee6c, -1

+	person_event SPRITE_SUPER_NERD, 10, 18, $9, $0, 255, 255, $0, 0, SuperNerdScript_0x7eea2, -1

--- a/maps/LavenderMart.asm

+++ b/maps/LavenderMart.asm

@@ -59,6 +59,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x7eb1c, -1

+	person_event SPRITE_POKEFAN_M, 10, 10, $5, $2, 255, 255, $80, 0, PokefanMScript_0x7eb23, -1

+	person_event SPRITE_ROCKER, 6, 13, $3, $0, 255, 255, $0, 0, RockerScript_0x7eb26, -1

--- a/maps/LavenderNameRater.asm

+++ b/maps/LavenderNameRater.asm

@@ -40,4 +40,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, EVENT_ALWAYS_THERE

+	person_event SPRITE_GENTLEMAN, 7, 6, $6, $0, 255, 255, $80, 0, LavenderNameRater, -1

--- a/maps/LavenderPokeCenter1F.asm

+++ b/maps/LavenderPokeCenter1F.asm

@@ -92,7 +92,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x7e6a0, -1

+	person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $0, 0, GentlemanScript_0x7e6a3, -1

+	person_event SPRITE_TEACHER, 7, 9, $6, $0, 255, 255, $a0, 0, TeacherScript_0x7e6a6, -1

+	person_event SPRITE_YOUNGSTER, 9, 5, $4, $10, 255, 255, $80, 0, YoungsterScript_0x7e6a9, -1

--- a/maps/LavenderTown.asm

+++ b/maps/LavenderTown.asm

@@ -129,7 +129,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 11, 16, $5, $1, 255, 255, $80, 0, PokefanMScript_0x1ad6e4, -1

+	person_event SPRITE_TEACHER, 19, 6, $5, $1, 255, 255, $90, 0, TeacherScript_0x1ad6e7, -1

+	person_event SPRITE_GRAMPS, 16, 18, $7, $0, 255, 255, $0, 0, GrampsScript_0x1ad6ea, -1

+	person_event SPRITE_YOUNGSTER, 15, 10, $5, $1, 255, 255, $a0, 1, YoungsterScript_0x1ad6ed, -1

--- a/maps/LavenderTownSpeechHouse.asm

+++ b/maps/LavenderTownSpeechHouse.asm

@@ -44,4 +44,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_F, 7, 6, $7, $0, 255, 255, $90, 0, PokefanFScript_0x7ea47, -1

--- a/maps/MahoganyGym.asm

+++ b/maps/MahoganyGym.asm

@@ -462,10 +462,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_PRYCE, 7, 9, $6, $0, 255, 255, $b0, 0, PryceScript_0x199a9e, -1

+	person_event SPRITE_BUENA, 10, 8, $6, $0, 255, 255, $82, 1, TrainerSkierRoxanne, -1

+	person_event SPRITE_ROCKER, 21, 4, $7, $0, 255, 255, $92, 1, TrainerBoarderRonald, -1

+	person_event SPRITE_BUENA, 21, 13, $7, $0, 255, 255, $82, 1, TrainerSkierClarissa, -1

+	person_event SPRITE_ROCKER, 13, 9, $6, $0, 255, 255, $92, 1, TrainerBoarderBrad, -1

+	person_event SPRITE_ROCKER, 8, 6, $a, $0, 255, 255, $92, 1, TrainerBoarderDouglas, -1

+	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $80, 0, MahoganyGymGuyScript, -1

--- a/maps/MahoganyPokeCenter1F.asm

+++ b/maps/MahoganyPokeCenter1F.asm

@@ -65,7 +65,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x19a356, -1

+	person_event SPRITE_POKEFAN_M, 6, 11, $2, $11, 255, 255, $80, 0, PokefanMScript_0x19a359, -1

+	person_event SPRITE_YOUNGSTER, 7, 5, $9, $0, 255, 255, $a0, 0, YoungsterScript_0x19a35c, -1

+	person_event SPRITE_COOLTRAINER_F, 7, 6, $8, $0, 255, 255, $0, 0, CooltrainerFScript_0x19a35f, -1

--- a/maps/MahoganyRedGyaradosSpeechHouse.asm

+++ b/maps/MahoganyRedGyaradosSpeechHouse.asm

@@ -73,5 +73,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, EVENT_ALWAYS_THERE

+	person_event SPRITE_BLACK_BELT, 7, 6, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x19997f, -1

+	person_event SPRITE_TEACHER, 9, 10, $4, $10, 255, 255, $90, 0, TeacherScript_0x199982, -1

--- a/maps/MahoganyTown.asm

+++ b/maps/MahoganyTown.asm

@@ -269,6 +269,6 @@

 	; people-events

 	db 4

 	person_event SPRITE_POKEFAN_M, 12, 23, $6, $0, 255, 255, $0, 0, PokefanMScript_0x19002e, EVENT_756

-	person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 13, 10, $5, $1, 255, 255, $0, 0, GrampsScript_0x19007e, -1

 	person_event SPRITE_FISHER, 18, 10, $6, $0, 255, 255, $a0, 0, FisherScript_0x190092, EVENT_757

 	person_event SPRITE_LASS, 12, 16, $6, $0, 255, 255, $0, 0, LassScript_0x190095, EVENT_736

--- a/maps/ManiasHouse.asm

+++ b/maps/ManiasHouse.asm

@@ -212,4 +212,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, EVENT_ALWAYS_THERE

+	person_event SPRITE_ROCKER, 8, 6, $3, $0, 255, 255, $0, 0, RockerScript_0x9d278, -1

--- a/maps/MountMoonGiftShop.asm

+++ b/maps/MountMoonGiftShop.asm

@@ -38,7 +38,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 7, 8, $6, $0, 255, 1, $0, 0, GrampsScript_0x771a8, -1

+	person_event SPRITE_GRAMPS, 6, 5, $9, $0, 255, 2, $0, 0, GrampsScript_0x771a8, -1

+	person_event SPRITE_LASS, 10, 5, $5, $1, 255, 1, $0, 0, LassScript_0x771b0, -1

+	person_event SPRITE_LASS, 8, 9, $4, $10, 255, 2, $0, 0, LassScript_0x771b0, -1

--- a/maps/MountMortar1FInside.asm

+++ b/maps/MountMortar1FInside.asm

@@ -160,13 +160,13 @@

 	; people-events

 	db 10

-	person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, EVENT_ALWAYS_THERE

+	person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, -1

 	person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, EVENT_67D

 	person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, EVENT_67E

 	person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, EVENT_67F

 	person_event SPRITE_POKE_BALL, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, EVENT_7A6

 	person_event SPRITE_POKE_BALL, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, EVENT_7A7

-	person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, -1

+	person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, -1

 	person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, EVENT_7C8

 	person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, EVENT_7C9

--- a/maps/MountMortar2FInside.asm

+++ b/maps/MountMortar2FInside.asm

@@ -99,4 +99,4 @@

 	person_event SPRITE_POKE_BALL, 9, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e4, EVENT_683

 	person_event SPRITE_POKE_BALL, 15, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e6, EVENT_684

 	person_event SPRITE_POKE_BALL, 9, 32, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e0e8, EVENT_685

-	person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 30, 17, $a, $0, 255, 255, $b2, 2, TrainerSupernerdHugh, -1

--- a/maps/MountMortarB1F.asm

+++ b/maps/MountMortarB1F.asm

@@ -147,8 +147,8 @@

 	db 7

 	person_event SPRITE_POKE_BALL, 16, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e240, EVENT_686

 	person_event SPRITE_POKE_BALL, 20, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e242, EVENT_687

-	person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, EVENT_ALWAYS_THERE

+	person_event SPRITE_BOULDER, 14, 13, $19, $0, 255, 255, $0, 0, MountMortarB1FBoulder, -1

+	person_event SPRITE_BLACK_BELT, 8, 20, $6, $0, 255, 255, $b0, 0, BlackBeltScript_0x7e1f6, -1

 	person_event SPRITE_POKE_BALL, 28, 38, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e244, EVENT_7CA

 	person_event SPRITE_POKE_BALL, 7, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e246, EVENT_7CB

 	person_event SPRITE_POKE_BALL, 30, 25, $1, $0, 255, 255, $1, 0, ItemFragment_0x7e248, EVENT_7CC

--- a/maps/MoveDeletersHouse.asm

+++ b/maps/MoveDeletersHouse.asm

@@ -35,4 +35,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $0, 0, MoveDeleter, -1

--- a/maps/MrFujisHouse.asm

+++ b/maps/MrFujisHouse.asm

@@ -91,8 +91,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, EVENT_ALWAYS_THERE

-	person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, EVENT_ALWAYS_THERE

-	person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, EVENT_ALWAYS_THERE

-	person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 5, 8, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x7e8ca, -1

+	person_event SPRITE_LASS, 8, 7, $2, $11, 255, 255, $0, 0, LassScript_0x7e8cd, -1

+	person_event SPRITE_RHYDON, 8, 11, $16, $0, 255, 255, $0, 0, MrFujisPsyduck, -1

+	person_event SPRITE_GROWLITHE, 9, 9, $16, $0, 255, 255, $90, 0, MrFujisNidorino, -1

+	person_event SPRITE_MOLTRES, 7, 5, $16, $0, 255, 255, $b0, 0, MrFujisPidgey, -1

--- a/maps/MrPokemonsHouse.asm

+++ b/maps/MrPokemonsHouse.asm

@@ -392,5 +392,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, EVENT_ALWAYS_THERE

+	person_event SPRITE_GENTLEMAN, 9, 7, $9, $0, 255, 255, $0, 0, GentlemanScript_0x196e97, -1

 	person_event SPRITE_OAK, 9, 10, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C9

--- a/maps/MrPsychicsHouse.asm

+++ b/maps/MrPsychicsHouse.asm

@@ -63,4 +63,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHING_GURU, 7, 9, $8, $0, 255, 255, $a0, 0, MrPsychic, -1

--- a/maps/NationalPark.asm

+++ b/maps/NationalPark.asm

@@ -586,17 +586,17 @@

 	; people-events

 	db 14

-	person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, EVENT_ALWAYS_THERE

-	person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 28, 19, $5, $1, 255, 255, $a0, 0, LassScript_0x5c002, -1

+	person_event SPRITE_POKEFAN_F, 8, 18, $6, $0, 255, 255, $0, 0, PokefanFScript_0x5c005, -1

+	person_event SPRITE_TEACHER, 44, 31, $6, $0, 255, 255, $a0, 0, TeacherScript_0x5c008, -1

+	person_event SPRITE_YOUNGSTER, 45, 15, $8, $0, 255, 255, $0, 0, YoungsterScript_0x5c023, -1

+	person_event SPRITE_YOUNGSTER, 45, 14, $6, $0, 255, 255, $80, 0, YoungsterScript_0x5c026, -1

+	person_event SPRITE_TEACHER, 45, 21, $2, $21, 255, 255, $0, 0, TeacherScript_0x5c029, -1

+	person_event SPRITE_GROWLITHE, 44, 30, $16, $0, 255, 255, $0, 0, GrowlitheScript_0x5c02c, -1

+	person_event SPRITE_YOUNGSTER, 27, 31, $a, $0, 255, 255, $92, 3, TrainerSchoolboyJack1, -1

+	person_event SPRITE_POKEFAN_F, 33, 22, $a, $0, 255, 255, $82, 2, TrainerPokefanfBeverly1, -1

+	person_event SPRITE_POKEFAN_M, 13, 20, $a, $0, 255, 255, $82, 2, TrainerPokefanmWilliam, -1

+	person_event SPRITE_LASS, 18, 12, $a, $0, 255, 255, $92, 3, TrainerLassKrise, -1

 	person_event SPRITE_POKE_BALL, 16, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1cc, EVENT_658

-	person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, EVENT_ALWAYS_THERE

+	person_event SPRITE_GAMEBOY_KID, 10, 30, $6, $0, 255, 255, $0, 0, GameboyKidScript_0x5c037, -1

 	person_event SPRITE_POKE_BALL, 47, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x5c1ce, EVENT_659

--- a/maps/NewBarkTown.asm

+++ b/maps/NewBarkTown.asm

@@ -305,6 +305,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 12, 10, $3, $1, 255, 255, $0, 0, TeacherScript_0x1a806f, -1

+	person_event SPRITE_FISHER, 13, 16, $4, $10, 255, 255, $a0, 0, FisherScript_0x1a809b, -1

 	person_event SPRITE_SILVER, 6, 7, $9, $0, 255, 255, $0, 0, SilverScript_0x1a809e, EVENT_6BD

--- a/maps/OaksLab.asm

+++ b/maps/OaksLab.asm

@@ -283,7 +283,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, EVENT_ALWAYS_THERE

-	person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, EVENT_ALWAYS_THERE

-	person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, EVENT_ALWAYS_THERE

-	person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, EVENT_ALWAYS_THERE

+	person_event SPRITE_OAK, 6, 8, $6, $0, 255, 255, $0, 0, Oak, -1

+	person_event SPRITE_SCIENTIST, 12, 5, $5, $1, 255, 255, $90, 0, ScientistScript_0x19b40f, -1

+	person_event SPRITE_SCIENTIST, 13, 12, $4, $10, 255, 255, $90, 0, ScientistScript_0x19b412, -1

+	person_event SPRITE_SCIENTIST, 8, 5, $2, $11, 255, 255, $90, 0, ScientistScript_0x19b415, -1

--- a/maps/OlivineCafe.asm

+++ b/maps/OlivineCafe.asm

@@ -90,6 +90,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 7, 8, $8, $0, 255, 255, $0, 0, SailorScript_0x9c8c1, -1

+	person_event SPRITE_FISHING_GURU, 7, 11, $4, $10, 255, 255, $0, 0, FishingGuruScript_0x9c8d9, -1

+	person_event SPRITE_SAILOR, 10, 10, $7, $0, 255, 255, $0, 0, SailorScript_0x9c8dc, -1

--- a/maps/OlivineCity.asm

+++ b/maps/OlivineCity.asm

@@ -320,7 +320,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, EVENT_ALWAYS_THERE

-	person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 31, 30, $4, $10, 255, 255, $0, 0, SailorScript_0x1a88a3, -1

+	person_event SPRITE_STANDING_YOUNGSTER, 17, 24, $3, $0, 255, 255, $80, 0, StandingYoungsterScript_0x1a88a6, -1

+	person_event SPRITE_SAILOR, 25, 21, $2, $11, 255, 255, $0, 0, SailorScript_0x1a88ba, -1

 	person_event SPRITE_OLIVINE_RIVAL, 15, 14, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C3

--- a/maps/OlivineGoodRodHouse.asm

+++ b/maps/OlivineGoodRodHouse.asm

@@ -96,4 +96,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHING_GURU, 7, 6, $6, $0, 255, 255, $a0, 0, GoodRodGuru, -1

--- a/maps/OlivineGym.asm

+++ b/maps/OlivineGym.asm

@@ -213,4 +213,4 @@

 	; people-events

 	db 2

 	person_event SPRITE_JASMINE, 7, 9, $6, $0, 255, 255, $80, 0, JasmineScript_0x9c12f, EVENT_6D3

-	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, OlivineGymGuyScript, -1

--- a/maps/OlivineHouseBeta.asm

+++ b/maps/OlivineHouseBeta.asm

@@ -54,5 +54,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, EVENT_ALWAYS_THERE

-	person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 7, 6, $3, $0, 255, 255, $0, 0, TeacherScript_0x9c58f, -1

+	person_event SPRITE_RHYDON, 8, 10, $4, $20, 255, 255, $0, 0, RhydonScript_0x9c592, -1

--- a/maps/OlivineLighthouse1F.asm

+++ b/maps/OlivineLighthouse1F.asm

@@ -52,5 +52,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 6, 12, $6, $0, 255, 255, $0, 0, SailorScript_0x5ae67, -1

+	person_event SPRITE_POKEFAN_F, 13, 20, $4, $20, 255, 255, $0, 0, PokefanFScript_0x5ae6a, -1

--- a/maps/OlivineLighthouse2F.asm

+++ b/maps/OlivineLighthouse2F.asm

@@ -253,5 +253,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 7, 13, $9, $0, 255, 255, $92, 3, TrainerSailorHuey1, -1

+	person_event SPRITE_GENTLEMAN, 12, 21, $8, $0, 255, 255, $92, 3, TrainerGentlemanAlfred, -1

--- a/maps/OlivineLighthouse3F.asm

+++ b/maps/OlivineLighthouse3F.asm

@@ -178,7 +178,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 6, 13, $6, $0, 255, 255, $92, 1, TrainerSailorTerrell, -1

+	person_event SPRITE_GENTLEMAN, 9, 17, $9, $0, 255, 255, $92, 4, TrainerGentlemanPreston, -1

+	person_event SPRITE_YOUNGSTER, 13, 7, $7, $0, 255, 255, $92, 3, TrainerBird_keeperTheo, -1

 	person_event SPRITE_POKE_BALL, 6, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x5b279, EVENT_664

--- a/maps/OlivineLighthouse4F.asm

+++ b/maps/OlivineLighthouse4F.asm

@@ -134,5 +134,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 18, 11, $8, $0, 255, 255, $92, 3, TrainerSailorKent, -1

+	person_event SPRITE_LASS, 6, 15, $6, $0, 255, 255, $92, 1, TrainerLassConnie, -1

--- a/maps/OlivineLighthouse5F.asm

+++ b/maps/OlivineLighthouse5F.asm

@@ -140,8 +140,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 15, 12, $a, $0, 255, 255, $92, 3, TrainerSailorErnest, -1

+	person_event SPRITE_YOUNGSTER, 7, 12, $8, $0, 255, 255, $92, 4, TrainerBird_keeperDenis, -1

 	person_event SPRITE_POKE_BALL, 16, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x609aa, EVENT_665

 	person_event SPRITE_POKE_BALL, 19, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ac, EVENT_666

 	person_event SPRITE_POKE_BALL, 17, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x609ae, EVENT_667

--- a/maps/OlivineLighthouse6F.asm

+++ b/maps/OlivineLighthouse6F.asm

@@ -271,5 +271,5 @@

 	; people-events

 	db 3

 	person_event SPRITE_JASMINE, 12, 12, $6, $0, 255, 255, $80, 0, JasmineScript_0x60b91, EVENT_6D2

-	person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, EVENT_ALWAYS_THERE

+	person_event SPRITE_MONSTER, 12, 13, $6, $0, 255, 255, $b0, 0, MonsterScript_0x60c3a, -1

 	person_event SPRITE_POKE_BALL, 8, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x60c66, EVENT_668

--- a/maps/OlivineMart.asm

+++ b/maps/OlivineMart.asm

@@ -57,6 +57,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9cac7, -1

+	person_event SPRITE_COOLTRAINER_F, 6, 10, $5, $2, 255, 255, $a0, 0, CooltrainerFScript_0x9cace, -1

+	person_event SPRITE_LASS, 10, 5, $8, $0, 255, 255, $0, 0, LassScript_0x9cad1, -1

--- a/maps/OlivinePokeCenter1F.asm

+++ b/maps/OlivinePokeCenter1F.asm

@@ -59,7 +59,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9c002, -1

+	person_event SPRITE_FISHING_GURU, 8, 12, $5, $1, 255, 255, $0, 0, FishingGuruScript_0x9c005, -1

+	person_event SPRITE_FISHER, 7, 6, $6, $0, 255, 255, $a0, 0, FisherScript_0x9c008, -1

+	person_event SPRITE_TEACHER, 5, 11, $6, $0, 255, 255, $0, 0, TeacherScript_0x9c00b, -1

--- a/maps/OlivinePunishmentSpeechHouse.asm

+++ b/maps/OlivinePunishmentSpeechHouse.asm

@@ -54,5 +54,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 6, 5, $3, $0, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDad, -1

+	person_event SPRITE_LASS, 9, 9, $5, $2, 255, 255, $0, 0, OlivinePunishmentSpeechHouseDaughter, -1

--- a/maps/OlivineVoltorbHouse.asm

+++ b/maps/OlivineVoltorbHouse.asm

@@ -35,4 +35,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHING_GURU, 7, 6, $3, $0, 255, 255, $80, 0, Tim, -1

--- a/maps/PalletTown.asm

+++ b/maps/PalletTown.asm

@@ -89,5 +89,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 12, 7, $2, $22, 255, 255, $0, 0, TeacherScript_0x1ac6d5, -1

+	person_event SPRITE_FISHER, 18, 16, $5, $2, 255, 255, $a0, 0, FisherScript_0x1ac6d8, -1

--- a/maps/PewterCity.asm

+++ b/maps/PewterCity.asm

@@ -174,8 +174,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_F, 15, 23, $2, $22, 255, 255, $a0, 0, CooltrainerFScript_0x18c009, -1

+	person_event SPRITE_BUG_CATCHER, 33, 18, $2, $22, 255, 255, $80, 0, BugCatcherScript_0x18c00c, -1

+	person_event SPRITE_GRAMPS, 21, 33, $5, $2, 255, 255, $90, 0, GrampsScript_0x18c00f, -1

+	person_event SPRITE_FRUIT_TREE, 7, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c03e, -1

+	person_event SPRITE_FRUIT_TREE, 7, 34, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x18c040, -1

--- a/maps/PewterGym.asm

+++ b/maps/PewterGym.asm

@@ -238,6 +238,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_BROCK, 5, 9, $6, $0, 255, 255, $b0, 0, BrockScript_0x1a2864, -1

+	person_event SPRITE_YOUNGSTER, 9, 6, $9, $0, 255, 255, $a2, 3, TrainerCamperJerry, -1

+	person_event SPRITE_GYM_GUY, 15, 10, $6, $0, 255, 255, $90, 1, PewterGymGuyScript, -1

--- a/maps/PewterMart.asm

+++ b/maps/PewterMart.asm

@@ -57,6 +57,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x1a2dcb, -1

+	person_event SPRITE_YOUNGSTER, 6, 13, $5, $2, 255, 255, $0, 0, YoungsterScript_0x1a2dd2, -1

+	person_event SPRITE_SUPER_NERD, 10, 10, $3, $0, 255, 255, $80, 0, SuperNerdScript_0x1a2dd5, -1

--- a/maps/PewterNidoranSpeechHouse.asm

+++ b/maps/PewterNidoranSpeechHouse.asm

@@ -41,5 +41,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, EVENT_ALWAYS_THERE

-	person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 9, 7, $9, $0, 255, 255, $a0, 0, SuperNerdScript_0x1a2807, -1

+	person_event SPRITE_GROWLITHE, 9, 8, $16, $0, 255, 255, $90, 0, GrowlitheScript_0x1a280a, -1

--- a/maps/PewterPokeCenter1F.asm

+++ b/maps/PewterPokeCenter1F.asm

@@ -78,8 +78,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, EVENT_ALWAYS_THERE

-	person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1a2ee7, -1

+	person_event SPRITE_TEACHER, 10, 12, $6, $0, 255, 255, $a0, 0, TeacherScript_0x1a2eea, -1

+	person_event SPRITE_JIGGLYPUFF, 7, 5, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x1a2eed, -1

+	person_event SPRITE_BUG_CATCHER, 7, 6, $6, $0, 255, 255, $90, 0, BugCatcherScript_0x1a2ef7, -1

+	person_event SPRITE_POKEFAN_M, 6, 11, $6, $0, 255, 255, $80, 0, PokefanMScript_0x1a2efa, -1

--- a/maps/PewterSnoozeSpeechHouse.asm

+++ b/maps/PewterSnoozeSpeechHouse.asm

@@ -36,4 +36,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 7, 9, $8, $0, 255, 255, $90, 0, GrampsScript_0x1a3059, -1

--- a/maps/PokeCenter2F.asm

+++ b/maps/PokeCenter2F.asm

@@ -1040,7 +1040,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, EVENT_ALWAYS_THERE

-	person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, EVENT_ALWAYS_THERE

-	person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, EVENT_ALWAYS_THERE

+	person_event SPRITE_LINK_RECEPTIONIST, 6, 9, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x19289d, -1

+	person_event SPRITE_LINK_RECEPTIONIST, 6, 13, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192952, -1

+	person_event SPRITE_LINK_RECEPTIONIST, 7, 17, $6, $0, 255, 255, $a0, 0, LinkReceptionistScript_0x192a2d, -1

 	person_event SPRITE_OFFICER, 5, 5, $6, $0, 255, 255, $0, 0, OfficerScript_0x192c9a, EVENT_711

--- a/maps/PokeSeersHouse.asm

+++ b/maps/PokeSeersHouse.asm

@@ -30,4 +30,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRANNY, 7, 6, $6, $0, 255, 255, $80, 0, SeerScript, -1

--- a/maps/PokemonFanClub.asm

+++ b/maps/PokemonFanClub.asm

@@ -307,9 +307,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, EVENT_ALWAYS_THERE

-	person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, EVENT_ALWAYS_THERE

+	person_event SPRITE_GENTLEMAN, 5, 7, $6, $0, 255, 255, $0, 0, GentlemanScript_0x1917e9, -1

+	person_event SPRITE_RECEPTIONIST, 5, 8, $6, $0, 255, 255, $a0, 0, ReceptionistScript_0x191821, -1

+	person_event SPRITE_FISHER, 7, 6, $9, $0, 255, 255, $0, 0, FisherScript_0x191824, -1

+	person_event SPRITE_TEACHER, 6, 11, $8, $0, 255, 255, $0, 0, TeacherScript_0x19186b, -1

 	person_event SPRITE_FAIRY, 8, 6, $6, $0, 255, 255, $0, 0, FairyScript_0x19186e, EVENT_774

-	person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, EVENT_ALWAYS_THERE

+	person_event SPRITE_ODDISH, 7, 11, $16, $0, 255, 255, $a0, 0, OddishScript_0x191871, -1

--- a/maps/PowerPlant.asm

+++ b/maps/PowerPlant.asm

@@ -401,10 +401,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, EVENT_ALWAYS_THERE

-	person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 18, 8, $6, $0, 255, 255, $a0, 0, OfficerScript_0x188df5, -1

+	person_event SPRITE_GYM_GUY, 13, 6, $3, $0, 255, 255, $90, 0, GymGuyScript_0x188e15, -1

+	person_event SPRITE_GYM_GUY, 15, 10, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188e29, -1

+	person_event SPRITE_OFFICER, 7, 13, $8, $0, 255, 255, $a0, 0, OfficerScript_0x188e3d, -1

+	person_event SPRITE_GYM_GUY, 6, 11, $5, $1, 255, 255, $90, 0, GymGuyScript_0x188e51, -1

+	person_event SPRITE_FISHER, 14, 18, $7, $0, 255, 255, $80, 0, PowerPlantManager, -1

+	person_event SPRITE_GYM_GUY, 9, 9, $7, $0, 255, 255, $90, 0, GymGuyScript_0x188ecb, -1

--- a/maps/RadioTower1F.asm

+++ b/maps/RadioTower1F.asm

@@ -500,7 +500,7 @@

 	; people-events

 	db 6

-	person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 10, 9, $8, $0, 255, 255, $80, 0, ReceptionistScript_0x5cd29, -1

 	person_event SPRITE_LASS, 8, 20, $8, $0, 255, 255, $80, 0, LassScript_0x5ce51, EVENT_6CF

 	person_event SPRITE_YOUNGSTER, 8, 19, $9, $0, 255, 255, $90, 0, YoungsterScript_0x5ce54, EVENT_6CF

 	person_event SPRITE_ROCKET, 5, 18, $6, $0, 255, 255, $2, 3, TrainerGruntM3, EVENT_6CE

--- a/maps/RadioTower2F.asm

+++ b/maps/RadioTower2F.asm

@@ -785,7 +785,7 @@

 	; people-events

 	db 11

 	person_event SPRITE_SUPER_NERD, 10, 10, $8, $0, 255, 255, $a0, 0, SuperNerdScript_0x5d6fe, EVENT_6CF

-	person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 6, 21, $5, $1, 255, 255, $80, 0, TeacherScript_0x5d701, -1

 	person_event SPRITE_ROCKET, 8, 5, $7, $0, 255, 255, $2, 3, TrainerGruntM4, EVENT_6CE

 	person_event SPRITE_ROCKET, 8, 12, $6, $0, 255, 255, $2, 3, TrainerGruntM5, EVENT_6CE

 	person_event SPRITE_ROCKET, 5, 8, $6, $0, 255, 255, $2, 2, TrainerGruntM6, EVENT_6CE

@@ -792,6 +792,6 @@

 	person_event SPRITE_ROCKET_GIRL, 9, 14, $7, $0, 255, 255, $82, 3, TrainerGruntF2, EVENT_6CE

 	person_event SPRITE_BLACK_BELT, 5, 4, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d71f, EVENT_6D1

 	person_event SPRITE_BLACK_BELT, 5, 5, $6, $0, 255, 255, $0, 0, BlackBeltScript_0x5d722, EVENT_6D0

-	person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, EVENT_ALWAYS_THERE

+	person_event SPRITE_JIGGLYPUFF, 5, 16, $16, $0, 255, 255, $0, 0, JigglypuffScript_0x5d715, -1

+	person_event SPRITE_BUENA, 9, 18, $9, $0, 255, 255, $80, 0, Buena, -1

 	person_event SPRITE_RECEPTIONIST, 11, 16, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x5d8ff, EVENT_6CF

--- a/maps/RadioTower3F.asm

+++ b/maps/RadioTower3F.asm

@@ -408,8 +408,8 @@

 	; people-events

 	db 7

 	person_event SPRITE_SUPER_NERD, 8, 11, $7, $0, 255, 255, $90, 0, SuperNerdScript_0x5e553, EVENT_6D0

-	person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, EVENT_ALWAYS_THERE

+	person_event SPRITE_GYM_GUY, 8, 7, $a, $0, 255, 255, $80, 0, GymGuyScript_0x5e556, -1

+	person_event SPRITE_COOLTRAINER_F, 7, 15, $2, $11, 255, 255, $a0, 0, CooltrainerFScript_0x5e56a, -1

 	person_event SPRITE_ROCKET, 5, 9, $9, $0, 255, 255, $2, 2, TrainerGruntM7, EVENT_6CE

 	person_event SPRITE_ROCKET, 6, 10, $6, $0, 255, 255, $2, 3, TrainerGruntM8, EVENT_6CE

 	person_event SPRITE_ROCKET, 10, 20, $7, $0, 255, 255, $2, 3, TrainerGruntM9, EVENT_6CE

--- a/maps/RadioTower4F.asm

+++ b/maps/RadioTower4F.asm

@@ -322,8 +322,8 @@

 	; people-events

 	db 7

 	person_event SPRITE_FISHER, 8, 10, $7, $0, 255, 255, $80, 0, FisherScript_0x5eb82, EVENT_6D0

-	person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, EVENT_ALWAYS_THERE

-	person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 10, 18, $3, $0, 255, 255, $a0, 0, TeacherScript_0x5eb85, -1

+	person_event SPRITE_GROWLITHE, 11, 16, $16, $0, 255, 255, $80, 0, GrowlitheScript_0x5ebb2, -1

 	person_event SPRITE_ROCKET, 10, 9, $1f, $0, 255, 255, $2, 3, TrainerGruntM10, EVENT_6CE

 	person_event SPRITE_ROCKET, 5, 18, $8, $2, 255, 255, $2, 2, TrainerExecutivem2, EVENT_6CE

 	person_event SPRITE_ROCKET_GIRL, 8, 16, $9, $0, 255, 255, $82, 1, TrainerGruntF4, EVENT_6CE

--- a/maps/RadioTower5F.asm

+++ b/maps/RadioTower5F.asm

@@ -455,7 +455,7 @@

 	; people-events

 	db 5

-	person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, EVENT_ALWAYS_THERE

+	person_event SPRITE_GENTLEMAN, 10, 7, $3, $0, 255, 255, $0, 0, Director, -1

 	person_event SPRITE_ROCKET, 9, 17, $8, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6CE

 	person_event SPRITE_ROCKET_GIRL, 6, 21, $8, $0, 255, 255, $82, 1, TrainerExecutivef1, EVENT_6CE

 	person_event SPRITE_ROCKER, 9, 17, $8, $0, 255, 255, $80, 0, Ben, EVENT_6D0

--- a/maps/RedsHouse1F.asm

+++ b/maps/RedsHouse1F.asm

@@ -94,4 +94,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, EVENT_ALWAYS_THERE

+	person_event SPRITE_REDS_MOM, 7, 9, $8, $0, 255, 255, $0, 0, RedsMom, -1

--- a/maps/Route1.asm

+++ b/maps/Route1.asm

@@ -123,6 +123,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 16, 8, $9, $0, 255, 255, $92, 4, TrainerSchoolboyDanny, -1

+	person_event SPRITE_COOLTRAINER_F, 29, 13, $a, $0, 255, 255, $82, 2, TrainerCooltrainerfQuinn, -1

+	person_event SPRITE_FRUIT_TREE, 11, 7, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac581, -1

--- a/maps/Route10PokeCenter1F.asm

+++ b/maps/Route10PokeCenter1F.asm

@@ -92,7 +92,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x188bd4, -1

+	person_event SPRITE_GENTLEMAN, 10, 11, $5, $1, 255, 255, $80, 0, GentlemanScript_0x188bd7, -1

+	person_event SPRITE_GYM_GUY, 6, 11, $3, $0, 255, 255, $a0, 0, GymGuyScript_0x188bda, -1

+	person_event SPRITE_COOLTRAINER_F, 7, 5, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x188bee, -1

--- a/maps/Route10South.asm

+++ b/maps/Route10South.asm

@@ -120,5 +120,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, -1

+	person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, -1

--- a/maps/Route11.asm

+++ b/maps/Route11.asm

@@ -221,8 +221,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 18, 26, $a, $0, 255, 255, $92, 3, TrainerYoungsterOwen, -1

+	person_event SPRITE_YOUNGSTER, 8, 24, $6, $0, 255, 255, $92, 3, TrainerYoungsterJason, -1

+	person_event SPRITE_YOUNGSTER, 11, 32, $6, $0, 255, 255, $92, 1, TrainerPsychicHerman, -1

+	person_event SPRITE_YOUNGSTER, 10, 12, $a, $0, 255, 255, $92, 3, TrainerPsychicFidel, -1

+	person_event SPRITE_FRUIT_TREE, 6, 36, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x68055, -1

--- a/maps/Route12.asm

+++ b/maps/Route12.asm

@@ -243,9 +243,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 17, 9, $a, $0, 255, 255, $a2, 1, TrainerFisherMartin, -1

+	person_event SPRITE_FISHER, 27, 18, $6, $0, 255, 255, $a2, 1, TrainerFisherStephen, -1

+	person_event SPRITE_FISHER, 42, 14, $8, $0, 255, 255, $a2, 5, TrainerFisherBarney, -1

+	person_event SPRITE_FISHER, 11, 10, $9, $0, 255, 255, $a2, 3, TrainerFisherKyle, -1

 	person_event SPRITE_POKE_BALL, 47, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700b, EVENT_788

 	person_event SPRITE_POKE_BALL, 55, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a700d, EVENT_789

--- a/maps/Route12SuperRodHouse.asm

+++ b/maps/Route12SuperRodHouse.asm

@@ -93,4 +93,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHING_GURU, 7, 9, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x7f484, -1

--- a/maps/Route13.asm

+++ b/maps/Route13.asm

@@ -285,8 +285,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 10, 46, $6, $0, 255, 255, $92, 2, TrainerBird_keeperPerry, -1

+	person_event SPRITE_YOUNGSTER, 10, 47, $6, $0, 255, 255, $92, 2, TrainerBird_keeperBret, -1

+	person_event SPRITE_POKEFAN_M, 12, 36, $8, $0, 255, 255, $82, 3, TrainerPokefanmJoshua, -1

+	person_event SPRITE_POKEFAN_M, 14, 18, $8, $0, 255, 255, $82, 4, TrainerHikerKenny, -1

+	person_event SPRITE_POKEFAN_M, 10, 29, $9, $0, 255, 255, $82, 4, TrainerPokefanmAlex, -1

--- a/maps/Route14.asm

+++ b/maps/Route14.asm

@@ -172,7 +172,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 19, 15, $9, $0, 255, 255, $82, 3, TrainerPokefanmCarter, -1

+	person_event SPRITE_YOUNGSTER, 31, 15, $a, $0, 255, 255, $92, 3, TrainerBird_keeperRoy, -1

+	person_event SPRITE_POKEFAN_M, 15, 10, $a, $0, 255, 255, $82, 3, TrainerPokefanmTrevor, -1

+	person_event SPRITE_TEACHER, 9, 11, $5, $1, 255, 255, $a0, 4, TeacherScript_0x1ad47f, -1

--- a/maps/Route15.asm

+++ b/maps/Route15.asm

@@ -306,10 +306,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 14, 14, $9, $0, 255, 255, $92, 4, TrainerSchoolboyKipp, -1

+	person_event SPRITE_YOUNGSTER, 17, 19, $7, $0, 255, 255, $92, 3, TrainerSchoolboyTommy, -1

+	person_event SPRITE_YOUNGSTER, 14, 37, $6, $0, 255, 255, $92, 3, TrainerSchoolboyJohnny, -1

+	person_event SPRITE_YOUNGSTER, 14, 31, $6, $0, 255, 255, $92, 3, TrainerSchoolboyBilly, -1

+	person_event SPRITE_TEACHER, 16, 34, $7, $0, 255, 255, $82, 4, TrainerTeacherColette, -1

+	person_event SPRITE_TEACHER, 14, 24, $a, $0, 255, 255, $82, 3, TrainerTeacherHillary, -1

 	person_event SPRITE_POKE_BALL, 9, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x1aa5e4, EVENT_78A

--- a/maps/Route15FuchsiaGate.asm

+++ b/maps/Route15FuchsiaGate.asm

@@ -35,4 +35,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19679e, -1

--- a/maps/Route16FuchsiaSpeechHouse.asm

+++ b/maps/Route16FuchsiaSpeechHouse.asm

@@ -38,4 +38,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 7, 6, $6, $0, 255, 255, $a0, 0, SuperNerdScript_0x73373, -1

--- a/maps/Route16Gate.asm

+++ b/maps/Route16Gate.asm

@@ -80,4 +80,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x733ea, -1

--- a/maps/Route17.asm

+++ b/maps/Route17.asm

@@ -216,7 +216,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, EVENT_ALWAYS_THERE

-	person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, EVENT_ALWAYS_THERE

-	person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, EVENT_ALWAYS_THERE

-	person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, EVENT_ALWAYS_THERE

+	person_event SPRITE_BIKER, 21, 8, $a, $0, 255, 255, $b2, 4, TrainerBikerRiley, -1

+	person_event SPRITE_BIKER, 72, 13, $6, $0, 255, 255, $b2, 1, TrainerBikerJoel, -1

+	person_event SPRITE_BIKER, 57, 7, $a, $0, 255, 255, $b2, 3, TrainerBikerGlenn, -1

+	person_event SPRITE_BIKER, 84, 10, $9, $0, 255, 255, $b2, 4, TrainerBikerCharles, -1

--- a/maps/Route1718Gate.asm

+++ b/maps/Route1718Gate.asm

@@ -71,4 +71,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7360e, -1

--- a/maps/Route18.asm

+++ b/maps/Route18.asm

@@ -123,5 +123,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 16, 13, $a, $0, 255, 255, $92, 3, TrainerBird_keeperBoris, -1

+	person_event SPRITE_YOUNGSTER, 10, 17, $6, $0, 255, 255, $92, 3, TrainerBird_keeperBob, -1

--- a/maps/Route19.asm

+++ b/maps/Route19.asm

@@ -311,9 +311,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, EVENT_ALWAYS_THERE

+	person_event SPRITE_SWIMMER_GIRL, 27, 13, $8, $0, 255, 255, $a2, 0, TrainerSwimmerfDawn, -1

+	person_event SPRITE_SWIMMER_GUY, 32, 17, $a, $0, 255, 255, $82, 3, TrainerSwimmermHarold, -1

+	person_event SPRITE_SWIMMER_GUY, 21, 15, $a, $0, 255, 255, $82, 3, TrainerSwimmermJerome, -1

+	person_event SPRITE_SWIMMER_GUY, 27, 12, $7, $0, 255, 255, $82, 0, TrainerSwimmermTucker, -1

+	person_event SPRITE_FISHER, 9, 13, $6, $0, 255, 255, $80, 1, FisherScript_0x19ea4d, -1

+	person_event SPRITE_FISHER, 9, 15, $5, $1, 255, 255, $90, 1, FisherScript_0x19ea61, -1

--- a/maps/Route19FuchsiaGate.asm

+++ b/maps/Route19FuchsiaGate.asm

@@ -61,4 +61,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1ab3f6, -1

--- a/maps/Route2.asm

+++ b/maps/Route2.asm

@@ -218,11 +218,11 @@

 	; people-events

 	db 8

-	person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, EVENT_ALWAYS_THERE

+	person_event SPRITE_BUG_CATCHER, 49, 14, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherRob, -1

+	person_event SPRITE_BUG_CATCHER, 8, 10, $1f, $0, 255, 255, $b2, 3, TrainerBug_catcherEd, -1

+	person_event SPRITE_BUG_CATCHER, 44, 4, $9, $0, 255, 255, $b2, 3, TrainerBug_catcherDoug, -1

 	person_event SPRITE_POKE_BALL, 33, 4, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac2fe, EVENT_783

 	person_event SPRITE_POKE_BALL, 27, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac300, EVENT_784

 	person_event SPRITE_POKE_BALL, 6, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac302, EVENT_785

 	person_event SPRITE_POKE_BALL, 54, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ac304, EVENT_786

-	person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, EVENT_ALWAYS_THERE

+	person_event SPRITE_FRUIT_TREE, 18, 14, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac306, -1

--- a/maps/Route20.asm

+++ b/maps/Route20.asm

@@ -175,6 +175,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, EVENT_ALWAYS_THERE

+	person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, -1

+	person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, -1

+	person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, -1

--- a/maps/Route21.asm

+++ b/maps/Route21.asm

@@ -147,6 +147,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, EVENT_ALWAYS_THERE

+	person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, -1

+	person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, -1

+	person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, -1

--- a/maps/Route25.asm

+++ b/maps/Route25.asm

@@ -554,12 +554,12 @@

 	db 11

 	person_event SPRITE_MISTY, 13, 50, $8, $0, 255, 255, $80, 0, ObjectEvent, EVENT_76E

 	person_event SPRITE_COOLTRAINER_M, 14, 50, $8, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_76E

-	person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 12, 16, $6, $0, 255, 255, $92, 3, TrainerSchoolboyDudley, -1

+	person_event SPRITE_LASS, 15, 20, $7, $0, 255, 255, $92, 3, TrainerLassEllen, -1

+	person_event SPRITE_YOUNGSTER, 12, 25, $6, $0, 255, 255, $92, 1, TrainerSchoolboyJoe, -1

+	person_event SPRITE_LASS, 10, 26, $9, $0, 255, 255, $92, 3, TrainerLassLaura, -1

+	person_event SPRITE_YOUNGSTER, 8, 29, $6, $0, 255, 255, $a2, 2, TrainerCamperLloyd, -1

+	person_event SPRITE_LASS, 15, 32, $7, $0, 255, 255, $92, 1, TrainerLassShannon, -1

+	person_event SPRITE_SUPER_NERD, 11, 35, $6, $0, 255, 255, $b2, 1, TrainerSupernerdPat, -1

+	person_event SPRITE_COOLTRAINER_M, 12, 41, $8, $0, 255, 255, $80, 0, CooltrainerMScript_0x19efac, -1

 	person_event SPRITE_POKE_BALL, 8, 36, $1, $0, 255, 255, $1, 0, ItemFragment_0x19efe3, EVENT_78B

--- a/maps/Route26.asm

+++ b/maps/Route26.asm

@@ -517,11 +517,11 @@

 	; people-events

 	db 8

-	person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_M, 28, 18, $8, $0, 255, 255, $82, 2, TrainerCooltrainermJake, -1

+	person_event SPRITE_COOLTRAINER_M, 42, 13, $8, $0, 255, 255, $82, 3, TrainerCooltrainermGaven3, -1

+	person_event SPRITE_COOLTRAINER_F, 60, 14, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfJoyce, -1

+	person_event SPRITE_COOLTRAINER_F, 12, 9, $9, $0, 255, 255, $82, 4, TrainerCooltrainerfBeth1, -1

+	person_event SPRITE_YOUNGSTER, 83, 17, $9, $0, 255, 255, $92, 2, TrainerPsychicRichard, -1

+	person_event SPRITE_FISHER, 96, 14, $6, $0, 255, 255, $a2, 3, TrainerFisherScott, -1

+	person_event SPRITE_FRUIT_TREE, 58, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a4ec2, -1

 	person_event SPRITE_POKE_BALL, 19, 13, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a4ec4, EVENT_6AA

--- a/maps/Route26DayofWeekSiblingsHouse.asm

+++ b/maps/Route26DayofWeekSiblingsHouse.asm

@@ -84,4 +84,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEDEX, 7, 7, $1, $0, 255, 255, $0, 0, PokedexScript_0x7b1e4, -1

--- a/maps/Route26HealSpeechHouse.asm

+++ b/maps/Route26HealSpeechHouse.asm

@@ -64,4 +64,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 7, 6, $6, $0, 255, 255, $90, 0, TeacherScript_0x7b125, -1

--- a/maps/Route27.asm

+++ b/maps/Route27.asm

@@ -575,12 +575,12 @@

 	; people-events

 	db 9

-	person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_M, 11, 52, $7, $0, 255, 255, $82, 3, TrainerCooltrainermBlake, -1

+	person_event SPRITE_COOLTRAINER_M, 10, 62, $9, $0, 255, 255, $82, 4, TrainerCooltrainermBrian, -1

+	person_event SPRITE_COOLTRAINER_F, 14, 76, $7, $0, 255, 255, $82, 4, TrainerCooltrainerfReena, -1

+	person_event SPRITE_COOLTRAINER_F, 10, 41, $1f, $0, 255, 255, $82, 2, TrainerCooltrainerfMegan, -1

+	person_event SPRITE_YOUNGSTER, 11, 69, $8, $0, 255, 255, $92, 3, TrainerPsychicGilbert, -1

+	person_event SPRITE_YOUNGSTER, 17, 62, $9, $0, 255, 255, $92, 3, TrainerBird_keeperJose2, -1

 	person_event SPRITE_POKE_BALL, 16, 64, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a62, EVENT_6AB

 	person_event SPRITE_POKE_BALL, 16, 57, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a0a64, EVENT_6AC

-	person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 14, 25, $3, $0, 255, 255, $0, 3, FisherScript_0x1a089c, -1

--- a/maps/Route27SandstormHouse.asm

+++ b/maps/Route27SandstormHouse.asm

@@ -109,4 +109,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRANNY, 8, 6, $6, $0, 255, 255, $0, 0, SandstormHouseWoman, -1

--- a/maps/Route28FamousSpeechHouse.asm

+++ b/maps/Route28FamousSpeechHouse.asm

@@ -87,5 +87,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, EVENT_ALWAYS_THERE

-	person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_F, 7, 6, $6, $0, 255, 255, $a0, 0, Celebrity, -1

+	person_event SPRITE_MOLTRES, 9, 10, $16, $0, 255, 255, $b0, 0, CelebritysFearow, -1

--- a/maps/Route29.asm

+++ b/maps/Route29.asm

@@ -430,11 +430,11 @@

 	; people-events

 	db 8

-	person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_M, 16, 54, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a0ff1, -1

+	person_event SPRITE_YOUNGSTER, 20, 31, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x1a1028, -1

+	person_event SPRITE_TEACHER, 15, 19, $5, $1, 255, 255, $a0, 0, TeacherScript_0x1a102b, -1

+	person_event SPRITE_FRUIT_TREE, 6, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1089, -1

+	person_event SPRITE_FISHER, 7, 29, $7, $0, 255, 255, $90, 0, FisherScript_0x1a102e, -1

+	person_event SPRITE_COOLTRAINER_M, 8, 17, $6, $0, 255, 255, $80, 0, CooltrainerMScript_0x1a1031, -1

 	person_event SPRITE_TEACHER, 16, 33, $3, $0, 255, 255, $0, 0, TuscanyScript, EVENT_759

 	person_event SPRITE_POKE_BALL, 6, 52, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a108b, EVENT_6AD

--- a/maps/Route2946Gate.asm

+++ b/maps/Route2946Gate.asm

@@ -51,5 +51,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x7b5bb, -1

+	person_event SPRITE_YOUNGSTER, 8, 10, $4, $10, 255, 255, $a0, 0, YoungsterScript_0x7b5be, -1

--- a/maps/Route2Gate.asm

+++ b/maps/Route2Gate.asm

@@ -41,4 +41,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, EVENT_ALWAYS_THERE

+	person_event SPRITE_SCIENTIST, 8, 10, $4, $20, 255, 255, $90, 0, ScientistScript_0x9b952, -1

--- a/maps/Route2NuggetSpeechHouse.asm

+++ b/maps/Route2NuggetSpeechHouse.asm

@@ -66,4 +66,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 8, 6, $4, $20, 255, 255, $90, 0, FisherScript_0x9b847, -1

--- a/maps/Route3.asm

+++ b/maps/Route3.asm

@@ -207,7 +207,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 16, 30, $7, $0, 255, 255, $82, 2, TrainerFirebreatherOtis, -1

+	person_event SPRITE_YOUNGSTER, 11, 14, $8, $0, 255, 255, $92, 3, TrainerYoungsterWarren, -1

+	person_event SPRITE_YOUNGSTER, 7, 20, $a, $0, 255, 255, $92, 1, TrainerYoungsterJimmy, -1

+	person_event SPRITE_FISHER, 9, 53, $a, $0, 255, 255, $82, 3, TrainerFirebreatherBurt, -1

--- a/maps/Route30.asm

+++ b/maps/Route30.asm

@@ -467,12 +467,12 @@

 	db 11

 	person_event SPRITE_YOUNGSTER, 30, 9, $7, $0, 255, 255, $90, 0, YoungsterScript_0x1a1673, EVENT_714

 	person_event SPRITE_YOUNGSTER, 32, 6, $9, $0, 255, 255, $92, 3, TrainerYoungsterJoey, EVENT_715

-	person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 27, 9, $6, $0, 255, 255, $92, 1, TrainerYoungsterMikey, -1

+	person_event SPRITE_BUG_CATCHER, 11, 5, $6, $0, 255, 255, $b2, 3, TrainerBug_catcherDon, -1

+	person_event SPRITE_YOUNGSTER, 34, 11, $5, $1, 255, 255, $80, 0, YoungsterScript_0x1a17d2, -1

 	person_event SPRITE_MONSTER, 28, 9, $6, $0, 255, 255, $80, 0, ObjectEvent, EVENT_714

 	person_event SPRITE_MONSTER, 29, 9, $7, $0, 255, 255, $90, 0, ObjectEvent, EVENT_714

-	person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, EVENT_ALWAYS_THERE

+	person_event SPRITE_FRUIT_TREE, 43, 9, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f7, -1

+	person_event SPRITE_FRUIT_TREE, 9, 15, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a17f9, -1

+	person_event SPRITE_COOLTRAINER_F, 17, 6, $6, $0, 255, 255, $0, 0, CooltrainerFScript_0x1a17e6, -1

 	person_event SPRITE_POKE_BALL, 39, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a17f5, EVENT_7B8

--- a/maps/Route30BerrySpeechHouse.asm

+++ b/maps/Route30BerrySpeechHouse.asm

@@ -62,4 +62,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $b0, 0, PokefanMScript_0x196d64, -1

--- a/maps/Route31.asm

+++ b/maps/Route31.asm

@@ -446,10 +446,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 11, 21, $6, $0, 255, 255, $0, 0, FisherScript_0x1a5570, -1

+	person_event SPRITE_YOUNGSTER, 9, 13, $2, $11, 255, 255, $0, 0, YoungsterScript_0x1a55ed, -1

+	person_event SPRITE_BUG_CATCHER, 17, 25, $8, $0, 255, 255, $b2, 5, TrainerBug_catcherWade1, -1

+	person_event SPRITE_COOLTRAINER_M, 12, 37, $2, $11, 255, 255, $0, 0, CooltrainerMScript_0x1a55f6, -1

+	person_event SPRITE_FRUIT_TREE, 11, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a55f9, -1

 	person_event SPRITE_POKE_BALL, 9, 33, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fb, EVENT_6AE

 	person_event SPRITE_POKE_BALL, 19, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a55fd, EVENT_6AF

--- a/maps/Route31VioletGate.asm

+++ b/maps/Route31VioletGate.asm

@@ -42,5 +42,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x197634, -1

+	person_event SPRITE_COOLTRAINER_F, 6, 5, $3, $0, 255, 255, $90, 0, CooltrainerFScript_0x197637, -1

--- a/maps/Route32.asm

+++ b/maps/Route32.asm

@@ -1076,17 +1076,17 @@

 	; people-events

 	db 14

-	person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 53, 12, $6, $0, 255, 255, $a2, 1, TrainerFisherJustin, -1

+	person_event SPRITE_FISHER, 60, 16, $7, $0, 255, 255, $a2, 3, TrainerFisherRalph1, -1

+	person_event SPRITE_FISHER, 52, 10, $8, $0, 255, 255, $a2, 1, TrainerFisherHenry, -1

+	person_event SPRITE_YOUNGSTER, 26, 16, $9, $0, 255, 255, $92, 3, TrainerYoungsterAlbert, -1

+	person_event SPRITE_YOUNGSTER, 67, 8, $a, $0, 255, 255, $92, 3, TrainerYoungsterGordon, -1

+	person_event SPRITE_YOUNGSTER, 49, 7, $7, $0, 255, 255, $a2, 3, TrainerCamperRoland, -1

+	person_event SPRITE_LASS, 34, 14, $8, $0, 255, 255, $a2, 1, TrainerPicnickerLiz1, -1

+	person_event SPRITE_COOLTRAINER_M, 12, 23, $8, $0, 255, 255, $0, 0, CooltrainerMScript_0x19046f, -1

+	person_event SPRITE_YOUNGSTER, 86, 15, $7, $0, 255, 255, $92, 3, TrainerBird_keeperPeter, -1

 	person_event SPRITE_FISHER, 74, 11, $6, $0, 255, 255, $0, 0, FisherScript_0x1904f2, EVENT_6FC

 	person_event SPRITE_POKE_BALL, 57, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x190773, EVENT_6B0

-	person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 17, 19, $9, $0, 255, 255, $0, 0, FisherScript_0x1904ce, -1

 	person_event SPRITE_LASS, 71, 16, $8, $0, 255, 255, $0, 0, FriedaScript, EVENT_758

 	person_event SPRITE_POKE_BALL, 34, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x190775, EVENT_6B1

--- a/maps/Route32PokeCenter1F.asm

+++ b/maps/Route32PokeCenter1F.asm

@@ -107,6 +107,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x69b52, -1

+	person_event SPRITE_FISHING_GURU, 8, 5, $6, $0, 255, 255, $a0, 0, FishingGuruScript_0x69b55, -1

+	person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $0, 255, 255, $80, 0, CooltrainerFScript_0x69b80, -1

--- a/maps/Route32RuinsofAlphGate.asm

+++ b/maps/Route32RuinsofAlphGate.asm

@@ -60,6 +60,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x69a2d, -1

+	person_event SPRITE_POKEFAN_M, 6, 12, $4, $10, 255, 255, $b0, 0, PokefanMScript_0x69a30, -1

+	person_event SPRITE_YOUNGSTER, 10, 5, $7, $0, 255, 255, $a0, 0, YoungsterScript_0x69a33, -1

--- a/maps/Route33.asm

+++ b/maps/Route33.asm

@@ -222,6 +222,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 17, 10, $a, $0, 255, 255, $b2, 2, TrainerHikerAnthony, -1

+	person_event SPRITE_LASS, 20, 17, $2, $11, 255, 255, $90, 0, LassScript_0x1ac002, -1

+	person_event SPRITE_FRUIT_TREE, 20, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1ac0ea, -1

--- a/maps/Route34.asm

+++ b/maps/Route34.asm

@@ -905,16 +905,16 @@

 	; people-events

 	db 13

-	person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, EVENT_ALWAYS_THERE

-	person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 11, 17, $8, $0, 255, 255, $a2, 5, TrainerCamperTodd1, -1

+	person_event SPRITE_YOUNGSTER, 36, 19, $6, $0, 255, 255, $92, 3, TrainerYoungsterSamuel, -1

+	person_event SPRITE_YOUNGSTER, 24, 15, $6, $0, 255, 255, $92, 3, TrainerYoungsterIan, -1

+	person_event SPRITE_LASS, 30, 14, $9, $0, 255, 255, $a2, 3, TrainerPicnickerGina1, -1

+	person_event SPRITE_OFFICER, 15, 13, $6, $0, 255, 255, $90, 0, OfficerScript_0x7824c, -1

+	person_event SPRITE_POKEFAN_M, 32, 22, $1e, $0, 255, 255, $82, 3, TrainerPokefanmBrandon, -1

 	person_event SPRITE_GRAMPS, 20, 19, $6, $0, 255, 255, $0, 0, GrampsScript_0x7803d, EVENT_6E6

 	person_event SPRITE_DAYCARE_MON_1, 22, 18, $16, $22, 255, 255, $0, 0, DaycareMon1Script_0x78065, EVENT_6E7

 	person_event SPRITE_DAYCARE_MON_2, 23, 21, $16, $22, 255, 255, $0, 0, DaycareMon2Script_0x7806b, EVENT_6E8

-	person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, EVENT_ALWAYS_THERE

+	person_event SPRITE_COOLTRAINER_F, 52, 15, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfIrene, -1

+	person_event SPRITE_COOLTRAINER_F, 52, 7, $9, $0, 255, 255, $82, 3, TrainerCooltrainerfJenn, -1

+	person_event SPRITE_COOLTRAINER_F, 55, 10, $7, $0, 255, 255, $82, 2, TrainerCooltrainerfKate, -1

 	person_event SPRITE_POKE_BALL, 34, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7832b, EVENT_7BC

--- a/maps/Route34IlexForestGate.asm

+++ b/maps/Route34IlexForestGate.asm

@@ -153,6 +153,6 @@

 	; people-events

 	db 4

 	person_event SPRITE_TEACHER, 7, 13, $8, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EA

-	person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, EVENT_ALWAYS_THERE

+	person_event SPRITE_BUTTERFREE, 8, 13, $16, $0, 255, 255, $80, 0, ButterfreeScript_0x62d8a, -1

 	person_event SPRITE_LASS, 8, 7, $4, $10, 255, 255, $a0, 0, LassScript_0x62d94, EVENT_6EB

 	person_event SPRITE_TEACHER, 11, 9, $7, $0, 255, 255, $90, 0, TeacherScript_0x62d63, EVENT_6EC

--- a/maps/Route35.asm

+++ b/maps/Route35.asm

@@ -597,14 +597,14 @@

 	; people-events

 	db 11

-	person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, EVENT_ALWAYS_THERE

-	person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 23, 8, $a, $0, 255, 255, $a2, 2, TrainerCamperIvan, -1

+	person_event SPRITE_YOUNGSTER, 24, 12, $6, $0, 255, 255, $a2, 3, TrainerCamperElliot, -1

+	person_event SPRITE_LASS, 24, 11, $6, $0, 255, 255, $a2, 3, TrainerPicnickerBrooke, -1

+	person_event SPRITE_LASS, 30, 14, $a, $0, 255, 255, $a2, 1, TrainerPicnickerKim, -1

+	person_event SPRITE_YOUNGSTER, 32, 18, $6, $0, 255, 255, $92, 0, TrainerBird_keeperBryan, -1

+	person_event SPRITE_FISHER, 14, 6, $1e, $0, 255, 255, $82, 2, TrainerFirebreatherWalt, -1

+	person_event SPRITE_BUG_CATCHER, 11, 20, $6, $2, 255, 255, $b2, 3, TrainerBug_catcherArnie1, -1

+	person_event SPRITE_SUPER_NERD, 14, 9, $a, $0, 255, 255, $92, 2, TrainerJugglerIrwin, -1

+	person_event SPRITE_OFFICER, 10, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x19ca49, -1

+	person_event SPRITE_FRUIT_TREE, 29, 6, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19ca7e, -1

 	person_event SPRITE_POKE_BALL, 20, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x19ca7c, EVENT_6B2

--- a/maps/Route35Goldenrodgate.asm

+++ b/maps/Route35Goldenrodgate.asm

@@ -209,6 +209,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x69d37, -1

+	person_event SPRITE_POKEFAN_F, 8, 10, $4, $10, 255, 255, $90, 0, PokefanFScript_0x69dc6, -1

+	person_event SPRITE_FISHER, 6, 7, $3, $0, 255, 255, $a0, 0, FisherScript_0x69dda, -1

--- a/maps/Route36.asm

+++ b/maps/Route36.asm

@@ -711,12 +711,12 @@

 	; people-events

 	db 9

-	person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 17, 24, $9, $0, 255, 255, $92, 3, TrainerPsychicMark, -1

+	person_event SPRITE_YOUNGSTER, 18, 35, $8, $0, 255, 255, $92, 5, TrainerSchoolboyAlan1, -1

 	person_event SPRITE_WEIRD_TREE, 13, 39, $17, $0, 255, 255, $0, 0, WeirdTreeScript_0x19403c, EVENT_6F8

-	person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 12, 55, $5, $2, 255, 255, $0, 0, LassScript_0x1940e0, -1

+	person_event SPRITE_FISHER, 13, 48, $8, $0, 255, 255, $0, 0, FisherScript_0x1940b9, -1

+	person_event SPRITE_FRUIT_TREE, 8, 25, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x194247, -1

 	person_event SPRITE_YOUNGSTER, 10, 50, $2, $11, 255, 255, $0, 0, ArthurScript, EVENT_75A

 	person_event SPRITE_LASS, 16, 37, $6, $0, 255, 255, $90, 0, LassScript_0x19408c, EVENT_FLORIA_AT_SUDOWOODO

 	person_event SPRITE_SUICUNE, 10, 25, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_36

--- a/maps/Route36RuinsofAlphgate.asm

+++ b/maps/Route36RuinsofAlphgate.asm

@@ -49,5 +49,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x6aa1a, -1

+	person_event SPRITE_GRAMPS, 9, 11, $2, $21, 255, 255, $b0, 0, GrampsScript_0x6aa1d, -1

--- a/maps/Route37.asm

+++ b/maps/Route37.asm

@@ -298,10 +298,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, EVENT_ALWAYS_THERE

-	person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, EVENT_ALWAYS_THERE

+	person_event SPRITE_WEIRD_TREE, 16, 10, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne1, -1

+	person_event SPRITE_WEIRD_TREE, 16, 11, $6, $0, 255, 255, $82, 1, TrainerTwinsAnnandanne2, -1

+	person_event SPRITE_YOUNGSTER, 10, 10, $a, $0, 255, 255, $92, 1, TrainerPsychicGreg, -1

+	person_event SPRITE_FRUIT_TREE, 9, 17, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e09, -1

 	person_event SPRITE_BUG_CATCHER, 12, 20, $2, $11, 255, 255, $0, 0, SunnyScript, EVENT_75B

-	person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, EVENT_ALWAYS_THERE

+	person_event SPRITE_FRUIT_TREE, 9, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0b, -1

+	person_event SPRITE_FRUIT_TREE, 11, 19, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8e0d, -1

--- a/maps/Route38.asm

+++ b/maps/Route38.asm

@@ -578,10 +578,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, EVENT_ALWAYS_THERE

-	person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, EVENT_ALWAYS_THERE

+	person_event SPRITE_STANDING_YOUNGSTER, 5, 8, $9, $0, 255, 255, $92, 1, TrainerSchoolboyChad1, -1

+	person_event SPRITE_LASS, 7, 19, $a, $0, 255, 255, $92, 2, TrainerLassDana1, -1

+	person_event SPRITE_STANDING_YOUNGSTER, 19, 16, $a, $0, 255, 255, $92, 1, TrainerBird_keeperToby, -1

+	person_event SPRITE_BUENA, 13, 23, $6, $0, 255, 255, $92, 1, TrainerBeautyValerie, -1

+	person_event SPRITE_SAILOR, 9, 28, $1e, $0, 255, 255, $92, 2, TrainerSailorHarry, -1

+	person_event SPRITE_FRUIT_TREE, 14, 16, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a1f33, -1

+	person_event SPRITE_BUENA, 12, 9, $a, $0, 255, 255, $92, 1, TrainerBeautyOlivia, -1

--- a/maps/Route38EcruteakGate.asm

+++ b/maps/Route38EcruteakGate.asm

@@ -40,4 +40,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x9cbd7, -1

--- a/maps/Route39.asm

+++ b/maps/Route39.asm

@@ -418,13 +418,13 @@

 	; people-events

 	db 10

-	person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, EVENT_ALWAYS_THERE

-	person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE

-	person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE

-	person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE

-	person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, EVENT_ALWAYS_THERE

-	person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 33, 17, $8, $0, 255, 255, $92, 5, TrainerSailorEugene, -1

+	person_event SPRITE_POKEFAN_M, 26, 14, $7, $0, 255, 255, $82, 4, TrainerPokefanmDerek1, -1

+	person_event SPRITE_POKEFAN_F, 23, 15, $9, $0, 255, 255, $82, 4, TrainerPokefanfRuth, -1

+	person_event SPRITE_TAUROS, 16, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1

+	person_event SPRITE_TAUROS, 15, 10, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1

+	person_event SPRITE_TAUROS, 19, 8, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1

+	person_event SPRITE_TAUROS, 17, 12, $16, $0, 255, 255, $0, 0, TaurosScript_0x1a5af5, -1

+	person_event SPRITE_STANDING_YOUNGSTER, 11, 17, $a, $0, 255, 255, $92, 1, TrainerPsychicNorman, -1

+	person_event SPRITE_FRUIT_TREE, 7, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a5bf4, -1

+	person_event SPRITE_POKEFAN_F, 26, 8, $6, $0, 255, 255, $80, 0, PokefanFScript_0x1a5bbe, -1

--- a/maps/Route39Barn.asm

+++ b/maps/Route39Barn.asm

@@ -200,6 +200,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, EVENT_ALWAYS_THERE

-	person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, EVENT_ALWAYS_THERE

-	person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, EVENT_ALWAYS_THERE

+	person_event SPRITE_TWIN, 7, 6, $9, $0, 255, 255, $0, 0, TwinScript_0x9cc76, -1

+	person_event SPRITE_TWIN, 7, 8, $8, $0, 255, 255, $a0, 0, TwinScript_0x9cc90, -1

+	person_event SPRITE_TAUROS, 7, 7, $16, $0, 255, 255, $0, 0, TaurosScript_0x9ccaa, -1

--- a/maps/Route39Farmhouse.asm

+++ b/maps/Route39Farmhouse.asm

@@ -207,5 +207,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 6, 7, $6, $0, 255, 255, $90, 0, PokefanMScript_0x9ceb4, -1

+	person_event SPRITE_POKEFAN_F, 8, 9, $8, $0, 255, 255, $b0, 0, PokefanFScript_0x9cf0e, -1

--- a/maps/Route4.asm

+++ b/maps/Route4.asm

@@ -182,7 +182,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 13, 21, $6, $0, 255, 255, $92, 3, TrainerBird_keeperHank, -1

+	person_event SPRITE_LASS, 12, 13, $8, $0, 255, 255, $a2, 4, TrainerPicnickerHope, -1

+	person_event SPRITE_LASS, 10, 25, $9, $0, 255, 255, $a2, 4, TrainerPicnickerSharon, -1

 	person_event SPRITE_POKE_BALL, 7, 30, $1, $0, 255, 255, $1, 0, ItemFragment_0x1ae20f, EVENT_787

--- a/maps/Route40.asm

+++ b/maps/Route40.asm

@@ -409,15 +409,15 @@

 	; people-events

 	db 12

-	person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, EVENT_ALWAYS_THERE

-	person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, EVENT_ALWAYS_THERE

+	person_event SPRITE_OLIVINE_RIVAL, 19, 18, $9, $0, 255, 255, $82, 4, TrainerSwimmermSimon, -1

+	person_event SPRITE_OLIVINE_RIVAL, 34, 22, $8, $0, 255, 255, $82, 5, TrainerSwimmermRandall, -1

+	person_event SPRITE_SWIMMER_GIRL, 23, 7, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfElaine, -1

+	person_event SPRITE_SWIMMER_GIRL, 29, 14, $1f, $0, 255, 255, $a2, 3, TrainerSwimmerfPaula, -1

+	person_event SPRITE_ROCK, 15, 11, $18, $0, 255, 255, $0, 0, Route40Rock, -1

+	person_event SPRITE_ROCK, 13, 10, $18, $0, 255, 255, $0, 0, Route40Rock, -1

+	person_event SPRITE_ROCK, 12, 11, $18, $0, 255, 255, $0, 0, Route40Rock, -1

+	person_event SPRITE_LASS, 17, 15, $6, $0, 255, 255, $0, 0, LassScript_0x1a61c4, -1

 	person_event SPRITE_BUENA, 14, 12, $3, $0, 255, 255, $0, 0, MonicaScript, EVENT_75E

-	person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 10, 11, $9, $0, 255, 255, $0, 0, PokefanMScript_0x1a61c7, -1

+	person_event SPRITE_LASS, 8, 17, $3, $0, 255, 255, $a0, 0, LassScript_0x1a61d3, -1

 	person_event SPRITE_STANDING_YOUNGSTER, 13, 20, $3, $0, 255, 255, $90, 0, StandingYoungsterScript_0x1a61d6, EVENT_7CF

--- a/maps/Route40BattleTowerGate.asm

+++ b/maps/Route40BattleTowerGate.asm

@@ -89,4 +89,4 @@

 	; people-events

 	db 2

 	person_event SPRITE_ROCKER, 7, 7, $3, $0, 255, 255, $a0, 0, RockerScript_0x9f669, EVENT_7CF

-	person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, EVENT_ALWAYS_THERE

+	person_event SPRITE_TWIN, 9, 11, $4, $10, 255, 255, $80, 0, TwinScript_0x9f66c, -1

--- a/maps/Route41.asm

+++ b/maps/Route41.asm

@@ -510,13 +510,13 @@

 	; people-events

 	db 10

-	person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, EVENT_ALWAYS_THERE

-	person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, EVENT_ALWAYS_THERE

-	person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, EVENT_ALWAYS_THERE

-	person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, EVENT_ALWAYS_THERE

-	person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, EVENT_ALWAYS_THERE

-	person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, EVENT_ALWAYS_THERE

+	person_event SPRITE_OLIVINE_RIVAL, 10, 36, $a, $0, 255, 255, $82, 3, TrainerSwimmermCharlie, -1

+	person_event SPRITE_OLIVINE_RIVAL, 12, 50, $a, $0, 255, 255, $82, 3, TrainerSwimmermGeorge, -1

+	person_event SPRITE_OLIVINE_RIVAL, 30, 24, $1e, $0, 255, 255, $82, 3, TrainerSwimmermBerke, -1

+	person_event SPRITE_OLIVINE_RIVAL, 34, 36, $1f, $0, 255, 255, $82, 3, TrainerSwimmermKirk, -1

+	person_event SPRITE_OLIVINE_RIVAL, 50, 23, $1e, $0, 255, 255, $82, 3, TrainerSwimmermMathew, -1

+	person_event SPRITE_SWIMMER_GIRL, 8, 21, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfKaylee, -1

+	person_event SPRITE_SWIMMER_GIRL, 23, 27, $7, $0, 255, 255, $a2, 3, TrainerSwimmerfSusie, -1

+	person_event SPRITE_SWIMMER_GIRL, 38, 31, $8, $0, 255, 255, $a2, 3, TrainerSwimmerfDenise, -1

+	person_event SPRITE_SWIMMER_GIRL, 32, 48, $9, $0, 255, 255, $a2, 4, TrainerSwimmerfKara, -1

+	person_event SPRITE_SWIMMER_GIRL, 54, 13, $a, $0, 255, 255, $a2, 2, TrainerSwimmerfWendy, -1

--- a/maps/Route42.asm

+++ b/maps/Route42.asm

@@ -385,12 +385,12 @@

 	; people-events

 	db 9

-	person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 14, 44, $8, $0, 255, 255, $a2, 1, TrainerFisherTully1, -1

+	person_event SPRITE_POKEFAN_M, 13, 55, $a, $0, 255, 255, $b2, 3, TrainerHikerBenjamin, -1

+	person_event SPRITE_SUPER_NERD, 12, 51, $6, $0, 255, 255, $92, 3, TrainerPokemaniacShane, -1

+	person_event SPRITE_FRUIT_TREE, 20, 31, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934d, -1

+	person_event SPRITE_FRUIT_TREE, 20, 32, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a934f, -1

+	person_event SPRITE_FRUIT_TREE, 20, 33, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9351, -1

 	person_event SPRITE_POKE_BALL, 8, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a9349, EVENT_6B3

 	person_event SPRITE_POKE_BALL, 12, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a934b, EVENT_6B4

 	person_event SPRITE_SUICUNE, 20, 30, $1, $0, 255, 255, $90, 0, ObjectEvent, EVENT_SAW_SUICUNE_ON_ROUTE_42

--- a/maps/Route42EcruteakGate.asm

+++ b/maps/Route42EcruteakGate.asm

@@ -35,4 +35,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $80, 0, OfficerScript_0x19a4b5, -1

--- a/maps/Route43.asm

+++ b/maps/Route43.asm

@@ -612,11 +612,11 @@

 	; people-events

 	db 8

-	person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 9, 17, $8, $0, 255, 255, $92, 2, TrainerPokemaniacBen, -1

+	person_event SPRITE_SUPER_NERD, 24, 17, $a, $0, 255, 255, $92, 3, TrainerPokemaniacBrent1, -1

+	person_event SPRITE_SUPER_NERD, 11, 18, $6, $0, 255, 255, $92, 2, TrainerPokemaniacRon, -1

+	person_event SPRITE_FISHER, 20, 8, $9, $0, 255, 255, $a2, 4, TrainerFisherMarvin, -1

+	person_event SPRITE_LASS, 29, 13, $6, $0, 255, 255, $a2, 2, TrainerPicnickerTiffany3, -1

+	person_event SPRITE_YOUNGSTER, 44, 17, $a, $0, 255, 255, $a2, 3, TrainerCamperSpencer, -1

+	person_event SPRITE_FRUIT_TREE, 30, 5, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19d266, -1

 	person_event SPRITE_POKE_BALL, 36, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x19d268, EVENT_6B5

--- a/maps/Route43MahoganyGate.asm

+++ b/maps/Route43MahoganyGate.asm

@@ -54,4 +54,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $80, 0, OfficerScript_0x19ab0b, -1

--- a/maps/Route44.asm

+++ b/maps/Route44.asm

@@ -626,14 +626,14 @@

 	; people-events

 	db 11

-	person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHER, 7, 39, $6, $0, 255, 255, $a2, 1, TrainerFisherWilton1, -1

+	person_event SPRITE_FISHER, 17, 23, $9, $0, 255, 255, $a2, 1, TrainerFisherEdgar, -1

+	person_event SPRITE_YOUNGSTER, 13, 14, $1f, $0, 255, 255, $92, 3, TrainerPsychicPhil, -1

+	person_event SPRITE_SUPER_NERD, 6, 47, $1f, $0, 255, 255, $a2, 3, TrainerPokemaniacZach, -1

+	person_event SPRITE_YOUNGSTER, 9, 55, $6, $0, 255, 255, $a2, 2, TrainerBird_keeperVance1, -1

+	person_event SPRITE_COOLTRAINER_M, 19, 45, $8, $0, 255, 255, $82, 5, TrainerCooltrainermAllen, -1

+	person_event SPRITE_COOLTRAINER_F, 18, 35, $8, $0, 255, 255, $82, 5, TrainerCooltrainerfCybil, -1

+	person_event SPRITE_FRUIT_TREE, 9, 13, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19da40, -1

 	person_event SPRITE_POKE_BALL, 12, 34, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da42, EVENT_6B6

 	person_event SPRITE_POKE_BALL, 8, 49, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da44, EVENT_6B7

 	person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x19da46, EVENT_7BD

--- a/maps/Route45.asm

+++ b/maps/Route45.asm

@@ -648,16 +648,16 @@

 	; people-events

 	db 13

-	person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, EVENT_ALWAYS_THERE

-	person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 20, 14, $9, $0, 255, 255, $b2, 1, TrainerHikerErik, -1

+	person_event SPRITE_POKEFAN_M, 69, 19, $9, $0, 255, 255, $b2, 2, TrainerHikerMichael, -1

+	person_event SPRITE_POKEFAN_M, 32, 9, $7, $0, 255, 255, $b2, 2, TrainerHikerParry, -1

+	person_event SPRITE_POKEFAN_M, 69, 13, $8, $0, 255, 255, $b2, 1, TrainerHikerTimothy, -1

+	person_event SPRITE_BLACK_BELT, 54, 15, $a, $0, 255, 255, $b2, 2, TrainerBlackbeltKenji, -1

+	person_event SPRITE_COOLTRAINER_M, 22, 21, $8, $0, 255, 255, $82, 1, TrainerCooltrainermRyan, -1

+	person_event SPRITE_COOLTRAINER_F, 40, 9, $a, $0, 255, 255, $82, 3, TrainerCooltrainerfKelly, -1

+	person_event SPRITE_FRUIT_TREE, 86, 20, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x19e294, -1

 	person_event SPRITE_POKE_BALL, 55, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e296, EVENT_6B8

 	person_event SPRITE_POKE_BALL, 70, 9, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e298, EVENT_6B9

 	person_event SPRITE_POKE_BALL, 24, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29a, EVENT_6BA

 	person_event SPRITE_POKE_BALL, 37, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x19e29c, EVENT_6BB

-	person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 74, 8, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x19e269, -1

--- a/maps/Route46.asm

+++ b/maps/Route46.asm

@@ -309,9 +309,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 23, 16, $8, $0, 255, 255, $b2, 2, TrainerHikerBailey, -1

+	person_event SPRITE_YOUNGSTER, 18, 8, $7, $0, 255, 255, $a2, 2, TrainerCamperTed, -1

+	person_event SPRITE_LASS, 17, 6, $6, $0, 255, 255, $a2, 2, TrainerPicnickerErin1, -1

+	person_event SPRITE_FRUIT_TREE, 9, 11, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a978f, -1

+	person_event SPRITE_FRUIT_TREE, 10, 12, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a9791, -1

 	person_event SPRITE_POKE_BALL, 19, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a978d, EVENT_6BC

--- a/maps/Route5CleanseTagSpeechHouse.asm

+++ b/maps/Route5CleanseTagSpeechHouse.asm

@@ -75,5 +75,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRANNY, 9, 6, $1f, $0, 255, 255, $b0, 0, GrannyScript_0x18b634, -1

+	person_event SPRITE_TEACHER, 7, 9, $8, $0, 255, 255, $80, 0, TeacherScript_0x18b64f, -1

--- a/maps/Route5SaffronCityGate.asm

+++ b/maps/Route5SaffronCityGate.asm

@@ -36,4 +36,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x18b5b9, -1

--- a/maps/Route5UndergroundEntrance.asm

+++ b/maps/Route5UndergroundEntrance.asm

@@ -34,4 +34,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 6, 6, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18b555, -1

--- a/maps/Route6.asm

+++ b/maps/Route6.asm

@@ -137,5 +137,5 @@

 	; people-events

 	db 3

 	person_event SPRITE_POKEFAN_M, 8, 21, $6, $0, 255, 255, $b0, 2, PokefanMScript_0x1ad951, EVENT_771

-	person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 16, 13, $9, $0, 255, 255, $82, 0, TrainerPokefanmRex, -1

+	person_event SPRITE_POKEFAN_M, 16, 14, $8, $0, 255, 255, $82, 0, TrainerPokefanmAllan, -1

--- a/maps/Route6SaffronGate.asm

+++ b/maps/Route6SaffronGate.asm

@@ -75,4 +75,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 8, 4, $9, $0, 255, 255, $90, 0, OfficerScript_0x1926ea, -1

--- a/maps/Route7SaffronGate.asm

+++ b/maps/Route7SaffronGate.asm

@@ -61,4 +61,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x73518, -1

--- a/maps/Route8.asm

+++ b/maps/Route8.asm

@@ -263,9 +263,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, EVENT_ALWAYS_THERE

-	person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, EVENT_ALWAYS_THERE

-	person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, EVENT_ALWAYS_THERE

+	person_event SPRITE_BIKER, 12, 14, $8, $0, 255, 255, $82, 5, TrainerBikerDwayne, -1

+	person_event SPRITE_BIKER, 13, 14, $8, $0, 255, 255, $a2, 5, TrainerBikerHarris, -1

+	person_event SPRITE_BIKER, 14, 14, $8, $0, 255, 255, $92, 5, TrainerBikerZeke, -1

+	person_event SPRITE_SUPER_NERD, 6, 27, $6, $0, 255, 255, $b2, 3, TrainerSupernerdSam, -1

+	person_event SPRITE_SUPER_NERD, 16, 35, $a, $0, 255, 255, $b2, 4, TrainerSupernerdTom, -1

+	person_event SPRITE_FRUIT_TREE, 9, 37, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x6c06c, -1

--- a/maps/Route8SaffronGate.asm

+++ b/maps/Route8SaffronGate.asm

@@ -35,4 +35,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 6, 9, $6, $0, 255, 255, $90, 0, OfficerScript_0x7f416, -1

--- a/maps/Route9.asm

+++ b/maps/Route9.asm

@@ -313,9 +313,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 15, 27, $8, $0, 255, 255, $a2, 3, TrainerCamperDean, -1

+	person_event SPRITE_LASS, 12, 43, $a, $0, 255, 255, $a2, 3, TrainerPicnickerHeidi, -1

+	person_event SPRITE_YOUNGSTER, 8, 15, $a, $0, 255, 255, $a2, 5, TrainerCamperSid, -1

+	person_event SPRITE_LASS, 19, 16, $7, $0, 255, 255, $a2, 1, TrainerPicnickerEdna, -1

+	person_event SPRITE_POKEFAN_M, 7, 32, $9, $0, 255, 255, $b2, 2, TrainerHikerTim, -1

+	person_event SPRITE_POKEFAN_M, 19, 40, $9, $0, 255, 255, $b2, 4, TrainerHikerSidney, -1

--- a/maps/RuinsofAlphKabutoChamber.asm

+++ b/maps/RuinsofAlphKabutoChamber.asm

@@ -285,4 +285,4 @@

 	; people-events

 	db 2

 	person_event SPRITE_RECEPTIONIST, 9, 9, $6, $0, 255, 255, $0, 0, ReceptionistScript_0x58769, EVENT_74E

-	person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, EVENT_ALWAYS_THERE

+	person_event SPRITE_SCIENTIST, 5, 7, $7, $0, 255, 255, $90, 0, ScientistScript_0x587a8, -1

--- a/maps/RuinsofAlphOutside.asm

+++ b/maps/RuinsofAlphOutside.asm

@@ -343,7 +343,7 @@

 	; people-events

 	db 5

-	person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, EVENT_ALWAYS_THERE

+	person_event SPRITE_YOUNGSTER, 24, 8, $6, $0, 255, 255, $2, 1, TrainerPsychicNathan, -1

 	person_event SPRITE_SCIENTIST, 19, 15, $7, $0, 255, 255, $0, 0, ScientistScript_0x58043, EVENT_703

 	person_event SPRITE_FISHER, 21, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x58061, EVENT_78E

 	person_event SPRITE_YOUNGSTER, 15, 18, $2, $11, 255, 255, $b0, 0, YoungsterScript_0x58076, EVENT_78F

--- a/maps/RuinsofAlphResearchCenter.asm

+++ b/maps/RuinsofAlphResearchCenter.asm

@@ -412,6 +412,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, EVENT_ALWAYS_THERE

-	person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, EVENT_ALWAYS_THERE

+	person_event SPRITE_SCIENTIST, 9, 8, $7, $0, 255, 255, $90, 0, ScientistScript_0x591e5, -1

+	person_event SPRITE_SCIENTIST, 6, 9, $2, $12, 255, 255, $90, 0, ScientistScript_0x59214, -1

 	person_event SPRITE_SCIENTIST, 9, 6, $7, $0, 255, 255, $90, 0, ScientistScript_0x591d1, EVENT_704

--- a/maps/SafariZoneWardensHome.asm

+++ b/maps/SafariZoneWardensHome.asm

@@ -94,4 +94,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 8, 6, $9, $0, 255, 255, $a0, 0, WardensGranddaughter, -1

--- a/maps/SaffronCity.asm

+++ b/maps/SaffronCity.asm

@@ -295,11 +295,11 @@

 	; people-events

 	db 8

-	person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 18, 11, $5, $2, 255, 255, $80, 0, LassScript_0x19932a, -1

+	person_event SPRITE_POKEFAN_M, 34, 23, $5, $2, 255, 255, $b0, 0, PokefanMScript_0x19933e, -1

+	person_event SPRITE_COOLTRAINER_M, 11, 36, $5, $1, 255, 255, $a0, 0, CooltrainerMScript_0x199352, -1

+	person_event SPRITE_COOLTRAINER_F, 28, 24, $5, $2, 255, 255, $80, 0, CooltrainerFScript_0x199355, -1

+	person_event SPRITE_FISHER, 16, 31, $6, $0, 255, 255, $a0, 0, FisherScript_0x199358, -1

+	person_event SPRITE_YOUNGSTER, 23, 19, $4, $10, 255, 255, $90, 0, YoungsterScript_0x19936c, -1

+	person_event SPRITE_YOUNGSTER, 26, 39, $2, $11, 255, 255, $80, 0, YoungsterScript_0x19936f, -1

+	person_event SPRITE_LASS, 12, 23, $3, $0, 255, 255, $a0, 0, LassScript_0x199372, -1

--- a/maps/SaffronGym.asm

+++ b/maps/SaffronGym.asm

@@ -394,9 +394,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_SABRINA, 12, 13, $6, $0, 255, 255, $80, 0, SabrinaScript_0x189c2e, -1

+	person_event SPRITE_GRANNY, 20, 21, $a, $0, 255, 255, $b2, 3, TrainerMediumRebecca, -1

+	person_event SPRITE_YOUNGSTER, 20, 7, $a, $0, 255, 255, $92, 3, TrainerPsychicFranklin, -1

+	person_event SPRITE_GRANNY, 8, 7, $a, $0, 255, 255, $b2, 2, TrainerMediumDoris, -1

+	person_event SPRITE_YOUNGSTER, 8, 21, $a, $0, 255, 255, $92, 2, TrainerPsychicJared, -1

+	person_event SPRITE_GYM_GUY, 18, 13, $6, $0, 255, 255, $90, 0, SaffronGymGuyScript, -1

--- a/maps/SaffronMart.asm

+++ b/maps/SaffronMart.asm

@@ -49,6 +49,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x18a3bf, -1

+	person_event SPRITE_COOLTRAINER_M, 6, 11, $3, $0, 255, 255, $b0, 0, CooltrainerMScript_0x18a3c6, -1

+	person_event SPRITE_COOLTRAINER_F, 10, 11, $5, $1, 255, 255, $a0, 0, CooltrainerFScript_0x18a3c9, -1

--- a/maps/SaffronPokeCenter1F.asm

+++ b/maps/SaffronPokeCenter1F.asm

@@ -123,7 +123,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x18a47d, -1

+	person_event SPRITE_TEACHER, 6, 11, $2, $11, 255, 255, $a0, 0, TeacherScript_0x18a480, -1

+	person_event SPRITE_FISHER, 10, 12, $8, $0, 255, 255, $80, 0, FisherScript_0x18a48c, -1

+	person_event SPRITE_YOUNGSTER, 8, 5, $3, $0, 255, 255, $90, 0, YoungsterScript_0x18a4a0, -1

--- a/maps/SaffronTrainStation.asm

+++ b/maps/SaffronTrainStation.asm

@@ -231,7 +231,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 13, 13, $6, $0, 255, 255, $0, 0, OfficerScript_0x18a81e, -1

+	person_event SPRITE_GYM_GUY, 18, 14, $2, $11, 255, 255, $0, 0, GymGuyScript_0x18a875, -1

 	person_event SPRITE_TEACHER, 15, 10, $9, $0, 255, 255, $0, 0, TeacherScript_0x18a889, EVENT_772

 	person_event SPRITE_LASS, 14, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x18a88c, EVENT_772

--- a/maps/SeafoamGym.asm

+++ b/maps/SeafoamGym.asm

@@ -171,5 +171,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, EVENT_ALWAYS_THERE

+	person_event SPRITE_BLAINE, 6, 9, $6, $0, 255, 255, $b0, 0, BlaineScript_0x1ab4fb, -1

 	person_event SPRITE_GYM_GUY, 9, 10, $7, $0, 255, 255, $90, 0, SeafoamGymGuyScript, EVENT_777

--- a/maps/SilphCo1F.asm

+++ b/maps/SilphCo1F.asm

@@ -68,5 +68,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, EVENT_ALWAYS_THERE

-	person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 6, 8, $6, $0, 255, 255, $90, 0, ReceptionistScript_0x18abe5, -1

+	person_event SPRITE_OFFICER, 5, 17, $6, $0, 255, 255, $90, 0, OfficerScript_0x18abe8, -1

--- a/maps/SilverCavePokeCenter1F.asm

+++ b/maps/SilverCavePokeCenter1F.asm

@@ -43,5 +43,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x1ae59a, -1

+	person_event SPRITE_GRANNY, 9, 5, $8, $12, 255, 255, $0, 0, GrannyScript_0x1ae59d, -1

--- a/maps/SlowpokeWellB1F.asm

+++ b/maps/SlowpokeWellB1F.asm

@@ -397,5 +397,5 @@

 	person_event SPRITE_SLOWPOKE, 8, 11, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a681, EVENT_6FB

 	person_event SPRITE_SLOWPOKE, 6, 10, $1, $0, 255, 255, $80, 0, SlowpokeScript_0x5a695, EVENT_6FB

 	person_event SPRITE_KURT, 18, 20, $7, $0, 255, 255, $0, 0, KurtScript_0x5a5d5, EVENT_740

-	person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, EVENT_ALWAYS_THERE

+	person_event SPRITE_BOULDER, 6, 7, $19, $0, 255, 255, $0, 0, SlowpokeWellB1FBoulder, -1

 	person_event SPRITE_POKE_BALL, 7, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a6a3, EVENT_662

--- a/maps/SlowpokeWellB2F.asm

+++ b/maps/SlowpokeWellB2F.asm

@@ -73,5 +73,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, EVENT_ALWAYS_THERE

+	person_event SPRITE_GYM_GUY, 8, 9, $2, $21, 255, 255, $0, 1, GymGuyScript_0x5ad0b, -1

 	person_event SPRITE_POKE_BALL, 9, 19, $1, $0, 255, 255, $1, 0, ItemFragment_0x5ad28, EVENT_663

--- a/maps/SoulHouse.asm

+++ b/maps/SoulHouse.asm

@@ -83,7 +83,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 6, 8, $6, $0, 255, 255, $90, 0, GrampsScript_0x7ec47, -1

+	person_event SPRITE_TEACHER, 7, 11, $5, $1, 255, 255, $90, 0, TeacherScript_0x7ec4a, -1

+	person_event SPRITE_LASS, 9, 6, $7, $0, 255, 255, $90, 0, LassScript_0x7ec4d, -1

+	person_event SPRITE_GRANNY, 7, 5, $7, $0, 255, 255, $90, 0, GrannyScript_0x7ec50, -1

--- a/maps/SproutTower1F.asm

+++ b/maps/SproutTower1F.asm

@@ -132,9 +132,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, EVENT_ALWAYS_THERE

-	person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAGE, 8, 11, $6, $0, 255, 255, $90, 0, SageScript_0x1844fe, -1

+	person_event SPRITE_SAGE, 11, 10, $2, $11, 255, 255, $90, 0, SageScript_0x184501, -1

+	person_event SPRITE_GRANNY, 16, 15, $8, $0, 255, 255, $0, 0, GrannyScript_0x184504, -1

+	person_event SPRITE_TEACHER, 13, 13, $7, $0, 255, 255, $0, 0, TeacherScript_0x184507, -1

+	person_event SPRITE_SAGE, 9, 7, $7, $0, 255, 255, $92, 4, TrainerSageChow, -1

 	person_event SPRITE_POKE_BALL, 11, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x18451e, EVENT_647

--- a/maps/SproutTower2F.asm

+++ b/maps/SproutTower2F.asm

@@ -131,6 +131,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAGE, 7, 16, $a, $0, 255, 255, $92, 4, TrainerSageNico, -1

+	person_event SPRITE_SAGE, 18, 13, $8, $0, 255, 255, $92, 5, TrainerSageEdmond, -1

 	person_event SPRITE_POKE_BALL, 5, 7, $1, $0, 255, 255, $1, 0, ItemFragment_0x1847a7, EVENT_648

--- a/maps/SproutTower3F.asm

+++ b/maps/SproutTower3F.asm

@@ -393,10 +393,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAGE, 17, 12, $9, $0, 255, 255, $92, 3, TrainerSageJin, -1

+	person_event SPRITE_SAGE, 12, 12, $6, $0, 255, 255, $92, 2, TrainerSageTroy, -1

+	person_event SPRITE_SAGE, 6, 14, $6, $0, 255, 255, $90, 0, SageLiScript, -1

+	person_event SPRITE_SAGE, 15, 15, $8, $0, 255, 255, $92, 3, TrainerSageNeal, -1

 	person_event SPRITE_POKE_BALL, 18, 10, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a19, EVENT_649

 	person_event SPRITE_POKE_BALL, 5, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x184a1b, EVENT_64A

 	person_event SPRITE_SILVER, 8, 14, $7, $0, 255, 255, $0, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER

--- a/maps/TrainerHouse1F.asm

+++ b/maps/TrainerHouse1F.asm

@@ -151,8 +151,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 15, 4, $9, $0, 255, 255, $a0, 0, ReceptionistScript_0x9af67, -1

+	person_event SPRITE_COOLTRAINER_M, 15, 11, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9af6a, -1

+	person_event SPRITE_COOLTRAINER_F, 6, 10, $6, $2, 255, 255, $80, 0, CooltrainerFScript_0x9af6d, -1

+	person_event SPRITE_YOUNGSTER, 12, 8, $5, $2, 255, 255, $80, 0, YoungsterScript_0x9af70, -1

+	person_event SPRITE_GENTLEMAN, 8, 6, $9, $0, 255, 255, $0, 0, GentlemanScript_0x9af73, -1

--- a/maps/TrainerHouseB1F.asm

+++ b/maps/TrainerHouseB1F.asm

@@ -184,5 +184,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, EVENT_ALWAYS_THERE

-	person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, EVENT_ALWAYS_THERE

+	person_event SPRITE_RECEPTIONIST, 5, 11, $6, $0, 255, 255, $a0, 0, ObjectEvent, -1

+	person_event SPRITE_CHRIS, 15, 10, $8, $0, 255, 255, $80, 0, ObjectEvent, -1

--- a/maps/UndergroundPathSwitchRoomEntrances.asm

+++ b/maps/UndergroundPathSwitchRoomEntrances.asm

@@ -1027,8 +1027,8 @@

 	person_event SPRITE_ROCKET, 6, 15, $6, $0, 255, 255, $2, 3, TrainerGruntM11, EVENT_6CE

 	person_event SPRITE_ROCKET, 6, 7, $6, $0, 255, 255, $2, 3, TrainerGruntM25, EVENT_6CE

 	person_event SPRITE_ROCKET_GIRL, 16, 23, $6, $0, 255, 255, $82, 1, TrainerGruntF3, EVENT_6CE

-	person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 31, 7, $6, $0, 255, 255, $0, 0, TeacherScript_0x7ca7d, -1

+	person_event SPRITE_SUPER_NERD, 31, 23, $6, $0, 255, 255, $0, 0, SuperNerdScript_0x7ca7a, -1

 	person_event SPRITE_POKE_BALL, 16, 5, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7d, EVENT_673

 	person_event SPRITE_POKE_BALL, 13, 18, $1, $0, 255, 255, $1, 0, ItemFragment_0x7ce7f, EVENT_674

 	person_event SPRITE_SILVER, 7, 27, $6, $0, 255, 255, $0, 0, ObjectEvent, EVENT_6C1

--- a/maps/UnionCave1F.asm

+++ b/maps/UnionCave1F.asm

@@ -287,11 +287,11 @@

 	; people-events

 	db 9

-	person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 10, 7, $9, $0, 255, 255, $b2, 2, TrainerHikerDaniel, -1

+	person_event SPRITE_SUPER_NERD, 25, 8, $a, $0, 255, 255, $92, 3, TrainerPokemaniacLarry, -1

+	person_event SPRITE_POKEFAN_M, 12, 15, $a, $0, 255, 255, $b2, 1, TrainerHikerRussell, -1

+	person_event SPRITE_FISHER, 31, 19, $8, $0, 255, 255, $82, 4, TrainerFirebreatherRay, -1

+	person_event SPRITE_FISHER, 23, 18, $7, $0, 255, 255, $82, 4, TrainerFirebreatherBill, -1

 	person_event SPRITE_POKE_BALL, 25, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c00, EVENT_65A

 	person_event SPRITE_POKE_BALL, 6, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c02, EVENT_65B

 	person_event SPRITE_POKE_BALL, 21, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x59c04, EVENT_65C

--- a/maps/UnionCaveB1F.asm

+++ b/maps/UnionCaveB1F.asm

@@ -227,10 +227,10 @@

 	; people-events

 	db 7

-	person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, EVENT_ALWAYS_THERE

-	person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 8, 13, $a, $0, 255, 255, $b2, 3, TrainerHikerPhillip, -1

+	person_event SPRITE_POKEFAN_M, 11, 20, $6, $0, 255, 255, $b2, 3, TrainerHikerLeonard, -1

+	person_event SPRITE_SUPER_NERD, 36, 9, $8, $0, 255, 255, $92, 3, TrainerPokemaniacAndrew, -1

+	person_event SPRITE_SUPER_NERD, 34, 21, $8, $0, 255, 255, $92, 3, TrainerPokemaniacCalvin, -1

 	person_event SPRITE_POKE_BALL, 20, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a016, EVENT_65E

-	person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, EVENT_ALWAYS_THERE

+	person_event SPRITE_BOULDER, 14, 11, $19, $0, 255, 255, $0, 0, UnionCaveB1FBoulder, -1

 	person_event SPRITE_POKE_BALL, 27, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a018, EVENT_65F

--- a/maps/UnionCaveB2F.asm

+++ b/maps/UnionCaveB2F.asm

@@ -200,9 +200,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, EVENT_ALWAYS_THERE

+	person_event SPRITE_ROCKER, 23, 19, $6, $0, 255, 255, $82, 3, TrainerCooltrainermNick, -1

+	person_event SPRITE_COOLTRAINER_F, 17, 9, $a, $0, 255, 255, $82, 1, TrainerCooltrainerfGwen, -1

+	person_event SPRITE_COOLTRAINER_F, 34, 7, $7, $0, 255, 255, $82, 3, TrainerCooltrainerfEmma, -1

 	person_event SPRITE_POKE_BALL, 6, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36a, EVENT_660

 	person_event SPRITE_POKE_BALL, 23, 16, $1, $0, 255, 255, $1, 0, ItemFragment_0x5a36c, EVENT_661

 	person_event SPRITE_SURF, 35, 15, $24, $11, 255, 255, $90, 0, SurfScript_0x5a31f, EVENT_760

--- a/maps/VermilionCity.asm

+++ b/maps/VermilionCity.asm

@@ -295,9 +295,9 @@

 	; people-events

 	db 6

-	person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, EVENT_ALWAYS_THERE

-	person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 13, 22, $2, $11, 255, 255, $0, 0, TeacherScript_0x1aa983, -1

+	person_event SPRITE_GRAMPS, 10, 27, $9, $0, 255, 255, $0, 0, GrampsScript_0x1aa986, -1

+	person_event SPRITE_MACHOP, 11, 30, $16, $0, 255, 255, $90, 0, VermilionMachop, -1

+	person_event SPRITE_SUPER_NERD, 20, 18, $2, $11, 255, 255, $a0, 0, SuperNerdScript_0x1aa99b, -1

 	person_event SPRITE_BIG_SNORLAX, 12, 38, $15, $0, 255, 255, $0, 0, VermilionSnorlax, EVENT_770

-	person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 16, 35, $6, $0, 255, 255, $80, 0, VermilionGymBadgeGuy, -1

--- a/maps/VermilionGym.asm

+++ b/maps/VermilionGym.asm

@@ -335,8 +335,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, EVENT_ALWAYS_THERE

-	person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_SURGE, 6, 9, $6, $0, 255, 255, $b0, 0, SurgeScript_0x1920a5, -1

+	person_event SPRITE_GENTLEMAN, 12, 12, $8, $0, 255, 255, $92, 4, TrainerGentlemanGregory, -1

+	person_event SPRITE_ROCKER, 11, 8, $6, $3, 255, 255, $82, 3, TrainerGuitaristVincent, -1

+	person_event SPRITE_SUPER_NERD, 14, 4, $9, $0, 255, 255, $92, 4, TrainerJugglerHorton, -1

+	person_event SPRITE_GYM_GUY, 19, 11, $6, $0, 255, 255, $90, 1, VermilionGymGuyScript, -1

--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm

+++ b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm

@@ -34,4 +34,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, EVENT_ALWAYS_THERE

+	person_event SPRITE_GENTLEMAN, 7, 5, $4, $10, 255, 255, $80, 0, GentlemanScript_0x192031, -1

--- a/maps/VermilionHouseFishingSpeechHouse.asm

+++ b/maps/VermilionHouseFishingSpeechHouse.asm

@@ -65,4 +65,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, EVENT_ALWAYS_THERE

+	person_event SPRITE_FISHING_GURU, 8, 6, $6, $0, 255, 255, $a0, 0, FishingDude, -1

--- a/maps/VermilionMagnetTrainSpeechHouse.asm

+++ b/maps/VermilionMagnetTrainSpeechHouse.asm

@@ -48,5 +48,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_F, 7, 6, $8, $0, 255, 255, $0, 0, PokefanFScript_0x191eb7, -1

+	person_event SPRITE_YOUNGSTER, 7, 4, $a, $0, 255, 255, $a0, 0, YoungsterScript_0x191eba, -1

--- a/maps/VermilionMart.asm

+++ b/maps/VermilionMart.asm

@@ -48,6 +48,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x191f7e, -1

+	person_event SPRITE_SUPER_NERD, 6, 9, $6, $0, 255, 255, $80, 0, SuperNerdScript_0x191f85, -1

+	person_event SPRITE_BUENA, 10, 12, $5, $1, 255, 255, $a0, 0, BuenaScript_0x191f88, -1

--- a/maps/VermilionPokeCenter1F.asm

+++ b/maps/VermilionPokeCenter1F.asm

@@ -88,7 +88,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, EVENT_ALWAYS_THERE

-	person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x191603, -1

+	person_event SPRITE_FISHING_GURU, 6, 11, $6, $0, 255, 255, $80, 0, FishingGuruScript_0x191606, -1

+	person_event SPRITE_SAILOR, 9, 10, $4, $10, 255, 255, $90, 0, SailorScript_0x19161a, -1

+	person_event SPRITE_BUG_CATCHER, 9, 5, $3, $0, 255, 255, $a0, 0, BugCatcherScript_0x19161d, -1

--- a/maps/VermilionPort.asm

+++ b/maps/VermilionPort.asm

@@ -319,5 +319,5 @@

 	; people-events

 	db 3

 	person_event SPRITE_SAILOR, 21, 11, $7, $0, 255, 255, $0, 0, SailorScript_0x74dc4, EVENT_72B

-	person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, EVENT_ALWAYS_THERE

+	person_event SPRITE_SAILOR, 15, 10, $9, $0, 255, 255, $0, 0, SailorScript_0x74e97, -1

+	person_event SPRITE_SUPER_NERD, 15, 15, $5, $2, 255, 255, $0, 0, SuperNerdScript_0x74ee6, -1

--- a/maps/VermilionPortPassage.asm

+++ b/maps/VermilionPortPassage.asm

@@ -35,4 +35,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 5, 21, $8, $0, 255, 255, $0, 0, TeacherScript_0x7701a, -1

--- a/maps/VictoryRoadGate.asm

+++ b/maps/VictoryRoadGate.asm

@@ -118,6 +118,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, EVENT_ALWAYS_THERE

+	person_event SPRITE_OFFICER, 15, 12, $9, $0, 255, 255, $0, 0, OfficerScript_0x9ba03, -1

 	person_event SPRITE_BLACK_BELT, 9, 11, $9, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba21, EVENT_OPENED_MT_SILVER

 	person_event SPRITE_BLACK_BELT, 9, 16, $8, $0, 255, 255, $0, 0, BlackBeltScript_0x9ba24, EVENT_FOUGHT_SNORLAX

--- a/maps/VioletCity.asm

+++ b/maps/VioletCity.asm

@@ -303,10 +303,10 @@

 	; people-events

 	db 8

 	person_event SPRITE_FISHER, 20, 17, $3, $0, 255, 255, $a0, 0, FisherScript_0x1a83bb, EVENT_6CA

-	person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, EVENT_ALWAYS_THERE

-	person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, EVENT_ALWAYS_THERE

+	person_event SPRITE_LASS, 32, 32, $2, $22, 255, 255, $a0, 0, LassScript_0x1a8403, -1

+	person_event SPRITE_SUPER_NERD, 18, 28, $2, $21, 255, 255, $80, 0, SuperNerdScript_0x1a8406, -1

+	person_event SPRITE_GRAMPS, 24, 21, $5, $1, 255, 255, $0, 0, GrampsScript_0x1a8409, -1

+	person_event SPRITE_YOUNGSTER, 22, 9, $3, $0, 255, 255, $a0, 0, YoungsterScript_0x1a840c, -1

+	person_event SPRITE_FRUIT_TREE, 33, 18, $1, $0, 255, 255, $0, 0, FruitTreeScript_0x1a8425, -1

 	person_event SPRITE_POKE_BALL, 5, 8, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8421, EVENT_643

 	person_event SPRITE_POKE_BALL, 9, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x1a8423, EVENT_644

--- a/maps/VioletGym.asm

+++ b/maps/VioletGym.asm

@@ -326,7 +326,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, EVENT_ALWAYS_THERE

-	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, EVENT_ALWAYS_THERE

+	person_event SPRITE_FALKNER, 5, 9, $6, $0, 255, 255, $90, 0, FalknerScript_0x683c2, -1

+	person_event SPRITE_YOUNGSTER, 10, 11, $8, $2, 255, 255, $92, 3, TrainerBird_keeperRod, -1

+	person_event SPRITE_YOUNGSTER, 14, 6, $9, $2, 255, 255, $92, 3, TrainerBird_keeperAbe, -1

+	person_event SPRITE_GYM_GUY, 17, 11, $6, $0, 255, 255, $80, 0, VioletGymGuyScript, -1

--- a/maps/VioletMart.asm

+++ b/maps/VioletMart.asm

@@ -60,6 +60,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x68295, -1

+	person_event SPRITE_GRANNY, 10, 11, $5, $1, 255, 255, $0, 0, GrannyScript_0x6829c, -1

+	person_event SPRITE_COOLTRAINER_M, 6, 9, $3, $0, 255, 255, $80, 0, CooltrainerMScript_0x6829f, -1

--- a/maps/VioletNicknameSpeechHouse.asm

+++ b/maps/VioletNicknameSpeechHouse.asm

@@ -56,6 +56,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, EVENT_ALWAYS_THERE

-	person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, EVENT_ALWAYS_THERE

+	person_event SPRITE_TEACHER, 7, 6, $9, $0, 255, 255, $0, 0, TeacherScript_0x693e9, -1

+	person_event SPRITE_LASS, 8, 10, $7, $0, 255, 255, $a0, 0, LassScript_0x693ec, -1

+	person_event SPRITE_BIRD, 6, 9, $5, $1, 255, 255, $b0, 0, BirdScript_0x693ef, -1

--- a/maps/VioletOnixTradeHouse.asm

+++ b/maps/VioletOnixTradeHouse.asm

@@ -45,5 +45,5 @@

 	; people-events

 	db 2

-	person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 7, 6, $3, $0, 255, 255, $0, 0, PokefanMScript_0x6998d, -1

+	person_event SPRITE_YOUNGSTER, 9, 10, $4, $20, 255, 255, $80, 0, YoungsterScript_0x69990, -1

--- a/maps/VioletPokeCenter1F.asm

+++ b/maps/VioletPokeCenter1F.asm

@@ -226,8 +226,8 @@

 	; people-events

 	db 5

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, EVENT_ALWAYS_THERE

-	person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, EVENT_ALWAYS_THERE

-	person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x694c9, -1

+	person_event SPRITE_GAMEBOY_KID, 10, 11, $6, $0, 255, 255, $a0, 0, GameboyKidScript_0x69540, -1

+	person_event SPRITE_GENTLEMAN, 8, 5, $3, $0, 255, 255, $0, 0, GentlemanScript_0x69543, -1

+	person_event SPRITE_YOUNGSTER, 5, 12, $6, $0, 255, 255, $80, 0, YoungsterScript_0x69546, -1

 	person_event SPRITE_SCIENTIST, 7, 8, $6, $0, 255, 255, $90, 0, ScientistScript_0x694cc, EVENT_ELMS_AIDE_IN_VIOLET_POKEMON_CENTER

--- a/maps/ViridianCity.asm

+++ b/maps/ViridianCity.asm

@@ -237,7 +237,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, EVENT_ALWAYS_THERE

-	person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, EVENT_ALWAYS_THERE

-	person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, EVENT_ALWAYS_THERE

-	person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, EVENT_ALWAYS_THERE

+	person_event SPRITE_GRAMPS, 9, 22, $2, $22, 255, 255, $0, 0, GrampsScript_0x1a9a4c, -1

+	person_event SPRITE_GRAMPS, 12, 34, $6, $0, 255, 255, $90, 0, GrampsScript_0x1a9a61, -1

+	person_event SPRITE_FISHER, 27, 10, $6, $0, 255, 255, $80, 0, FisherScript_0x1a9a75, -1

+	person_event SPRITE_YOUNGSTER, 25, 21, $2, $33, 255, 255, $a0, 0, YoungsterScript_0x1a9a90, -1

--- a/maps/ViridianMart.asm

+++ b/maps/ViridianMart.asm

@@ -48,6 +48,6 @@

 	; people-events

 	db 3

-	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, EVENT_ALWAYS_THERE

+	person_event SPRITE_CLERK, 7, 5, $9, $0, 255, 255, $0, 0, ClerkScript_0x9b5e7, -1

+	person_event SPRITE_LASS, 6, 11, $5, $2, 255, 255, $0, 0, LassScript_0x9b5ee, -1

+	person_event SPRITE_COOLTRAINER_M, 10, 5, $7, $0, 255, 255, $0, 0, CooltrainerMScript_0x9b5f1, -1

--- a/maps/ViridianNicknameSpeechHouse.asm

+++ b/maps/ViridianNicknameSpeechHouse.asm

@@ -72,7 +72,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, EVENT_ALWAYS_THERE

-	person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, EVENT_ALWAYS_THERE

-	person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, EVENT_ALWAYS_THERE

-	person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, EVENT_ALWAYS_THERE

+	person_event SPRITE_POKEFAN_M, 8, 6, $9, $0, 255, 255, $80, 0, PokefanMScript_0x9ae3a, -1

+	person_event SPRITE_LASS, 8, 9, $7, $0, 255, 255, $a0, 0, LassScript_0x9ae3d, -1

+	person_event SPRITE_MOLTRES, 6, 9, $16, $2, 255, 255, $b0, 0, MoltresScript_0x9ae40, -1

+	person_event SPRITE_GROWLITHE, 7, 10, $16, $2, 255, 255, $90, 0, GrowlitheScript_0x9ae4a, -1

--- a/maps/ViridianPokeCenter1F.asm

+++ b/maps/ViridianPokeCenter1F.asm

@@ -83,7 +83,7 @@

 	; people-events

 	db 4

-	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, EVENT_ALWAYS_THERE

-	person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, EVENT_ALWAYS_THERE

-	person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, EVENT_ALWAYS_THERE

+	person_event SPRITE_NURSE, 5, 7, $6, $0, 255, 255, $0, 0, NurseScript_0x9b690, -1

+	person_event SPRITE_COOLTRAINER_M, 8, 12, $5, $1, 255, 255, $80, 0, CooltrainerMScript_0x9b693, -1

+	person_event SPRITE_COOLTRAINER_F, 7, 9, $7, $0, 255, 255, $90, 0, CooltrainerFScript_0x9b6a7, -1

+	person_event SPRITE_BUG_CATCHER, 10, 5, $9, $0, 255, 255, $a0, 0, BugCatcherScript_0x9b6aa, -1

--- a/maps/WarehouseEntrance.asm

+++ b/maps/WarehouseEntrance.asm

@@ -734,10 +734,10 @@

 	; people-events

 	db 9

-	person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, EVENT_ALWAYS_THERE

-	person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, EVENT_ALWAYS_THERE

+	person_event SPRITE_SUPER_NERD, 35, 9, $8, $0, 255, 255, $b2, 3, TrainerSupernerdEric, -1

+	person_event SPRITE_SUPER_NERD, 13, 10, $7, $0, 255, 255, $b2, 2, TrainerSupernerdTeru, -1

+	person_event SPRITE_SUPER_NERD, 31, 7, $a, $0, 255, 255, $92, 2, TrainerPokemaniacIssac, -1

+	person_event SPRITE_SUPER_NERD, 10, 6, $9, $0, 255, 255, $92, 3, TrainerPokemaniacDonald, -1

 	person_event SPRITE_POKE_BALL, 29, 11, $1, $0, 255, 255, $1, 0, ItemFragment_0x7c306, EVENT_672

 	person_event SPRITE_GRAMPS, 15, 11, $8, $0, 255, 255, $b0, 0, GrampsScript_0x7c146, EVENT_753

 	person_event SPRITE_SUPER_NERD, 18, 11, $8, $0, 255, 255, $90, 0, SuperNerdScript_0x7c161, EVENT_754

--- a/maps/WhirlIslandB1F.asm

+++ b/maps/WhirlIslandB1F.asm

@@ -70,4 +70,4 @@

 	person_event SPRITE_POKE_BALL, 27, 37, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c414, EVENT_693

 	person_event SPRITE_POKE_BALL, 12, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c416, EVENT_694

 	person_event SPRITE_POKE_BALL, 30, 23, $1, $0, 255, 255, $1, 0, ItemFragment_0x18c418, EVENT_695

-	person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, EVENT_ALWAYS_THERE

+	person_event SPRITE_BOULDER, 30, 27, $19, $0, 255, 255, $0, 0, WhirlIslandB1FBoulder, -1

--- a/maps/WillsRoom.asm

+++ b/maps/WillsRoom.asm

@@ -148,4 +148,4 @@

 	; people-events

 	db 1

-	person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, EVENT_ALWAYS_THERE

+	person_event SPRITE_WILL, 11, 9, $6, $0, 255, 255, $80, 0, WillScript_0x1804f8, -1

--- a/wram.asm

+++ b/wram.asm

@@ -2255,7 +2255,7 @@

 ;PoliceAtElmsLabEvent:: ; db52

 ;SalesmanMahoganyTownEvent:: ; db5c

 ;RedGyaradosEvent:: ; db5c

-	flag_array 2000

+	flag_array NUM_EVENTS

 ; db6c

 	ds 6