Add R/S/E encounters. #136

- They actually have LocationAreaEncounterRates this time!

- Make EncounterSlots.rarity nullable, since my script requires it.

pokedex/data/csv/encounter_slots.csv

@@ -153,3 +153,67 @@ id,version_group_id,encounter_method_id,slot,rarity
 152,9,5,3,5
 153,9,5,4,4
 154,9,5,5,1
+155,5,3,1,60
+156,5,3,2,20
+157,5,3,3,20
+158,5,2,1,70
+159,5,2,2,30
+160,5,4,1,40
+161,5,4,2,40
+162,5,4,3,15
+163,5,4,4,4
+164,5,4,5,1
+165,5,5,1,60
+166,5,5,2,30
+167,5,5,3,5
+168,5,5,4,4
+169,5,5,5,1
+170,5,1,1,20
+171,5,1,2,20
+172,5,1,3,10
+173,5,1,4,10
+174,5,1,5,10
+175,5,1,6,10
+176,5,1,7,5
+177,5,1,8,5
+178,5,1,9,4
+179,5,1,10,4
+180,5,1,11,1
+181,5,1,12,1
+182,5,6,1,60
+183,5,6,2,30
+184,5,6,3,5
+185,5,6,4,4
+186,5,6,5,1
+187,6,1,1,20
+188,6,1,2,20
+189,6,1,3,10
+190,6,1,4,10
+191,6,1,5,10
+192,6,1,6,10
+193,6,1,7,5
+194,6,1,8,5
+195,6,1,9,4
+196,6,1,10,4
+197,6,1,11,1
+198,6,1,12,1
+199,6,3,1,60
+200,6,3,2,20
+201,6,3,3,20
+202,6,2,1,70
+203,6,2,2,30
+204,6,4,1,40
+205,6,4,2,40
+206,6,4,3,15
+207,6,4,4,4
+208,6,4,5,1
+209,6,5,1,60
+210,6,5,2,30
+211,6,5,3,5
+212,6,5,4,4
+213,6,5,5,1
+214,6,6,1,60
+215,6,6,2,30
+216,6,6,3,5
+217,6,6,4,4
+218,6,6,5,1

pokedex/data/csv/location_area_encounter_rates.csv

@@ -1843,3 +1843,794 @@ location_area_id,encounter_method_id,version_id,rate
 325,5,16,10
 325,6,15,5
 325,6,16,5
+350,2,7,10
+350,2,8,10
+350,2,9,10
+350,3,7,10
+350,3,8,10
+350,3,9,10
+350,4,7,10
+350,4,8,10
+350,4,9,10
+350,5,7,1
+350,5,8,1
+350,5,9,1
+351,2,7,10
+351,2,8,10
+351,2,9,10
+351,3,7,10
+351,3,8,10
+351,3,9,10
+351,4,7,10
+351,4,8,10
+351,4,9,10
+351,5,7,4
+351,5,8,4
+351,5,9,4
+352,2,7,10
+352,2,8,10
+352,2,9,10
+352,3,7,10
+352,3,8,10
+352,3,9,10
+352,4,7,10
+352,4,8,10
+352,4,9,10
+352,5,7,4
+352,5,8,4
+352,5,9,4
+353,2,7,10
+353,2,8,10
+353,2,9,10
+353,3,7,10
+353,3,8,10
+353,3,9,10
+353,4,7,10
+353,4,8,10
+353,4,9,10
+353,5,7,4
+353,5,8,4
+353,5,9,4
+354,2,7,10
+354,2,8,10
+354,2,9,10
+354,3,7,10
+354,3,8,10
+354,3,9,10
+354,4,7,10
+354,4,8,10
+354,4,9,10
+354,5,7,1
+354,5,8,1
+354,5,9,1
+355,2,7,10
+355,2,8,10
+355,2,9,10
+355,3,7,10
+355,3,8,10
+355,3,9,10
+355,4,7,10
+355,4,8,10
+355,4,9,10
+355,5,7,4
+355,5,8,4
+355,5,9,4
+356,1,7,10
+356,1,8,10
+356,1,9,10
+356,2,7,30
+356,2,8,30
+356,2,9,30
+356,3,7,30
+356,3,8,30
+356,3,9,30
+356,4,7,30
+356,4,8,30
+356,4,9,30
+356,5,7,4
+356,5,8,4
+356,5,9,4
+357,1,7,10
+357,1,8,10
+357,1,9,10
+357,2,7,30
+357,2,8,30
+357,2,9,30
+357,3,7,30
+357,3,8,30
+357,3,9,30
+357,4,7,30
+357,4,8,30
+357,4,9,30
+357,5,7,4
+357,5,8,4
+357,5,9,4
+358,1,7,10
+358,1,8,10
+358,1,9,10
+358,2,7,30
+358,2,8,30
+358,2,9,30
+358,3,7,30
+358,3,8,30
+358,3,9,30
+358,4,7,30
+358,4,8,30
+358,4,9,30
+358,5,7,4
+358,5,8,4
+358,5,9,4
+359,1,7,10
+359,1,8,10
+359,1,9,10
+359,2,7,30
+359,2,8,30
+359,2,9,30
+359,3,7,30
+359,3,8,30
+359,3,9,30
+359,4,7,30
+359,4,8,30
+359,4,9,30
+359,5,7,4
+359,5,8,4
+359,5,9,4
+360,1,7,10
+360,1,8,10
+360,1,9,10
+361,1,7,10
+361,1,8,10
+361,1,9,10
+362,1,7,10
+362,1,8,10
+362,1,9,10
+363,1,7,10
+363,1,8,10
+363,1,9,10
+363,6,7,20
+363,6,8,20
+363,6,9,20
+364,1,7,10
+364,1,8,10
+364,1,9,10
+365,1,7,20
+365,1,8,20
+365,1,9,20
+366,1,7,20
+366,1,8,20
+366,1,9,20
+367,1,7,10
+367,1,8,10
+367,1,9,10
+368,1,7,10
+368,1,8,10
+368,1,9,10
+369,1,7,10
+369,1,8,10
+369,1,9,10
+370,1,7,10
+370,1,8,10
+370,1,9,10
+371,1,7,10
+371,1,8,10
+371,1,9,10
+372,1,7,10
+372,1,8,10
+372,1,9,10
+373,1,7,10
+373,1,8,10
+373,1,9,10
+374,1,7,10
+374,1,8,10
+374,1,9,10
+375,1,7,10
+375,1,8,10
+375,1,9,10
+376,1,7,4
+376,1,8,4
+376,1,9,4
+376,2,7,10
+376,2,8,10
+376,2,9,10
+376,3,7,10
+376,3,8,10
+376,3,9,10
+376,4,7,10
+376,4,8,10
+376,4,9,10
+376,5,7,4
+376,5,8,4
+376,5,9,4
+377,1,7,4
+377,1,8,4
+377,1,9,4
+378,1,7,4
+378,1,8,4
+378,1,9,4
+379,1,7,4
+379,1,8,4
+379,1,9,4
+380,1,7,4
+380,1,8,4
+380,1,9,4
+381,1,7,4
+381,1,8,4
+381,1,9,4
+382,1,7,10
+382,1,8,10
+382,1,9,10
+383,1,7,10
+383,1,8,10
+383,1,9,10
+383,6,7,20
+383,6,8,20
+383,6,9,20
+384,1,7,10
+384,1,8,10
+384,1,9,10
+384,2,7,30
+384,2,8,30
+384,2,9,30
+384,3,7,30
+384,3,8,30
+384,3,9,30
+384,4,7,30
+384,4,8,30
+384,4,9,30
+384,5,7,4
+384,5,8,4
+384,5,9,4
+385,1,7,10
+385,1,8,10
+385,1,9,10
+385,2,7,10
+385,2,8,10
+385,2,9,10
+385,3,7,10
+385,3,8,10
+385,3,9,10
+385,4,7,10
+385,4,8,10
+385,4,9,10
+385,5,7,4
+385,5,8,4
+385,5,9,4
+386,1,7,10
+386,1,8,10
+386,1,9,10
+387,1,7,10
+387,1,8,10
+387,1,9,10
+388,1,7,10
+388,1,8,10
+388,1,9,10
+389,2,7,20
+389,2,8,20
+389,2,9,20
+389,3,7,20
+389,3,8,20
+389,3,9,20
+389,4,7,20
+389,4,8,20
+389,4,9,20
+389,5,7,4
+389,5,8,4
+389,5,9,4
+390,1,7,10
+390,1,8,10
+390,1,9,10
+391,1,7,10
+391,1,8,10
+391,1,9,10
+392,1,7,10
+392,1,8,10
+392,1,9,10
+393,1,7,20
+393,1,8,20
+393,1,9,20
+394,1,7,20
+394,1,8,20
+394,1,9,20
+394,2,7,30
+394,2,8,30
+394,2,9,30
+394,3,7,30
+394,3,8,30
+394,3,9,30
+394,4,7,30
+394,4,8,30
+394,4,9,30
+394,5,7,4
+394,5,8,4
+394,5,9,4
+395,1,7,20
+395,1,8,20
+395,1,9,20
+395,2,7,30
+395,2,8,30
+395,2,9,30
+395,3,7,30
+395,3,8,30
+395,3,9,30
+395,4,7,30
+395,4,8,30
+395,4,9,30
+395,5,7,4
+395,5,8,4
+395,5,9,4
+396,1,7,20
+396,1,8,20
+396,1,9,20
+396,2,7,30
+396,2,8,30
+396,2,9,30
+396,3,7,30
+396,3,8,30
+396,3,9,30
+396,4,7,30
+396,4,8,30
+396,4,9,30
+396,5,7,4
+396,5,8,4
+396,5,9,4
+397,2,7,30
+397,2,8,30
+397,2,9,30
+397,3,7,30
+397,3,8,30
+397,3,9,30
+397,4,7,30
+397,4,8,30
+397,4,9,30
+397,5,7,4
+397,5,8,4
+397,5,9,4
+398,2,7,30
+398,2,8,30
+398,2,9,30
+398,3,7,30
+398,3,8,30
+398,3,9,30
+398,4,7,30
+398,4,8,30
+398,4,9,30
+398,5,7,4
+398,5,8,4
+398,5,9,4
+399,2,7,30
+399,2,8,30
+399,2,9,30
+399,3,7,30
+399,3,8,30
+399,3,9,30
+399,4,7,30
+399,4,8,30
+399,4,9,30
+399,5,7,4
+399,5,8,4
+399,5,9,4
+400,2,7,30
+400,2,8,30
+400,2,9,30
+400,3,7,30
+400,3,8,30
+400,3,9,30
+400,4,7,30
+400,4,8,30
+400,4,9,30
+400,5,7,4
+400,5,8,4
+400,5,9,4
+401,2,7,30
+401,2,8,30
+401,2,9,30
+401,3,7,30
+401,3,8,30
+401,3,9,30
+401,4,7,30
+401,4,8,30
+401,4,9,30
+401,5,7,4
+401,5,8,4
+401,5,9,4
+402,1,7,20
+402,1,8,20
+402,1,9,20
+402,2,7,30
+402,2,8,30
+402,2,9,30
+402,3,7,30
+402,3,8,30
+402,3,9,30
+402,4,7,30
+402,4,8,30
+402,4,9,30
+402,5,7,4
+402,5,8,4
+402,5,9,4
+403,1,7,10
+403,1,8,10
+403,1,9,10
+403,2,7,30
+403,2,8,30
+403,2,9,30
+403,3,7,30
+403,3,8,30
+403,3,9,30
+403,4,7,30
+403,4,8,30
+403,4,9,30
+403,5,7,4
+403,5,8,4
+403,5,9,4
+403,6,7,20
+403,6,8,20
+403,6,9,20
+404,1,7,20
+404,1,8,20
+404,1,9,20
+405,1,7,20
+405,1,8,20
+405,1,9,20
+406,1,7,20
+406,1,8,20
+406,1,9,20
+406,2,7,30
+406,2,8,30
+406,2,9,30
+406,3,7,30
+406,3,8,30
+406,3,9,30
+406,4,7,30
+406,4,8,30
+406,4,9,30
+406,5,7,4
+406,5,8,4
+406,5,9,4
+406,6,7,20
+406,6,8,20
+406,6,9,20
+407,1,7,20
+407,1,8,20
+407,1,9,20
+407,2,7,30
+407,2,8,30
+407,2,9,30
+407,3,7,30
+407,3,8,30
+407,3,9,30
+407,4,7,30
+407,4,8,30
+407,4,9,30
+407,5,7,4
+407,5,8,4
+407,5,9,4
+408,1,7,20
+408,1,8,20
+408,1,9,20
+409,1,7,20
+409,1,8,20
+409,1,9,20
+409,2,7,30
+409,2,8,30
+409,2,9,30
+409,3,7,30
+409,3,8,30
+409,3,9,30
+409,4,7,30
+409,4,8,30
+409,4,9,30
+409,5,7,4
+409,5,8,4
+409,5,9,4
+410,1,7,20
+410,1,8,20
+410,1,9,20
+410,2,7,30
+410,2,8,30
+410,2,9,30
+410,3,7,30
+410,3,8,30
+410,3,9,30
+410,4,7,30
+410,4,8,30
+410,4,9,30
+410,5,7,4
+410,5,8,4
+410,5,9,4
+411,1,7,15
+411,1,8,15
+411,1,9,15
+411,2,7,30
+411,2,8,30
+411,2,9,30
+411,3,7,30
+411,3,8,30
+411,3,9,30
+411,4,7,30
+411,4,8,30
+411,4,9,30
+411,5,7,4
+411,5,8,4
+411,5,9,4
+412,1,7,20
+412,1,8,20
+412,1,9,20
+412,2,7,30
+412,2,8,30
+412,2,9,30
+412,3,7,30
+412,3,8,30
+412,3,9,30
+412,4,7,30
+412,4,8,30
+412,4,9,30
+412,5,7,4
+412,5,8,4
+412,5,9,4
+413,1,7,20
+413,1,8,20
+413,1,9,20
+413,2,7,30
+413,2,8,30
+413,2,9,30
+413,3,7,30
+413,3,8,30
+413,3,9,30
+413,4,7,30
+413,4,8,30
+413,4,9,30
+413,5,7,4
+413,5,8,4
+413,5,9,4
+414,2,7,30
+414,2,8,30
+414,2,9,30
+414,3,7,30
+414,3,8,30
+414,3,9,30
+414,4,7,30
+414,4,8,30
+414,4,9,30
+414,5,7,4
+414,5,8,4
+414,5,9,4
+415,1,7,20
+415,1,8,20
+415,1,9,20
+415,2,7,30
+415,2,8,30
+415,2,9,30
+415,3,7,30
+415,3,8,30
+415,3,9,30
+415,4,7,30
+415,4,8,30
+415,4,9,30
+415,5,7,4
+415,5,8,4
+415,5,9,4
+416,2,7,30
+416,2,8,30
+416,2,9,30
+416,3,7,30
+416,3,8,30
+416,3,9,30
+416,4,7,30
+416,4,8,30
+416,4,9,30
+416,5,7,4
+416,5,8,4
+416,5,9,4
+417,5,7,4
+417,5,8,4
+417,5,9,4
+418,2,7,30
+418,2,8,30
+418,2,9,30
+418,3,7,30
+418,3,8,30
+418,3,9,30
+418,4,7,30
+418,4,8,30
+418,4,9,30
+418,5,7,4
+418,5,8,4
+418,5,9,4
+419,2,7,30
+419,2,8,30
+419,2,9,30
+419,3,7,30
+419,3,8,30
+419,3,9,30
+419,4,7,30
+419,4,8,30
+419,4,9,30
+419,5,7,4
+419,5,8,4
+419,5,9,4
+420,5,7,4
+420,5,8,4
+420,5,9,4
+421,2,7,30
+421,2,8,30
+421,2,9,30
+421,3,7,30
+421,3,8,30
+421,3,9,30
+421,4,7,30
+421,4,8,30
+421,4,9,30
+421,5,7,4
+421,5,8,4
+421,5,9,4
+422,2,7,30
+422,2,8,30
+422,2,9,30
+422,3,7,30
+422,3,8,30
+422,3,9,30
+422,4,7,30
+422,4,8,30
+422,4,9,30
+422,5,7,4
+422,5,8,4
+422,5,9,4
+423,2,7,30
+423,2,8,30
+423,2,9,30
+423,3,7,30
+423,3,8,30
+423,3,9,30
+423,4,7,30
+423,4,8,30
+423,4,9,30
+423,5,7,4
+423,5,8,4
+423,5,9,4
+424,1,7,20
+424,1,8,20
+424,1,9,20
+424,2,7,30
+424,2,8,30
+424,2,9,30
+424,3,7,30
+424,3,8,30
+424,3,9,30
+424,4,7,30
+424,4,8,30
+424,4,9,30
+424,5,7,4
+424,5,8,4
+424,5,9,4
+425,2,7,30
+425,2,8,30
+425,2,9,30
+425,3,7,30
+425,3,8,30
+425,3,9,30
+425,4,7,30
+425,4,8,30
+425,4,9,30
+425,5,7,4
+425,5,8,4
+425,5,9,4
+426,2,7,30
+426,2,8,30
+426,2,9,30
+426,3,7,30
+426,3,8,30
+426,3,9,30
+426,4,7,30
+426,4,8,30
+426,4,9,30
+426,5,7,4
+426,5,8,4
+426,5,9,4
+427,2,7,30
+427,2,8,30
+427,2,9,30
+427,3,7,30
+427,3,8,30
+427,3,9,30
+427,4,7,30
+427,4,8,30
+427,4,9,30
+427,5,7,4
+427,5,8,4
+427,5,9,4
+428,2,7,30
+428,2,8,30
+428,2,9,30
+428,3,7,30
+428,3,8,30
+428,3,9,30
+428,4,7,30
+428,4,8,30
+428,4,9,30
+428,5,7,4
+428,5,8,4
+428,5,9,4
+429,1,7,25
+429,1,8,25
+429,1,9,25
+429,2,7,35
+429,2,8,35
+429,2,9,35
+429,3,7,35
+429,3,8,35
+429,3,9,35
+429,4,7,35
+429,4,8,35
+429,4,9,35
+429,5,7,9
+429,5,8,9
+429,5,9,9
+430,1,7,25
+430,1,8,25
+430,1,9,25
+430,6,7,25
+430,6,8,25
+430,6,9,25
+431,1,7,25
+431,1,8,25
+431,1,9,25
+431,2,7,35
+431,2,8,35
+431,2,9,35
+431,3,7,35
+431,3,8,35
+431,3,9,35
+431,4,7,35
+431,4,8,35
+431,4,9,35
+431,5,7,9
+431,5,8,9
+431,5,9,9
+432,1,7,25
+432,1,8,25
+432,1,9,25
+433,2,7,10
+433,2,8,10
+433,2,9,10
+433,3,7,10
+433,3,8,10
+433,3,9,10
+433,4,7,10
+433,4,8,10
+433,4,9,10
+433,5,7,4
+433,5,8,4
+433,5,9,4
+434,2,7,10
+434,2,8,10
+434,2,9,10
+434,3,7,10
+434,3,8,10
+434,3,9,10
+434,4,7,10
+434,4,8,10
+434,4,9,10
+434,5,7,4
+434,5,8,4
+434,5,9,4
+435,1,9,25
+435,2,9,35
+435,3,9,35
+435,4,9,35
+435,5,9,9
+436,1,9,25
+436,6,9,25
+437,1,9,10
+438,1,9,10
+439,1,9,10
+440,1,9,10
+441,1,9,7
+442,1,9,7
+443,1,9,7
+444,1,9,7
+445,1,9,7
+446,1,9,7
+447,1,9,7
+448,1,9,7
+449,1,9,7

pokedex/data/csv/location_area_prose.csv

@@ -304,3 +304,103 @@ location_area_id,local_language_id,name
 347,9,"Area 2, north"
 348,9,"Area 3, west"
 349,9,S.S. Anne dock
+350,9,
+351,9,
+352,9,
+353,9,
+354,9,
+355,9,
+356,9,
+357,9,back
+358,9,B1F
+359,9,back/small room
+360,9,
+361,9,1F
+362,9,B1F
+363,9,B2F
+364,9,1F/small Room
+365,9,
+366,9,
+367,9,
+368,9,1F
+369,9,2F
+370,9,3F
+371,9,4F
+372,9,5F
+373,9,6F
+374,9,outside
+375,9,summit
+376,9,
+377,9,entrance
+378,9,1F
+379,9,B1F
+380,9,B2F
+381,9,B3F
+382,9,1F
+383,9,B1F
+384,9,B2F
+385,9,
+386,9,B1F
+387,9,Entrance
+388,9,
+389,9,
+390,9,1F
+391,9,3F
+392,9,5F
+393,9,
+394,9,
+395,9,
+396,9,
+397,9,
+398,9,
+399,9,
+400,9,
+401,9,
+402,9,
+403,9,
+404,9,
+405,9,
+406,9,
+407,9,
+408,9,
+409,9,
+410,9,
+411,9,
+412,9,
+413,9,
+414,9,
+415,9,
+416,9,
+417,9,underwater
+418,9,
+419,9,
+420,9,underwater
+421,9,
+422,9,
+423,9,
+424,9,
+425,9,
+426,9,
+427,9,
+428,9,
+429,9,NW/mach bike area
+430,9,NE/acro bike area
+431,9,SW
+432,9,SE
+433,9,
+434,9,
+435,9,expansion south
+436,9,expansion north
+437,9,
+438,9,
+439,9,
+440,9,
+441,9,a
+442,9,b
+443,9,c
+444,9,d
+445,9,e
+446,9,f
+447,9,g
+448,9,h
+449,9,i

pokedex/data/csv/location_areas.csv

@@ -304,3 +304,103 @@ id,location_id,game_index,identifier
 347,162,0,area-2-north
 348,162,0,area-3-west
 349,151,0,ss-anne-dock
+350,429,0,
+351,430,1,
+352,431,2,
+353,432,3,
+354,433,4,
+355,434,5,
+356,435,6,
+357,435,7,back
+358,435,8,b1f
+359,435,9,backsmall-room
+360,436,10,
+361,437,11,1f
+362,437,12,b1f
+363,437,13,b2f
+364,437,14,1fsmall-room
+365,438,15,
+366,439,16,
+367,440,17,
+368,441,18,1f
+369,441,19,2f
+370,441,20,3f
+371,441,21,4f
+372,441,22,5f
+373,441,23,6f
+374,441,24,outside
+375,441,25,summit
+376,442,26,
+377,443,35,entrance
+378,443,36,1f
+379,443,37,b1f
+380,443,38,b2f
+381,443,39,b3f
+382,444,40,1f
+383,444,41,b1f
+384,444,42,b2f
+385,445,43,
+386,445,47,b1f
+387,446,48,entrance
+388,446,49,
+389,447,50,
+390,448,52,1f
+391,448,53,3f
+392,448,54,5f
+393,449,55,
+394,450,56,
+395,451,57,
+396,452,58,
+397,453,59,
+398,454,60,
+399,455,61,
+400,456,62,
+401,457,63,
+402,458,64,
+403,459,65,
+404,460,66,
+405,461,67,
+406,462,68,
+407,463,69,
+408,464,70,
+409,465,71,
+410,466,72,
+411,467,73,
+412,468,74,
+413,469,75,
+414,470,76,
+415,471,77,
+416,472,78,
+417,472,95,underwater
+418,473,79,
+419,474,80,
+420,474,96,underwater
+421,475,81,
+422,476,82,
+423,477,83,
+424,478,84,
+425,479,85,
+426,480,86,
+427,481,87,
+428,482,88,
+429,483,89,nwmach-bike-area
+430,483,90,neacro-bike-area
+431,483,91,sw
+432,483,92,se
+433,484,93,
+434,485,94,
+435,483,97,expansion-south
+436,483,98,expansion-north
+437,486,99,
+438,487,107,
+439,488,111,
+440,489,112,
+441,490,114,a
+442,490,115,b
+443,490,116,c
+444,490,117,d
+445,490,118,e
+446,490,119,f
+447,490,120,g
+448,490,121,h
+449,490,122,i

pokedex/data/csv/location_names.csv

@@ -501,3 +501,65 @@ location_id,local_language_id,name
 427,9,Route Gate
 428,1,海底遺跡
 428,9,Abyssal Ruins
+429,9,Petalburg City
+430,9,Slateport City
+431,9,Lilycove City
+432,9,Mossdeep City
+433,9,Sootopolis City
+434,9,Ever Grande City
+435,9,Meteor Falls
+436,9,Rusturf Tunnel
+437,9,Granite Cave
+438,9,Petalburg Woods
+439,9,Jagged Pass
+440,9,Fiery Pass
+441,9,Mt. Pyre
+442,9,Seafloor Cavern
+443,9,Cave of Origin
+444,9,Victory Road
+445,9,Shoal Cave
+446,9,New Mauville
+447,9,Abandoned Ship
+448,9,Sky Pillar
+449,9,Route 101
+450,9,Route 102
+451,9,Route 103
+452,9,Route 104
+453,9,Route 105
+454,9,Route 106
+455,9,Route 107
+456,9,Route 108
+457,9,Route 109
+458,9,Route 110
+459,9,Route 111
+460,9,Route 112
+461,9,Route 113
+462,9,Route 114
+463,9,Route 115
+464,9,Route 116
+465,9,Route 117
+466,9,Route 118
+467,9,Route 119
+468,9,Route 120
+469,9,Route 121
+470,9,Route 122
+471,9,Route 123
+472,9,Route 124
+473,9,Route 125
+474,9,Route 126
+475,9,Route 127
+476,9,Route 128
+477,9,Route 129
+478,9,Route 130
+479,9,Route 131
+480,9,Route 132
+481,9,Route 133
+482,9,Route 134
+483,9,Safari Zone
+484,9,Dewford Town
+485,9,Pacifidlog Town
+486,9,Magma Hideout
+487,9,Mirage Tower
+488,9,Desert Underpass
+489,9,Artisan Cave
+490,9,Altering Cave

pokedex/data/csv/locations.csv

@@ -416,3 +416,65 @@ id,region_id,identifier
 426,5,bridge-gate
 427,5,route-gate
 428,5,abyssal-ruins
+429,3,petalburg-city
+430,3,slateport-city
+431,3,lilycove-city
+432,3,mossdeep-city
+433,3,sootopolis-city
+434,3,ever-grande-city
+435,3,meteor-falls
+436,3,rusturf-tunnel
+437,3,granite-cave
+438,3,petalburg-woods
+439,3,jagged-pass
+440,3,fiery-pass
+441,3,mt-pyre
+442,3,seafloor-cavern
+443,3,cave-of-origin
+444,3,victory-road
+445,3,shoal-cave
+446,3,new-mauville
+447,3,abandoned-ship
+448,3,sky-pillar
+449,3,route-101
+450,3,route-102
+451,3,route-103
+452,3,route-104
+453,3,route-105
+454,3,route-106
+455,3,route-107
+456,3,route-108
+457,3,route-109
+458,3,route-110
+459,3,route-111
+460,3,route-112
+461,3,route-113
+462,3,route-114
+463,3,route-115
+464,3,route-116
+465,3,route-117
+466,3,route-118
+467,3,route-119
+468,3,route-120
+469,3,route-121
+470,3,route-122
+471,3,route-123
+472,3,route-124
+473,3,route-125
+474,3,route-126
+475,3,route-127
+476,3,route-128
+477,3,route-129
+478,3,route-130
+479,3,route-131
+480,3,route-132
+481,3,route-133
+482,3,route-134
+483,3,safari-zone
+484,3,dewford-town
+485,3,pacifidlog-town
+486,3,magma-hideout
+487,3,mirage-tower
+488,3,desert-underpass
+489,3,artisan-cave
+490,3,altering-cave

pokedex/db/tables.py

@@ -393,7 +393,7 @@ class EncounterSlot(TableBase):
         info=dict(description="The ID of the method"))
     slot = Column(Integer, nullable=True,
         info=dict(description="This slot's order for the location and method"))
-    rarity = Column(Integer, nullable=False,
+    rarity = Column(Integer, nullable=True,
         info=dict(description="The chance of the encounter as a percentage"))
 
 class EvolutionChain(TableBase):
@@ -1821,6 +1821,12 @@ LocationArea.location = relation(Location,
     innerjoin=True, lazy='joined',
     backref='areas')
 
+LocationAreaEncounterRate.location_area = relation(LocationArea,
+    innerjoin=True,
+    backref='encounter_rates')
+LocationAreaEncounterRate.method = relation(EncounterMethod,
+    innerjoin=True)
+
 LocationGameIndex.location = relation(Location,
     innerjoin=True, lazy='joined',
     backref='game_indices')