Skip to content

Add RSE Trades, remove non-zubat encounters from altering cave in Emerald #1478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Naramsim merged 5 commits into from
Apr 12, 2026
Merged

Add RSE Trades, remove non-zubat encounters from altering cave in Emerald #1478

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a4d9d3
Add RSE Trades, remove non-zubat encounters from altering cave
notblisy Apr 7, 2026
bb90741
remove altering cave from location area encounter rates
notblisy Apr 7, 2026
444a1f9
slakoth->skitty location area prose update
notblisy Apr 7, 2026
9d3d7aa
Merge branch 'RSE-Trade-Encounters-Remove-Altering-Cave' of https://g…
notblisy Apr 10, 2026
004689f
move encounters, location areas, and value maps to match new commit
notblisy Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions data/v2/csv/encounter_condition_value_map.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18214,3 +18214,13 @@ encounter_id,encounter_condition_value_id
71234,165
71235,167
71236,168
71237,169
71238,170
71239,171
71240,169
71241,170
71242,171
71243,172
71244,173
71245,174
71246,175
7 changes: 7 additions & 0 deletions data/v2/csv/encounter_condition_value_prose.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,3 +289,10 @@ encounter_condition_value_id,local_language_id,name
166,9,Give Gloom in a Trade
167,9,Give Haunter in a Trade
168,9,Give Dugtrio in a Trade
169,9,Give Slakoth in a Trade
170,9,Give Pikachu in a Trade
171,9,Give Bellossom in a Trade
172,9,Give Ralts in a Trade
173,9,Give Volbeat in a Trade
174,9,Give Bagon in a Trade
175,9,Give Skitty in a Trade
7 changes: 7 additions & 0 deletions data/v2/csv/encounter_condition_values.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,3 +167,10 @@ id,encounter_condition_id,identifier,is_default
166,15,trade-gloom,1
167,15,trade-haunter,1
168,15,trade-dugtrio,1
169,15,trade-slakoth,1
170,15,trade-pikachu,1
171,15,trade-bellossom,1
172,15,trade-ralts,1
173,15,trade-volbeat,1
174,15,trade-bagon,1
175,15,trade-skitty,1
4 changes: 3 additions & 1 deletion data/v2/csv/encounter_slots.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,4 +1382,6 @@ id,version_group_id,encounter_method_id,slot,rarity
1381,1,36,,100
1382,2,36,,100
1383,3,36,,100
1384,4,36,,100
1384,4,36,,100
1385,5,36,,100
1386,6,36,,100
106 changes: 10 additions & 96 deletions data/v2/csv/encounters.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27409,102 +27409,6 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
31119,9,441,196,41,14,14
31120,9,441,197,41,8,8
31121,9,441,198,41,14,14
31122,9,442,187,179,7,7
31123,9,442,188,179,9,9
31124,9,442,189,179,5,5
31125,9,442,190,179,11,11
31126,9,442,191,179,7,7
31127,9,442,192,179,9,9
31128,9,442,193,179,13,13
31129,9,442,194,179,3,3
31130,9,442,195,179,5,5
31131,9,442,196,179,11,11
31132,9,442,197,179,5,5
31133,9,442,198,179,11,11
31134,9,443,187,204,23,23
31135,9,443,188,204,25,25
31136,9,443,189,204,22,22
31137,9,443,190,204,27,27
31138,9,443,191,204,23,23
31139,9,443,192,204,25,25
31140,9,443,193,204,29,29
31141,9,443,194,204,19,19
31142,9,443,195,204,21,21
31143,9,443,196,204,27,27
31144,9,443,197,204,21,21
31145,9,443,198,204,27,27
31146,9,444,187,228,16,16
31147,9,444,188,228,18,18
31148,9,444,189,228,14,14
31149,9,444,190,228,20,20
31150,9,444,191,228,16,16
31151,9,444,192,228,18,18
31152,9,444,193,228,22,22
31153,9,444,194,228,12,12
31154,9,444,195,228,14,14
31155,9,444,196,228,20,20
31156,9,444,197,228,14,14
31157,9,444,198,228,20,20
31158,9,445,187,216,10,10
31159,9,445,188,216,12,12
31160,9,445,189,216,8,8
31161,9,445,190,216,14,14
31162,9,445,191,216,10,10
31163,9,445,192,216,12,12
31164,9,445,193,216,16,16
31165,9,445,194,216,6,6
31166,9,445,195,216,8,8
31167,9,445,196,216,14,14
31168,9,445,197,216,8,8
31169,9,445,198,216,14,14
31170,9,446,187,190,22,22
31171,9,446,188,190,24,24
31172,9,446,189,190,20,20
31173,9,446,190,190,26,26
31174,9,446,191,190,22,22
31175,9,446,192,190,24,24
31176,9,446,193,190,28,28
31177,9,446,194,190,18,18
31178,9,446,195,190,20,20
31179,9,446,196,190,26,26
31180,9,446,197,190,20,20
31181,9,446,198,190,26,26
31182,9,447,187,213,22,22
31183,9,447,188,213,24,24
31184,9,447,189,213,20,20
31185,9,447,190,213,26,26
31186,9,447,191,213,22,22
31187,9,447,192,213,24,24
31188,9,447,193,213,28,28
31189,9,447,194,213,18,18
31190,9,447,195,213,20,20
31191,9,447,196,213,26,26
31192,9,447,197,213,20,20
31193,9,447,198,213,26,26
31194,9,448,187,234,22,22
31195,9,448,188,234,24,24
31196,9,448,189,234,20,20
31197,9,448,190,234,26,26
31198,9,448,191,234,22,22
31199,9,448,192,234,24,24
31200,9,448,193,234,28,28
31201,9,448,194,234,18,18
31202,9,448,195,234,20,20
31203,9,448,196,234,26,26
31204,9,448,197,234,20,20
31205,9,448,198,234,26,26
31206,9,449,187,235,22,22
31207,9,449,188,235,24,24
31208,9,449,189,235,20,20
31209,9,449,190,235,26,26
31210,9,449,191,235,22,22
31211,9,449,192,235,24,24
31212,9,449,193,235,28,28
31213,9,449,194,235,18,18
31214,9,449,195,235,20,20
31215,9,449,196,235,26,26
31216,9,449,197,235,20,20
31217,9,449,198,235,26,26
31218,10,450,219,201,25,25
31219,10,450,220,201,25,25
31220,10,450,221,201,25,25
Expand Down Expand Up @@ -65675,3 +65579,13 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
71234,6,307,1384,142,5,100
71235,6,1200,1384,178,15,100
71236,6,330,1384,82,16,100
71237,7,834,1385,296,5,100
71238,7,1305,1385,287,5,100
71239,7,434,1385,222,21,100
71240,8,834,1385,296,5,100
71241,8,1305,1385,287,5,100
Comment thread
notblisy marked this conversation as resolved.
Outdated
71242,8,434,1385,222,21,100
71243,9,834,1386,273,4,100
71244,9,1305,1386,311,5,100
71245,9,434,1386,116,5,100
71246,9,809,1386,52,5,100
8 changes: 0 additions & 8 deletions data/v2/csv/location_area_encounter_rates.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2968,14 +2968,6 @@ location_area_id,encounter_method_id,version_id,rate
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
450,1,10,7
450,1,11,7
451,1,10,7
Expand Down
31 changes: 4 additions & 27 deletions data/v2/csv/location_area_prose.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,33 +1187,9 @@ location_area_id,local_language_id,name
440,9,Artisan Cave
440,6,Höhlenatelier
440,5,Grotte Atelier
441,9,Altering Cave (A)
441,6,Wandelhöhle (A)
441,5,Grotte Métamo (A)
442,9,Altering Cave (B)
442,6,Wandelhöhle (B)
442,5,Grotte Métamo (B)
443,9,Altering Cave (C)
443,6,Wandelhöhle (C)
443,5,Grotte Métamo (C)
444,9,Altering Cave (D)
444,6,Wandelhöhle (D)
444,5,Grotte Métamo (D)
445,9,Altering Cave (E)
445,6,Wandelhöhle (E)
445,5,Grotte Métamo (E)
446,9,Altering Cave (F)
446,6,Wandelhöhle (F)
446,5,Grotte Métamo (F)
447,9,Altering Cave (G)
447,6,Wandelhöhle (G)
447,5,Grotte Métamo (G)
448,9,Altering Cave (H)
448,6,Wandelhöhle (H)
448,5,Grotte Métamo (H)
449,9,Altering Cave (I)
449,6,Wandelhöhle (I)
449,5,Grotte Métamo (I)
441,9,Altering cave
Comment thread
notblisy marked this conversation as resolved.
Outdated
441,6,Wandelhöhle
441,5,Grotte Métamo
450,9,Monean Chamber
450,6,Einamon-Kammer
450,5,Chambre Anemune
Expand Down Expand Up @@ -2359,3 +2335,4 @@ location_area_id,local_language_id,name
1302,9,Kanto Underground Path
1303,9,Violet City (Southwest House)
1304,9,Goldenrod City Department Store 5F
1305,9,Foretree City
Comment thread
notblisy marked this conversation as resolved.
Outdated
11 changes: 2 additions & 9 deletions data/v2/csv/location_areas.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,15 +395,7 @@ id,location_id,game_index,identifier
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
441,490,114,
450,491,0,
451,492,1,
452,493,2,
Expand Down Expand Up @@ -1193,3 +1185,4 @@ id,location_id,game_index,identifier
1302,1113,0,
1303,153,0,southwest-house
1304,229,0,department-store-5f
1305,574,0,
Loading