Skip to content
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.

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

Add Generation 9 species #3249

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
133ffc7
Merge pull request #15 from Bassoonian/rhhspeciesreorder
AsparagusEduardo Mar 17, 2023
c221c67
Merge pull request #16 from AlexOn1ine/speciesReorder
AsparagusEduardo Mar 26, 2023
a502427
Merge pull request #18 from AlexOn1ine/speciesReorderItems
AsparagusEduardo Apr 26, 2023
fed554a
sSpeciesToNationalPokedexNum
leo60228 Aug 18, 2023
b5be823
gen 9 forms (learnsets still missing)
leo60228 Aug 18, 2023
ca931d0
form species info
leo60228 Aug 22, 2023
5e0ff4a
gen 9 form learnset pointers
leo60228 Aug 22, 2023
e10acf8
gen 9 form learnsets
leo60228 Aug 22, 2023
4e8ae59
make sure Tauros-Paldea forms are defined properly without P_GEN_9_PO…
leo60228 Aug 22, 2023
5113efa
cry fixes
leo60228 Aug 22, 2023
6df4337
reorder species.h
AsparagusEduardo Aug 22, 2023
61d3cdd
revert separate SPECIES_UNOWN
leo60228 Aug 22, 2023
f1464bb
fix icon palettes
leo60228 Aug 22, 2023
3e1ecec
revert SPECIES_DARMANITAN_GALARIAN_* renames
leo60228 Aug 23, 2023
b3e5c31
Revert "reorder species.h"
leo60228 Aug 23, 2023
6cc2a1e
4 digits option for dex numbers
AsparagusEduardo Dec 23, 2022
5831f93
4 digits in dex num in summary screen
AsparagusEduardo Dec 28, 2022
d27e566
fix 4 digit spacing
AsparagusEduardo Dec 28, 2022
920fd48
Regional Dex numbers are always 3 digits
leo60228 Sep 28, 2023
ba05343
Address review
leo60228 Oct 18, 2023
87a03c3
Fix Paldean form order
leo60228 Oct 18, 2023
14c2254
remove leftover cry
leo60228 Oct 22, 2023
fcc18c2
correct paldean wooper type
leo60228 Oct 22, 2023
f570d14
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigra…
AsparagusEduardo Oct 23, 2023
a92a325
Fixed Paldean Tauros Combat Breed order and data names
AsparagusEduardo Oct 23, 2023
e6c5077
Oinkologne Male define
AsparagusEduardo Oct 23, 2023
ff60b7f
Maushold Family of Three define
AsparagusEduardo Oct 23, 2023
d69ac7a
Fixed Maushold Family of Four icon
AsparagusEduardo Oct 23, 2023
792aee8
SPECIES_SQUAWKABILLY_GREEN_PLUMAGE
AsparagusEduardo Oct 23, 2023
82bb758
SPECIES_PALAFIN_ZERO
AsparagusEduardo Oct 23, 2023
be921c5
SPECIES_TATSUGIRI_CURLY
AsparagusEduardo Oct 23, 2023
2e9e157
SPECIES_DUDUNSPARCE_TWO_SEGMENT
AsparagusEduardo Oct 23, 2023
7b089a3
Fixed Palafin Hero's Sp. Defense
AsparagusEduardo Oct 23, 2023
174ad11
SPECIES_GIMMIGHOUL_CHEST
AsparagusEduardo Oct 23, 2023
ed3e2f8
Gen 9 form order
AsparagusEduardo Oct 23, 2023
5660ac9
Added new mon to pokedex orders
AsparagusEduardo Oct 23, 2023
d1165c0
A few better sprites
AlexOn1ine Oct 23, 2023
0756dc1
coords and roaring moon
AlexOn1ine Oct 23, 2023
60d7467
enable floragato icon and tinkatuff shiny palette
leo60228 Oct 23, 2023
2edd20c
correct quaxwell and palafin-hero back sprite coordinates
leo60228 Oct 23, 2023
1359df7
new iron bundle and tinkatink sprites
leo60228 Oct 23, 2023
95e0dab
icon/palette fixes
leo60228 Oct 23, 2023
176dec6
new tinkaton sprite
leo60228 Oct 23, 2023
f6e5076
add new sprites
leo60228 Oct 25, 2023
95aa302
updated great tusk sprite
leo60228 Oct 25, 2023
5f2b6f5
Merge branch 'upcoming' into gen9-species-nomigration
leo60228 Oct 26, 2023
86917f1
Update species.h
kittenchilly Oct 23, 2023
5cbcf60
Begin some stuff
kittenchilly Oct 23, 2023
bb855f9
Almost done with data
kittenchilly Oct 24, 2023
3a9172d
It can build now
kittenchilly Oct 25, 2023
8fefdbe
Evo and form changes
kittenchilly Oct 25, 2023
d9ccc80
Sprites
kittenchilly Oct 25, 2023
91b4659
Ogerpon sprites
kittenchilly Oct 26, 2023
ad210c5
Update icon.png
kittenchilly Oct 26, 2023
1acaf7f
Fixed icons
kittenchilly Oct 26, 2023
144ed15
update cry tables
leo60228 Oct 26, 2023
1762b28
Ursaluna-Bloodmoon fixes
leo60228 Oct 26, 2023
a505afa
address review
leo60228 Oct 26, 2023
fca19a0
downsample cries (like #3359)
leo60228 Oct 27, 2023
5a70555
Try to better abbreviate >10 character names
leo60228 Oct 27, 2023
7e3f117
kitakami dex entries
leo60228 Oct 27, 2023
c9619b0
Shows 4 digits on the main Pokédex page
AsparagusEduardo Oct 28, 2023
6108d09
Updated Save Menu, main menu, match call and trainer card to use 4 di…
AsparagusEduardo Oct 28, 2023
6d128a7
Fixed compile when Gen 9 is disabled
AsparagusEduardo Oct 28, 2023
659bff4
Seen/Owned 4 digits in HGSS dex
AsparagusEduardo Oct 28, 2023
b484a21
Scrollbar moved to the left
AsparagusEduardo Oct 28, 2023
c74ad82
Rearranged dex scrolling list UI to accomodate 4 digits and 12 charac…
AsparagusEduardo Oct 28, 2023
ae1266e
Automatically change dex number digits based on NATIONAL_DEX_COUNT
AsparagusEduardo Oct 29, 2023
7be2c62
add teal mask cries (but none tweaked yet)
leo60228 Oct 30, 2023
a7e604e
correct iron leaves dex entry
leo60228 Oct 30, 2023
392a65d
cry fixes
leo60228 Oct 31, 2023
eccd2c4
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-spe…
AsparagusEduardo Nov 3, 2023
5ccef18
friendship = 50 -> friendship = STANDARD_FRIENDSHIP
kittenchilly Oct 30, 2023
820be61
Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen…
AsparagusEduardo Nov 3, 2023
eeed961
Mon Sprite Fixes
katykat5099 Nov 2, 2023
01c9b7c
hgss dex fixes
leo60228 Nov 4, 2023
4863fb8
wrap ogerpon dex entry to 4 lines
leo60228 Nov 4, 2023
b4b4e3c
import oct 31 pokecommunity sprites
leo60228 Nov 4, 2023
4aa1435
Merge branch 'upcoming' into gen9-species-nomigration
AsparagusEduardo Nov 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file modified graphics/pokedex/hgss/tilemap_list_screen.bin
Binary file not shown.
Binary file modified graphics/pokedex/hgss/tileset_interface.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/pokedex/hgss/tileset_menu_list.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/annihilape/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/annihilape/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/annihilape/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/annihilape/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
112 112 120
16 16 16
248 248 248
64 64 64
192 192 208
160 160 176
224 24 24
240 152 168
144 48 72
32 40 40
192 72 96
88 104 112
64 72 80
40 40 40
80 80 80
19 changes: 19 additions & 0 deletions graphics/pokemon/annihilape/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
80 80 128
16 16 16
240 232 232
40 40 72
168 168 192
128 136 176
224 24 24
240 152 168
144 48 72
24 40 56
192 72 96
88 128 168
56 80 104
40 40 40
80 80 80
Binary file added graphics/pokemon/arboliva/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/arboliva/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/arboliva/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/arboliva/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
0 128 32
152 224 56
0 56 16
0 200 32
0 0 0
248 248 240
184 192 168
72 96 72
224 128 72
192 72 40
104 32 56
160 56 80
56 8 24
80 32 24
0 0 0
19 changes: 19 additions & 0 deletions graphics/pokemon/arboliva/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
8 48 16
112 144 64
0 56 16
24 120 40
0 0 0
248 248 240
184 192 168
72 96 72
200 112 64
168 64 40
56 16 24
104 32 48
56 8 24
80 32 24
0 0 0
Binary file added graphics/pokemon/arctibax/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/arctibax/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/arctibax/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/arctibax/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 210 164
92 131 133
65 69 90
188 239 248
91 111 138
125 166 166
102 149 227
15 15 15
0 0 0
255 209 74
218 145 35
75 122 154
58 99 126
100 54 32
244 125 47
168 96 47
19 changes: 19 additions & 0 deletions graphics/pokemon/arctibax/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 210 164
74 168 123
65 69 90
227 255 253
78 133 139
140 221 192
134 249 249
15 15 15
0 0 0
255 209 74
218 145 35
67 194 175
63 152 138
137 39 73
252 142 179
201 100 144
Binary file added graphics/pokemon/armarouge/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/armarouge/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/armarouge/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/armarouge/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 210 164
147 50 48
226 60 27
255 119 178
236 183 34
237 230 62
12 12 12
84 40 41
237 230 63
54 52 52
94 86 82
150 91 14
255 255 255
226 60 28
0 0 0
0 0 0
19 changes: 19 additions & 0 deletions graphics/pokemon/armarouge/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 210 164
147 50 48
226 60 27
255 119 178
236 183 34
237 230 62
12 12 12
84 40 41
33 174 217
54 52 52
94 86 82
150 91 14
255 255 255
33 174 217
0 0 0
0 0 0
Binary file added graphics/pokemon/baxcalibur/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/baxcalibur/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/baxcalibur/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/baxcalibur/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 16 16
80 112 112
224 252 248
184 224 224
32 40 48
48 64 80
120 180 200
136 100 24
240 212 72
40 44 40
64 96 112
96 16 32
144 24 48
216 36 72
0 0 0
19 changes: 19 additions & 0 deletions graphics/pokemon/baxcalibur/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
16 16 16
46 95 110
224 252 248
187 230 226
45 76 85
64 109 121
100 192 198
136 100 24
240 212 72
40 44 40
72 154 164
128 44 98
144 24 48
255 104 209
0 0 0
Binary file added graphics/pokemon/bellibolt/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/bellibolt/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/bellibolt/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/bellibolt/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
184 88 64
120 48 40
248 152 72
112 104 104
248 208 128
248 248 248
168 168 160
56 176 152
16 112 112
112 216 184
248 216 24
16 16 16
8 64 72
80 72 64
184 160 64
19 changes: 19 additions & 0 deletions graphics/pokemon/bellibolt/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
184 88 64
120 48 40
248 152 72
112 104 104
248 208 128
248 248 248
168 168 160
248 248 136
200 168 72
248 248 200
248 216 24
16 16 16
120 80 24
80 72 64
184 160 64
Binary file added graphics/pokemon/bombirdier/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/bombirdier/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/bombirdier/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions graphics/pokemon/bombirdier/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 210 164
52 41 48
74 57 66
15 15 15
38 210 161
102 91 96
185 170 175
239 227 225
147 125 133
80 29 37
77 74 75
230 76 98
255 251 255
153 62 73
167 171 167
123 130 123
19 changes: 19 additions & 0 deletions graphics/pokemon/bombirdier/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
153 210 164
52 41 48
74 57 66
15 15 15
38 210 161
102 91 96
185 170 175
239 227 225
147 125 133
80 29 37
160 74 85
171 167 168
255 251 255
136 134 133
167 171 167
123 130 123
Binary file added graphics/pokemon/brambleghast/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/brambleghast/front.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/pokemon/brambleghast/icon.png
19 changes: 19 additions & 0 deletions graphics/pokemon/brambleghast/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
88 72 88
192 152 184
112 88 56
64 40 32
16 16 16
128 104 128
200 176 104
152 120 80
168 104 64
128 72 48
96 40 48
32 32 40
248 72 32
0 0 0
0 0 0
19 changes: 19 additions & 0 deletions graphics/pokemon/brambleghast/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
88 72 88
192 152 184
128 120 96
56 48 32
16 16 16
128 104 128
216 216 176
160 152 120
184 160 104
128 104 72
64 56 32
32 32 40
240 176 136
0 0 0
0 0 0
Binary file added graphics/pokemon/bramblin/back.png
Binary file added graphics/pokemon/bramblin/front.png
Binary file added graphics/pokemon/bramblin/icon.png
19 changes: 19 additions & 0 deletions graphics/pokemon/bramblin/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
144 104 64
96 64 32
176 136 80
200 160 96
128 80 56
16 16 16
208 112 80
184 88 56
136 96 80
72 56 48
104 80 72
128 80 56
0 0 0
0 0 0
0 0 0
19 changes: 19 additions & 0 deletions graphics/pokemon/bramblin/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
152 208 160
120 112 72
80 72 56
152 152 104
208 208 152
168 96 56
16 16 16
208 112 80
224 128 80
112 120 72
48 48 24
80 96 56
128 80 56
0 0 0
0 0 0
0 0 0
Binary file added graphics/pokemon/brute_bonnet/back.png
Binary file added graphics/pokemon/brute_bonnet/front.png
Binary file added graphics/pokemon/brute_bonnet/icon.png
19 changes: 19 additions & 0 deletions graphics/pokemon/brute_bonnet/normal.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 210 164
227 45 45
98 72 65
57 105 65
213 105 139
139 242 139
65 48 49
255 220 100
106 153 115
0 0 0
238 182 205
115 36 32
32 32 32
156 149 131
41 24 24
205 198 197
19 changes: 19 additions & 0 deletions graphics/pokemon/brute_bonnet/shiny.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
156 210 164
115 82 222
82 74 65
57 105 65
213 105 139
139 242 139
49 49 49
255 220 100
106 153 115
0 0 0
238 182 205
82 65 164
32 32 32
164 156 123
41 24 24
213 205 172
Binary file added graphics/pokemon/capsakid/back.png
Binary file added graphics/pokemon/capsakid/front.png
Binary file added graphics/pokemon/capsakid/icon.png
Loading
Loading