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

HGSS Style Pokedex #3288

Merged
merged 101 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
abf5d23
PokedexPlus with HGSS styled UI by TheXaman
TheXaman Oct 31, 2020
38f3695
Support for Battle Engine and Pokémon Expansion (#1)
AsparagusEduardo Nov 8, 2020
86412bf
fixed tileset and stats screen bug
TheXaman Nov 8, 2020
094a0b8
More BattleEngine and PokemonExpansion compatibility
TheXaman Nov 14, 2020
04bf06a
Removed unnecessary check for BE
TheXaman Nov 15, 2020
fbbc604
Added evolution screen! Improved BE compatibility
TheXaman Feb 4, 2021
379a862
fixes a PE compatibility bug, thanks to BioToxtrix for pointing it out
TheXaman Feb 4, 2021
e663c35
Fixed missing SHEDINJA and updated ingame evolution description, than…
TheXaman Feb 5, 2021
88207a0
Implemented stat bars on main scrolling page, idea from Jaizu and cod…
TheXaman Feb 11, 2021
1b3b717
Added Forms screen for PokemonExpansion (rhh)
TheXaman Feb 11, 2021
80af708
Fixed EVO_SPECIFIC_MAP (PE from rhh), huge thanks to "Spherical Ice"
TheXaman Feb 11, 2021
ac7a388
fixed small bug in calcing times
TheXaman Feb 11, 2021
c89df9d
Changed graphics file structure, added DECAPPED version by NobodySoci…
TheXaman Feb 12, 2021
6556d52
Fixed small bug
TheXaman Feb 12, 2021
1463b85
Small change how hidden abilities are accessed in PE
TheXaman Jun 9, 2021
74e562d
friendship now emoji based
TheXaman Jun 12, 2021
73cc40f
Egg cycles now with icons insteat of numbers
TheXaman Jun 12, 2021
eeb1ec8
WIP change how EVs are displayed
TheXaman Jun 12, 2021
6bbdc79
EVs represented by Arrows instead of numbers, also now in 1 line
TheXaman Jun 12, 2021
ac56eec
shortened evo methodes, fixed typos
TheXaman Jun 12, 2021
13256b8
Egg groups now in one line (if 2 different one),
TheXaman Jun 12, 2021
3896ce3
changed info per stats toggle page to an equal 5
TheXaman Jun 12, 2021
537a177
EV Arrows now close to stats
TheXaman Jun 12, 2021
1530da1
changed catch rate to words
TheXaman Jun 12, 2021
982647d
Evolution screen now shows caught ball, new options for hiding unseen…
TheXaman Jun 14, 2021
d001230
stats page new navigation button prompts
TheXaman Jun 14, 2021
2d4a91f
added Decapped version of the button prompts
TheXaman Jun 14, 2021
6b8f40b
new layout for evo screen and new buttons for the PE version
TheXaman Jun 14, 2021
3c22d55
form screen new navigation buttons and special case for Unown
TheXaman Jun 14, 2021
a83ece8
fixed navigation buttons on evo page not showing when switching from …
TheXaman Jun 19, 2021
c9d902d
Renamed functions for better readability
TheXaman Jul 2, 2021
9a5c196
recursive printing of evolutions aka now shows all follow up evolutio…
TheXaman Jul 11, 2021
883995d
shortened "human like" to "humane" to avoid clipping
TheXaman Jul 12, 2021
4989c61
fixed evo screen "dash overwriting text above" problem, thanks to tri…
TheXaman Oct 6, 2021
856403c
fixed the gray underlay in the list view, thanks to shadow300 for not…
TheXaman Oct 6, 2021
6a3f3ab
improved dynamicness, improved support for "tx_difficulty_challenges"
TheXaman Oct 11, 2021
32d0aff
cleanup of evolutions page code
TheXaman Oct 11, 2021
dd011d5
improved "x_difficulty_challenges" compatibility
TheXaman Oct 11, 2021
11dd0ea
added support for randomized evolutions and evo methods
TheXaman Oct 11, 2021
1eb33ed
fixed small problem with #ifdef not working for #include
TheXaman Oct 18, 2021
e42929d
added comments for BE users, removed dead code, imrpoved compatibility
TheXaman Oct 24, 2021
48c21df
added special eevee handling for PE to show all possible evolution icons
TheXaman Oct 24, 2021
475bb8a
added preEvolutions to the EvoScreen!
TheXaman Oct 24, 2021
347a173
Prevent text glitch if a pokemon has an unspecified custom evolution
silasary Oct 21, 2021
d391112
Better compatibility
silasary Oct 25, 2021
a2eff37
added type icons to the "caught mon screen"
TheXaman Nov 4, 2021
c1272f4
fixed tilemap for PreEvo changes
TheXaman Nov 4, 2021
ebd6a7b
added split icons for better support of rhh's BattleEngine
TheXaman Nov 10, 2021
d851ef9
Merge pull request #7 from silasary/tx_pokedexPlus_hgss
TheXaman Nov 16, 2021
1115551
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_…
TheXaman Nov 18, 2021
8f94b91
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_…
TheXaman Nov 27, 2021
07de572
Reworked stats screen to use windows
TheXaman Nov 27, 2021
3acc0f4
further improved the windows, reworked a lot of code, massivly reduce…
TheXaman Nov 27, 2021
499fe6b
small improvements
TheXaman Nov 28, 2021
50d6cf2
changed abilities to u16 for the rhh expansions, thanks to @Asparagus…
TheXaman Dec 7, 2021
026150d
now used EWRAM struct instead of accessing gBaseStats as often
TheXaman Dec 18, 2021
02ff9b4
only redraws move power/accuracy on contest switch
TheXaman Dec 18, 2021
f4f3058
Update pokedex.c
LOuroboros Dec 21, 2021
c9704e1
Merge pull request #11 from LOuroboros/patch-2
TheXaman Dec 21, 2021
9446ad1
added the ability to directly open evolutions from the EVO page
TheXaman Jan 3, 2022
27e7a48
Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pok…
TheXaman Jan 3, 2022
b2601f0
added the ability to check out all data (base stats, moves, abilities…
TheXaman Jan 3, 2022
868d51d
fixed a potential bug
TheXaman Jan 3, 2022
1626db9
fixed unown forms page for unown forms (base form worked before)
TheXaman Jan 3, 2022
a81841d
Update pokedex.c
LOuroboros Feb 15, 2022
c1ccb0c
Merge pull request #13 from LOuroboros/patch-2
TheXaman Feb 18, 2022
a305e09
small fix preventing selection sprites if no forms exist
TheXaman Mar 14, 2022
edc46a9
changes for new tx_randomizer_and_challenges
TheXaman Apr 16, 2022
8006b8d
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_…
TheXaman Apr 16, 2022
509b92b
saves the gba from calculating randomized preEvolutions
TheXaman Apr 16, 2022
5bb3e78
more tx_randomizer_and_challenges compatibility
TheXaman Apr 17, 2022
02ac6bb
Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pok…
TheXaman Apr 17, 2022
59fea06
Fixed compile when using both Pokémon expansion and randomizer/challe…
AsparagusEduardo Apr 25, 2022
599153b
Merge pull request #22 from AsparagusEduardo/tx_pokedexFix
TheXaman Apr 25, 2022
6684ec9
Fixed dex showing incorrect moves when using PE and BE
AsparagusEduardo May 8, 2022
fe63251
Merge pull request #23 from AsparagusEduardo/tx_dexFix
TheXaman May 8, 2022
6b217bb
fixes sprites on form pages not respecting the form (correct branch t…
TheXaman May 14, 2022
675957c
new caught mon page should now show proper form in PE
TheXaman May 14, 2022
a8da254
new caught pokemon forms (PE) now show the proper gender based sprite…
TheXaman May 14, 2022
5ff1dce
improved BE compatibility, credits @AsparagusEduardo
TheXaman May 15, 2022
b21c320
tiny reformat
TheXaman May 15, 2022
19b8ec1
should fix not beeing able to select evo on base evo
TheXaman May 15, 2022
d8f399e
improved PokemonExpansion compatibility for Megas that dont have thei…
TheXaman May 16, 2022
53603f6
GetSpeciesRandomSeeded with addtional param
TheXaman May 21, 2022
933ec5e
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_…
TheXaman Oct 30, 2022
eaa74ca
Merge commit 'f4cb6d229f9c0130f763fa711c8a1f7ef59ac2c9' of https://gi…
TheXaman Mar 25, 2023
207fcec
fixes teachable moves change from rhh
TheXaman Mar 25, 2023
bc2c3e1
Moved all HGSS pokedex code into its own file
TheXaman Mar 27, 2023
c4231ba
Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pok…
AaghatIsLive Sep 8, 2023
cc273ed
Clean Up
AaghatIsLive Sep 8, 2023
e8f56d5
use rare candy instead of exp share
AaghatIsLive Sep 8, 2023
7832a43
Minor fixes
AaghatIsLive Sep 8, 2023
dbeaa2b
add config comment
AaghatIsLive Sep 8, 2023
6ac16c8
More clean up
AaghatIsLive Sep 9, 2023
332cc29
Add new Evo methods
AaghatIsLive Sep 9, 2023
1b17e3a
set hgss pokedex off by default
AaghatIsLive Sep 9, 2023
2d2a255
Forgot to change caught mon dex page
AaghatIsLive Sep 9, 2023
e239073
remove the HGSS prefixes
AaghatIsLive Sep 11, 2023
daeb2ef
some minor clean up
AaghatIsLive Sep 11, 2023
75bf32e
Applied requested changes
AaghatIsLive Sep 17, 2023
58cd22b
Added dark mode
AaghatIsLive Sep 17, 2023
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
1 change: 1 addition & 0 deletions charmap.txt
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ SUPER_RE = A0
'ä' = F4
'ö' = F5
'ü' = F6
EMOJI_DIZZYEGG = F7
TALL_PLUS = FC 0C FB
'$' = FF

Expand Down
Binary file modified graphics/fonts/latin_small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 15 additions & 15 deletions graphics/pokedex/bg_hoenn.pal
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
JASC-PAL
0100
48
123 131 0
255 255 255
222 222 222
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
49 213 74
24 131 32
189 156 90
193 33 177
249 249 249
225 225 225
201 201 201
169 169 169
129 129 129
249 153 161
233 49 49
193 33 41
145 17 33
249 153 161
193 33 41
141 251 184
52 66 162
194 181 66
0 0 0
123 131 0
255 255 255
Expand Down
30 changes: 15 additions & 15 deletions graphics/pokedex/caught_screen.pal
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
JASC-PAL
0100
48
123 131 0
255 255 255
255 238 0
255 189 0
255 115 0
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
49 213 74
24 131 32
189 156 90
193 33 177
249 249 249
225 225 225
201 201 201
169 169 169
129 129 129
249 153 161
233 49 49
193 33 41
145 17 33
249 153 161
193 33 41
141 251 184
52 66 162
194 181 66
0 0 0
123 131 0
255 255 255
Expand Down
Binary file added graphics/pokedex/hgss/SelectBar.bin
Binary file not shown.
Binary file added graphics/pokedex/hgss/SelectBar_clear.bin
Binary file not shown.
51 changes: 51 additions & 0 deletions graphics/pokedex/hgss/palette_default.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
193 33 177
249 249 249
225 225 225
201 201 201
169 169 169
129 129 129
249 153 161
233 49 49
193 33 41
145 17 33
249 153 161
193 33 41
141 251 184
52 66 162
194 181 66
0 0 0
123 131 0
255 255 255
197 32 32
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
49 213 74
24 131 32
189 156 90
0 0 0
123 131 0
255 255 255
197 32 32
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
180 205 246
49 139 255
189 156 90
0 0 0
51 changes: 51 additions & 0 deletions graphics/pokedex/hgss/palette_default_dark.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
193 33 177
249 249 249
225 225 225
201 201 201
169 169 169
129 129 129
249 153 161
233 49 49
193 33 41
145 17 33
249 153 161
193 33 41
141 251 184
52 66 162
194 181 66
0 0 0
123 131 0
255 255 255
197 32 32
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
49 213 74
24 131 32
189 156 90
0 0 0
123 131 0
255 255 255
197 32 32
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
180 205 246
49 139 255
189 156 90
0 0 0
51 changes: 51 additions & 0 deletions graphics/pokedex/hgss/palette_national.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
193 33 177
249 249 249
225 225 225
201 201 201
169 169 169
129 129 129
249 153 161
233 49 49
193 33 41
145 17 33
249 153 161
193 33 41
141 251 184
52 66 162
194 181 66
0 0 0
123 131 0
255 255 255
197 32 32
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
49 213 74
24 131 32
189 156 90
0 0 0
123 131 0
255 255 255
197 32 32
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
180 205 246
49 139 255
189 156 90
0 0 0
51 changes: 51 additions & 0 deletions graphics/pokedex/hgss/palette_national_dark.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
JASC-PAL
0100
48
193 33 177
249 249 249
225 225 225
201 201 201
169 169 169
129 129 129
106 106 106
37 37 37
106 106 106
0 0 0
106 106 106
193 33 41
141 251 184
52 66 162
194 181 66
0 0 0
123 131 0
255 255 255
197 32 32
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
49 213 74
24 131 32
189 156 90
0 0 0
123 131 0
255 255 255
197 32 32
189 189 189
164 164 164
98 98 115
41 57 65
41 57 106
0 0 41
255 255 255
238 246 57
255 0 189
180 205 246
49 139 255
189 156 90
0 0 0
67 changes: 67 additions & 0 deletions graphics/pokedex/hgss/palette_search_menu.pal
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
JASC-PAL
0100
64
123 131 0
0 0 0
172 172 172
255 255 255
255 255 255
98 98 115
57 57 57
123 115 74
156 230 0
57 115 0
255 172 0
131 32 32
82 189 90
24 131 32
255 32 32
0 0 0
123 131 0
0 0 0
172 172 172
255 255 255
255 255 255
98 98 115
57 57 57
123 115 74
41 115 0
32 49 32
180 106 0
16 0 0
82 189 90
24 131 32
0 0 0
0 0 0
123 131 0
0 0 0
172 172 172
172 172 172
172 172 172
98 98 115
57 57 57
123 115 74
32 49 32
32 32 32
74 32 32
32 32 32
82 189 90
24 131 32
255 32 32
0 0 0
123 131 0
0 0 0
172 172 172
172 172 172
172 172 172
98 98 115
57 57 57
123 115 74
32 49 32
32 32 32
74 32 32
32 32 32
82 189 90
24 131 32
0 0 0
0 0 0
Loading
Loading