From c89df9d9d1e66e7ef280a3a8219305217b404426 Mon Sep 17 00:00:00 2001
From: TheXaman <maxvdl@web.de>
Date: Fri, 12 Feb 2021 11:16:23 +0100
Subject: [PATCH] Changed graphics file structure, added DECAPPED version by
 NobodySociety, added constant to make custom dark palette switch easy

---
 ...ect_bar_submenu.bin => HGSS_SelectBar.bin} | Bin
 ...enu_clear.bin => HGSS_SelectBar_clear.bin} | Bin
 graphics/pokedex/HGSS_palette_default.pal     |  51 ++++++
 .../pokedex/HGSS_palette_default_dark.pal     |  51 ++++++
 graphics/pokedex/HGSS_palette_national.pal    |  51 ++++++
 .../pokedex/HGSS_palette_national_dark.pal    |  51 ++++++
 ..._menu.pal => HGSS_palette_search_menu.pal} |   0
 .../pokedex/HGSS_palette_search_menu_dark.pal |  67 +++++++
 ...et.pal => HGSS_palette_search_results.pal} |   0
 .../HGSS_palette_search_results_dark.pal      |  19 ++
 ...screen.bin => HGSS_tilemap_cry_screen.bin} | Bin
 ...ilemap.bin => HGSS_tilemap_evo_screen.bin} | Bin
 ...map.bin => HGSS_tilemap_evo_screen_PE.bin} | Bin
 ...emap.bin => HGSS_tilemap_forms_screen.bin} | Bin
 ...creen.bin => HGSS_tilemap_info_screen.bin} | Bin
 ...{list.bin => HGSS_tilemap_list_screen.bin} | Bin
 ... => HGSS_tilemap_list_screen_underlay.bin} | Bin
 ...n => HGSS_tilemap_search_screen_hoenn.bin} | Bin
 ...> HGSS_tilemap_search_screen_national.bin} | Bin
 ...creen.bin => HGSS_tilemap_size_screen.bin} | Bin
 ...u_main.bin => HGSS_tilemap_start_menu.bin} | Bin
 ...GSS_tilemap_start_menu_search_results.bin} | Bin
 ...reen.bin => HGSS_tilemap_stats_screen.bin} | Bin
 ...terface.png => HGSS_tileset_interface.png} | Bin
 .../pokedex/HGSS_tileset_interface_DECA.png   | Bin 0 -> 1097 bytes
 .../{menu.png => HGSS_tileset_menu1.png}      | Bin
 ...evo_tileset.png => HGSS_tileset_menu2.png} | Bin
 .../{menu_rest.png => HGSS_tileset_menu3.png} | Bin
 ...nu_list.png => HGSS_tileset_menu_list.png} | Bin
 .../pokedex/HGSS_tileset_menu_list_DECA.png   | Bin 0 -> 1542 bytes
 ..._menu.png => HGSS_tileset_menu_search.png} | Bin
 .../pokedex/HGSS_tileset_menu_search_DECA.png | Bin 0 -> 1742 bytes
 graphics/pokedex/RES_HGSS_palette.pal         |  19 ++
 graphics/pokedex/bg_national.pal              |  99 ----------
 graphics/pokedex/menuOLD.png                  | Bin 2045 -> 0 bytes
 graphics/pokedex/screen_select_bar_main.bin   | Bin 192 -> 0 bytes
 graphics/pokedex/search_results_bg.pal        |  99 ----------
 include/graphics.h                            |  61 ++++---
 src/graphics.c                                |  68 +++----
 src/pokedex.c                                 | 172 +++++++++++++-----
 40 files changed, 510 insertions(+), 298 deletions(-)
 rename graphics/pokedex/{screen_select_bar_submenu.bin => HGSS_SelectBar.bin} (100%)
 rename graphics/pokedex/{screen_select_bar_submenu_clear.bin => HGSS_SelectBar_clear.bin} (100%)
 create mode 100644 graphics/pokedex/HGSS_palette_default.pal
 create mode 100644 graphics/pokedex/HGSS_palette_default_dark.pal
 create mode 100644 graphics/pokedex/HGSS_palette_national.pal
 create mode 100644 graphics/pokedex/HGSS_palette_national_dark.pal
 rename graphics/pokedex/{search_menu.pal => HGSS_palette_search_menu.pal} (100%)
 create mode 100644 graphics/pokedex/HGSS_palette_search_menu_dark.pal
 rename graphics/pokedex/{hgss_pokedex_tileset.pal => HGSS_palette_search_results.pal} (100%)
 create mode 100644 graphics/pokedex/HGSS_palette_search_results_dark.pal
 rename graphics/pokedex/{cry_screen.bin => HGSS_tilemap_cry_screen.bin} (100%)
 rename graphics/pokedex/{evo_tilemap.bin => HGSS_tilemap_evo_screen.bin} (100%)
 rename graphics/pokedex/{evoPE_tilemap.bin => HGSS_tilemap_evo_screen_PE.bin} (100%)
 rename graphics/pokedex/{forms_tilemap.bin => HGSS_tilemap_forms_screen.bin} (100%)
 rename graphics/pokedex/{info_screen.bin => HGSS_tilemap_info_screen.bin} (100%)
 rename graphics/pokedex/{list.bin => HGSS_tilemap_list_screen.bin} (100%)
 rename graphics/pokedex/{list_underlay.bin => HGSS_tilemap_list_screen_underlay.bin} (100%)
 rename graphics/pokedex/{search_menu_hoenn.bin => HGSS_tilemap_search_screen_hoenn.bin} (100%)
 rename graphics/pokedex/{search_menu_national.bin => HGSS_tilemap_search_screen_national.bin} (100%)
 rename graphics/pokedex/{size_screen.bin => HGSS_tilemap_size_screen.bin} (100%)
 rename graphics/pokedex/{start_menu_main.bin => HGSS_tilemap_start_menu.bin} (100%)
 rename graphics/pokedex/{start_menu_search_results.bin => HGSS_tilemap_start_menu_search_results.bin} (100%)
 rename graphics/pokedex/{stats_screen.bin => HGSS_tilemap_stats_screen.bin} (100%)
 rename graphics/pokedex/{interface.png => HGSS_tileset_interface.png} (100%)
 create mode 100644 graphics/pokedex/HGSS_tileset_interface_DECA.png
 rename graphics/pokedex/{menu.png => HGSS_tileset_menu1.png} (100%)
 rename graphics/pokedex/{evo_tileset.png => HGSS_tileset_menu2.png} (100%)
 rename graphics/pokedex/{menu_rest.png => HGSS_tileset_menu3.png} (100%)
 rename graphics/pokedex/{menu_list.png => HGSS_tileset_menu_list.png} (100%)
 create mode 100644 graphics/pokedex/HGSS_tileset_menu_list_DECA.png
 rename graphics/pokedex/{search_menu.png => HGSS_tileset_menu_search.png} (100%)
 create mode 100644 graphics/pokedex/HGSS_tileset_menu_search_DECA.png
 create mode 100644 graphics/pokedex/RES_HGSS_palette.pal
 delete mode 100644 graphics/pokedex/bg_national.pal
 delete mode 100644 graphics/pokedex/menuOLD.png
 delete mode 100644 graphics/pokedex/screen_select_bar_main.bin
 delete mode 100644 graphics/pokedex/search_results_bg.pal

diff --git a/graphics/pokedex/screen_select_bar_submenu.bin b/graphics/pokedex/HGSS_SelectBar.bin
similarity index 100%
rename from graphics/pokedex/screen_select_bar_submenu.bin
rename to graphics/pokedex/HGSS_SelectBar.bin
diff --git a/graphics/pokedex/screen_select_bar_submenu_clear.bin b/graphics/pokedex/HGSS_SelectBar_clear.bin
similarity index 100%
rename from graphics/pokedex/screen_select_bar_submenu_clear.bin
rename to graphics/pokedex/HGSS_SelectBar_clear.bin
diff --git a/graphics/pokedex/HGSS_palette_default.pal b/graphics/pokedex/HGSS_palette_default.pal
new file mode 100644
index 0000000000..5889ede7ac
--- /dev/null
+++ b/graphics/pokedex/HGSS_palette_default.pal
@@ -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
diff --git a/graphics/pokedex/HGSS_palette_default_dark.pal b/graphics/pokedex/HGSS_palette_default_dark.pal
new file mode 100644
index 0000000000..5889ede7ac
--- /dev/null
+++ b/graphics/pokedex/HGSS_palette_default_dark.pal
@@ -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
diff --git a/graphics/pokedex/HGSS_palette_national.pal b/graphics/pokedex/HGSS_palette_national.pal
new file mode 100644
index 0000000000..5889ede7ac
--- /dev/null
+++ b/graphics/pokedex/HGSS_palette_national.pal
@@ -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
diff --git a/graphics/pokedex/HGSS_palette_national_dark.pal b/graphics/pokedex/HGSS_palette_national_dark.pal
new file mode 100644
index 0000000000..5889ede7ac
--- /dev/null
+++ b/graphics/pokedex/HGSS_palette_national_dark.pal
@@ -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
diff --git a/graphics/pokedex/search_menu.pal b/graphics/pokedex/HGSS_palette_search_menu.pal
similarity index 100%
rename from graphics/pokedex/search_menu.pal
rename to graphics/pokedex/HGSS_palette_search_menu.pal
diff --git a/graphics/pokedex/HGSS_palette_search_menu_dark.pal b/graphics/pokedex/HGSS_palette_search_menu_dark.pal
new file mode 100644
index 0000000000..b6142eb3f7
--- /dev/null
+++ b/graphics/pokedex/HGSS_palette_search_menu_dark.pal
@@ -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
diff --git a/graphics/pokedex/hgss_pokedex_tileset.pal b/graphics/pokedex/HGSS_palette_search_results.pal
similarity index 100%
rename from graphics/pokedex/hgss_pokedex_tileset.pal
rename to graphics/pokedex/HGSS_palette_search_results.pal
diff --git a/graphics/pokedex/HGSS_palette_search_results_dark.pal b/graphics/pokedex/HGSS_palette_search_results_dark.pal
new file mode 100644
index 0000000000..892bb6c104
--- /dev/null
+++ b/graphics/pokedex/HGSS_palette_search_results_dark.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+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
+156 226 199
+141 251 184
+52 66 162
+194 181 66
+159 216 234
+0 0 0
diff --git a/graphics/pokedex/cry_screen.bin b/graphics/pokedex/HGSS_tilemap_cry_screen.bin
similarity index 100%
rename from graphics/pokedex/cry_screen.bin
rename to graphics/pokedex/HGSS_tilemap_cry_screen.bin
diff --git a/graphics/pokedex/evo_tilemap.bin b/graphics/pokedex/HGSS_tilemap_evo_screen.bin
similarity index 100%
rename from graphics/pokedex/evo_tilemap.bin
rename to graphics/pokedex/HGSS_tilemap_evo_screen.bin
diff --git a/graphics/pokedex/evoPE_tilemap.bin b/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin
similarity index 100%
rename from graphics/pokedex/evoPE_tilemap.bin
rename to graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin
diff --git a/graphics/pokedex/forms_tilemap.bin b/graphics/pokedex/HGSS_tilemap_forms_screen.bin
similarity index 100%
rename from graphics/pokedex/forms_tilemap.bin
rename to graphics/pokedex/HGSS_tilemap_forms_screen.bin
diff --git a/graphics/pokedex/info_screen.bin b/graphics/pokedex/HGSS_tilemap_info_screen.bin
similarity index 100%
rename from graphics/pokedex/info_screen.bin
rename to graphics/pokedex/HGSS_tilemap_info_screen.bin
diff --git a/graphics/pokedex/list.bin b/graphics/pokedex/HGSS_tilemap_list_screen.bin
similarity index 100%
rename from graphics/pokedex/list.bin
rename to graphics/pokedex/HGSS_tilemap_list_screen.bin
diff --git a/graphics/pokedex/list_underlay.bin b/graphics/pokedex/HGSS_tilemap_list_screen_underlay.bin
similarity index 100%
rename from graphics/pokedex/list_underlay.bin
rename to graphics/pokedex/HGSS_tilemap_list_screen_underlay.bin
diff --git a/graphics/pokedex/search_menu_hoenn.bin b/graphics/pokedex/HGSS_tilemap_search_screen_hoenn.bin
similarity index 100%
rename from graphics/pokedex/search_menu_hoenn.bin
rename to graphics/pokedex/HGSS_tilemap_search_screen_hoenn.bin
diff --git a/graphics/pokedex/search_menu_national.bin b/graphics/pokedex/HGSS_tilemap_search_screen_national.bin
similarity index 100%
rename from graphics/pokedex/search_menu_national.bin
rename to graphics/pokedex/HGSS_tilemap_search_screen_national.bin
diff --git a/graphics/pokedex/size_screen.bin b/graphics/pokedex/HGSS_tilemap_size_screen.bin
similarity index 100%
rename from graphics/pokedex/size_screen.bin
rename to graphics/pokedex/HGSS_tilemap_size_screen.bin
diff --git a/graphics/pokedex/start_menu_main.bin b/graphics/pokedex/HGSS_tilemap_start_menu.bin
similarity index 100%
rename from graphics/pokedex/start_menu_main.bin
rename to graphics/pokedex/HGSS_tilemap_start_menu.bin
diff --git a/graphics/pokedex/start_menu_search_results.bin b/graphics/pokedex/HGSS_tilemap_start_menu_search_results.bin
similarity index 100%
rename from graphics/pokedex/start_menu_search_results.bin
rename to graphics/pokedex/HGSS_tilemap_start_menu_search_results.bin
diff --git a/graphics/pokedex/stats_screen.bin b/graphics/pokedex/HGSS_tilemap_stats_screen.bin
similarity index 100%
rename from graphics/pokedex/stats_screen.bin
rename to graphics/pokedex/HGSS_tilemap_stats_screen.bin
diff --git a/graphics/pokedex/interface.png b/graphics/pokedex/HGSS_tileset_interface.png
similarity index 100%
rename from graphics/pokedex/interface.png
rename to graphics/pokedex/HGSS_tileset_interface.png
diff --git a/graphics/pokedex/HGSS_tileset_interface_DECA.png b/graphics/pokedex/HGSS_tileset_interface_DECA.png
new file mode 100644
index 0000000000000000000000000000000000000000..2332c79fa0eac417e94a0b7e03396d78ddd967f4
GIT binary patch
literal 1097
zcmV-P1h)H$P)<h;3K|Lk000e1NJLTq001BW00ICA0{{R3)R&&w00004XF*Lt006O$
zeEU(80000mP)t-s!6C8v`T61D;mOI#si~=ffr0s%q3JO(!67M;5h3}Rp}`?3jr+JX
zLZZU8LI3~&;9J4f000BTNkl<Zc%1E7?T#xU2z3%R{mJ{k?H%Pq1=M!iY?>QRr&CAI
z2qG%lQf43y$qHBAv+!{PZTX#rYXVXpt_W1F3`dZ1VOT;hXND(?@Xf?gd;~m{H$qr0
za&Yy&6a;oZRQ-~2hdL681%4Wmkc1>8;d8(xr2Me}uc-Lo>mdmWM6gEz<{~OFRs_~T
z38RRJ@W4Y2o-pa4t&odIJ*GO@;cUtO0@sE2m+mcvoY$^9jd<N3tUr{}n-EHUq!edM
zUdwKUo={XoV_Yh9Adou5s5($i{bE;++kvCHgL0E(O<|YAO4htqyJjQHVI>j8BMRS&
z{`_5ky^T-J5A)Z}4>T;Xk5W577=oW4_^p-<hyT6?Pw?}DCFJ~IL1Xulkx{Nbnwd~b
zX@bB@hgm@2bU=_1JEcA0lD7kbPEtH<9YH6ELNnc-5Q(sMplL`6H90zf%o2&Wahnmg
z<p8i}BpTRAWY5Ssp%sxm>)lsDMHLXbcbi+=yHrms0@};%9*O|ELkV?w8PJB}rY6#O
z!@yR!AwW40&NXne*IFhLiA3TxWc=_U&<e))aP=Pv(b_FV^jV9bD<V+*AR$VmB?k_&
zqJ99!T8`fH2ZW3q5{bk&AlT~6k8cooHSYvn-T9GMb6O~B4p;)G`uZRQm<hkueqG=q
z4RrIimE~%dX0sin4g4$wu><nn*V#o{0kqZjb^+5&`y8l;fx0AWdJ$~IWeLs>80_HH
zAz0}qTbtVrHTOSqbGv_Zg4#v3<ThGm_sv_LHUyF8$+N711A+=2d$k)(%w+n%_kj}F
z07Kk_>IhN0ZC=<%u|Ldq0Q;tEX5cV^F9vp4jtjBFa$JZV+_<o^y|OrugTu*BB9ZtK
zL@Uv62z<s4H2+M~8=ao>8T)waHPGgkcG;X7#r7PegZ7XBa?&2uKwIQ~(hhyw+?Cvc
zUt8m8i+?w^-A!HF;|m||DS`hn;TTH(fswvr2M}M74@`uXq;N$~P~@U#Pe98lfP)~d
zg#DqPo5+(CeU(4x3U9KWC-5IoYeMl#KidW$2Dy-Kj%F<1X}><7bggi464*$j7}1k-
zXBXFd&v&K^>RgaF+rildjJ7~iS|ACmy}X5&`v-kvtQx(4%ntC9Q=`+x`o|nk+Nv>V
z%_^>T{XY|m@kTdc*>+n&PPrGXu(yM4w{J{jxu@*l{DD}*3&r?@vBP3q6q6C?5@`4K
zxQLWn?#_16%8?Mvla}%8$$jO;T{-Ijj!^d6ClZN7B9TZW5{X12@p=3MqV#DpTGNVh
P00000NkvXXu0mjfZxsY}

literal 0
HcmV?d00001

diff --git a/graphics/pokedex/menu.png b/graphics/pokedex/HGSS_tileset_menu1.png
similarity index 100%
rename from graphics/pokedex/menu.png
rename to graphics/pokedex/HGSS_tileset_menu1.png
diff --git a/graphics/pokedex/evo_tileset.png b/graphics/pokedex/HGSS_tileset_menu2.png
similarity index 100%
rename from graphics/pokedex/evo_tileset.png
rename to graphics/pokedex/HGSS_tileset_menu2.png
diff --git a/graphics/pokedex/menu_rest.png b/graphics/pokedex/HGSS_tileset_menu3.png
similarity index 100%
rename from graphics/pokedex/menu_rest.png
rename to graphics/pokedex/HGSS_tileset_menu3.png
diff --git a/graphics/pokedex/menu_list.png b/graphics/pokedex/HGSS_tileset_menu_list.png
similarity index 100%
rename from graphics/pokedex/menu_list.png
rename to graphics/pokedex/HGSS_tileset_menu_list.png
diff --git a/graphics/pokedex/HGSS_tileset_menu_list_DECA.png b/graphics/pokedex/HGSS_tileset_menu_list_DECA.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc84b9ea38c68347040e85a4002a4856cf0cbcf8
GIT binary patch
literal 1542
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

literal 0
HcmV?d00001

diff --git a/graphics/pokedex/search_menu.png b/graphics/pokedex/HGSS_tileset_menu_search.png
similarity index 100%
rename from graphics/pokedex/search_menu.png
rename to graphics/pokedex/HGSS_tileset_menu_search.png
diff --git a/graphics/pokedex/HGSS_tileset_menu_search_DECA.png b/graphics/pokedex/HGSS_tileset_menu_search_DECA.png
new file mode 100644
index 0000000000000000000000000000000000000000..3104d35452eb5c48cc4c5dea060e99f69ce8dc45
GIT binary patch
literal 1742
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

literal 0
HcmV?d00001

diff --git a/graphics/pokedex/RES_HGSS_palette.pal b/graphics/pokedex/RES_HGSS_palette.pal
new file mode 100644
index 0000000000..96fe4b782a
--- /dev/null
+++ b/graphics/pokedex/RES_HGSS_palette.pal
@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+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
\ No newline at end of file
diff --git a/graphics/pokedex/bg_national.pal b/graphics/pokedex/bg_national.pal
deleted file mode 100644
index 10dc02e885..0000000000
--- a/graphics/pokedex/bg_national.pal
+++ /dev/null
@@ -1,99 +0,0 @@
-JASC-PAL
-0100
-96
-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
-164 164 164
-41 57 65
-255 255 255
-238 246 57
-255 0 189
-123 164 115
-74 115 65
-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
-164 164 164
-41 57 65
-255 255 255
-238 246 57
-255 0 189
-180 205 246
-49 139 255
-189 156 90
-0 0 0
-123 131 0
-255 255 255
-255 238 0
-255 189 0
-255 115 0
-98 98 115
-41 57 65
-164 164 164
-41 57 65
-255 255 255
-238 246 57
-255 0 189
-123 164 115
-74 115 65
-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
-164 164 164
-41 57 65
-255 255 255
-238 246 57
-189 0 0
-74 148 180
-8 90 131
-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
-164 164 164
-41 57 65
-255 255 255
-238 246 57
-255 0 189
-180 205 246
-49 139 255
-189 156 90
-0 0 0
diff --git a/graphics/pokedex/menuOLD.png b/graphics/pokedex/menuOLD.png
deleted file mode 100644
index fea195312c06171e1717ec26aca2933805ea317f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2045
zcmV<Z2LkwsP)<h;3K|Lk000e1NJLTq004jh004jl0{{R3F%W$C0000mP)t-sdxHS~
z|Nq4xAicf4q@<)`Vsj}uK`A+E001ff|NrjxIsX8?G1W>KgCM<}S^xk5SrGW^000Mw
zNkl<ZXo1z4F>l*O6vwr+b7|O~Y6Q^gAwc^Hf-2dHqQfcBz#)UV*hZ&B$do0627Bbd
zv1`W+UNm?sGSDzQ2#5e3^bHC`2%5nV*!O?$?s!L?RMPI!rxSfV@_xGa?!Cu5y4NEq
zNfMGjNM4mE)G{n5B)Eol`tujssFZSD+7mkG6HQ_PiKZLA8R`f?Q?q`heSp?cfKr(Q
zC=v^xW(J@w0Qf2--=Fld?98c<kysU|nN>hrph5shPWapcP`3aG0QUa44Uz*sw*b_w
z3J|DZ?~mJnY}OeNs*rrwMui_qScSV}hg6?;T|Huey%q9V{?IXbg1+3pd4<0s2T;KQ
z@I^QJx;wo-(v2=YsfPu>*aE1eVrX?6L!A!ri%<pE=Lu`UZ4O{YP}L(~1A8M#5?=*7
z)<6Z}S^!UR0Pu}iC3Xb05yiA_2n@K}HBr0eh*cOrQvMS__81|+oANP2fHSV#R*MQ{
zO_lmGPS>}K+q#MGTT2N5YrW>8=~&;bmrE)>V2vAS`fzIqDA!z2sR4@{>Ky_~jT>(5
z&-@#J3f;T*0sOsP!~tZ6O~7JZx0FjV5q<_13jl1E#ab_naU6h7m%0YrX#B!0>7hda
zEXY3|7?A)=jH2{}0gE!G!g8@;gWIKE2Y|JF;(!}Wt`E4W2pUWR*+9qrK$jXt<5=IW
z_00kw-v$e9#Q+}d%8w4F?lK_3Gw8wjKmflxz`N?})_bGF7C>SF@9wA9+X!!_F=+tq
zsp)z=ep|exl8<vb7Db*j;FK;^$5d9+6&<T;wb}r@W9Zj$u5v1b;EHm9Rewc=5M1fU
z0M&{CW9q~JRK_)6N}U*h%5)QOKV3aNCLOp_4jGR_0F@QQ)FXiFCZK>ZB7h3Um`?j7
zSbSIjRA2yXH{ubf007%P<q`CwfLaAI-`ki9WWH-p1q)yyBSM9*Jbo&#`4|9JC?EJ3
z2UIHnMuidvRY(^q0(e^Wg+Ue4g-Qc3zVG+pNUzmPHC9wmVG+QG{&AnWO#7&?Gy&aR
zxdG@NOaVZ*ko`&o_hSJHN5VprL2UrP*zD5)Kw1I*rp~9+s|^5;peWKgmt5z1PG?1~
zsitWfsj<Kr05l!bt0+LC7-g>XY^3Ou0-$p95dd4?2cR=nT0Qz<E<{MRo~QT#pfMuF
zH3nR-YJk;WMqmKCz;87G+5%2FV45oM2nyC7fV2r16{!cf7C>2kbShXIAc|vvnaV?e
zeHu+XVHFer_=W(h1_LOUOx?VGY5=5+HjS9qM#Knogg`dHKoQHc9DrFtvmxP3jUm8$
zrgG<x04S9zt!8}GdX{QMe<Yl#5pCi~{SU`i9^j(`ba7?B4N81!3$Ve2`sC6yb^+LM
zo`~{JiPkDq7H|<-fmbMP0QQkSG2@?D9jKu-;AiQ=1UY`Pj^u^D<bydUfepZ2GBE})
zW^jNy^d%o~N{9dk=y1V3F9LuU`s~UhI&1}C_;hqS^uo}O1Fn3)#M#0J*wAkS;IUs=
zckYFuF95_-41f&e9LYFUFARMFD5bXn_U%;ibixn9&^IcC{hbjBa4<0zytIHY^f@2w
z0z9`<DbqQ*=!K!r`Ct|Y%oJ%bG<K{3x`kL*rU7Km7pw|x0nhRNY=3zEAb<_$eU+8Y
z7rLlm`ae_IS&4T?6E88e0w5O*USwagbF#zG#R5w!0Lw7@4S)7M0RA-dL9TI9j3hCn
z^VA1m$orX#g>o|=%sCm*M@eGH3kD<};NWZ%Q0D^^iuAkU(*`g|1b_|)=aLOYg=Riz
z0!AYNfIt95<8uSJ3;`w|%th}_z~IONUWf`NwKekrY~TZw1EdBpz-vifsaQV<@<CGt
zGYf-(5)}q2!;4V{n8^wA!8U*rBdTF`o;3kMJ|G(?%4ZDV#2^4=rZFQQII}7kZw~Xp
zjFK4@N(d$~c&Wkofe*m9lPlZ#m*pO&@v>bk@F0iT7xxa)0lGcjpSjnd3^0DsS_SjV
zWqFd6=K07g)vf@oPku!m`ackmsQ?h&FBGl?c_QVtaBfxjGYeFR?-y*#+|(shke&VK
z;;#JyH}W%9*79@0>c&EwRM^|PUqB<Z%<X1?0TBC6m;rmTXNv6?7$D=PN?|q*A)wsb
zx?hkLc)_b~-VewlyVpBo@3W9SyXD#3FDM>XZYxFw0K7Nbd%>QmxnGbLXCX6<5kPdm
zKs9OMR{^T_g8(3VrucpVslm3RD83p6baQ1Nu=jri*u}P=Sh@jz`hioLpV~SB-WveV
ziUn}EXh{j)5+S7zHV#-TP`w6V=r*hwVEou*1-nEbA0#f<)h58Lk9yx`J!AqC^vXoT
z2+w6@>n2Jpz$F7#A>)Uu1!xa|{cj!x(AOC8j;8gd28=lUIe>Z8k6@P61H3l?%qIMz
z2FzfC6h<@vHXoM$!3d1{hxB}q|Asn%%?L{I+9WlVrV6HdsI>#+)&?e}uofyey2w&t
z2S8r_(NQV@@XBDM&`KrZ2Z0J4@rZk=AS0NS0a{U%TO~vRx`RYj=n61CaCr1kfQf^{
b#HjEOB!6_L#;B%&00000NkvXXu0mjfTJeaY

diff --git a/graphics/pokedex/screen_select_bar_main.bin b/graphics/pokedex/screen_select_bar_main.bin
deleted file mode 100644
index 16bff536188aa2efc40405909c383d0c8252fcd2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 192
zcmbu$hYi9|6hqN76*ZxgK<E%U?7s&2FC*Y9S(asY^bBN1CT125g_X)S^4`%|?dIVX
mO<J^kBz5%-<;JGwmJOw~ja}q}lZ&gnr*|}I(ejP|zxD%!vJlq*

diff --git a/graphics/pokedex/search_results_bg.pal b/graphics/pokedex/search_results_bg.pal
deleted file mode 100644
index a5df732edf..0000000000
--- a/graphics/pokedex/search_results_bg.pal
+++ /dev/null
@@ -1,99 +0,0 @@
-JASC-PAL
-0100
-96
-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
-98 98 115
-49 49 65
-255 255 255
-238 246 57
-255 0 189
-123 148 32
-41 82 0
-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
-98 98 115
-49 49 65
-255 255 255
-238 246 57
-255 0 189
-180 205 246
-49 139 255
-189 156 90
-0 0 0
-123 131 0
-255 255 255
-255 238 0
-255 189 0
-255 115 0
-98 98 115
-41 57 65
-98 98 115
-49 49 65
-255 255 255
-238 246 57
-255 0 189
-123 148 32
-41 82 0
-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
-98 98 115
-49 49 65
-255 255 255
-238 246 57
-180 0 0
-74 148 180
-8 90 131
-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
-98 98 115
-49 49 65
-255 255 255
-238 246 57
-180 0 0
-180 205 246
-49 139 255
-189 156 90
-0 0 0
diff --git a/include/graphics.h b/include/graphics.h
index 7934619035..a62302443e 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -3283,33 +3283,42 @@ extern const u32 gBattleTerrainPalette_StadiumDrake[];
 extern const u32 gBattleTerrainPalette_StadiumWallace[];
 
 // pokedex
-extern const u32 gPokedexInterface_Gfx[];
-extern const u16 gPokedexBgHoenn_Pal[];
-extern const u32 gPokedexMenuRest_Gfx[];
-extern const u32 gPokedexEvo_Gfx[];
-extern const u32 gPokedexMenuList_Gfx[];
-extern const u32 gPokedexMenu_Gfx[];
-extern const u8 gPokedexList_Tilemap[];
-extern const u8 gPokedexListUnderlay_Tilemap[];
-extern const u8 gPokedexStartMenuMain_Tilemap[];
-extern const u8 gPokedexStartMenuSearchResults_Tilemap[];
+extern const u16 gPokedexDefault_Pal[];
+extern const u16 gPokedexNational_Pal[];
+extern const u16 gPokedexMenuSearch_Pal[];
 extern const u16 gPokedexSearchResults_Pal[];
-extern const u16 gPokedexBgNational_Pal[];
-extern const u8 gPokedexInfoScreen_Tilemap[];
-extern const u8 gPokedexStatsScreen_Tilemap[];
-extern const u8 gPokedexEvolutionScreen_Tilemap[];
-extern const u8 gPokedexEvolutionScreen_Tilemap_PE[];
-extern const u8 gPokedexFormsScreen_Tilemap[];
-extern const u8 gPokedexCryScreen_Tilemap[];
-extern const u8 gPokedexSizeScreen_Tilemap[];
-extern const u8 gPokedexScreenSelectBarMain_Tilemap[];
-extern const u8 gPokedexScreenSelectBarSubmenu_Tilemap[];
-extern const u8 gPokedexScreenSelectBarSubmenu_Tilemap_Clear[];
-extern const u16 gPokedexCaughtScreen_Pal[];
-extern const u32 gPokedexSearchMenu_Gfx[];
-extern const u32 gPokedexSearchMenuHoenn_Tilemap[];
-extern const u32 gPokedexSearchMenuNational_Tilemap[];
-extern const u16 gPokedexSearchMenu_Pal[];
+extern const u16 gPokedexDefault_dark_Pal[];
+extern const u16 gPokedexNational_dark_Pal[];
+extern const u16 gPokedexMenuSearch_dark_Pal[];
+extern const u16 gPokedexSearchResults_dark_Pal[];
+
+extern const u32 gPokedexMenuList_Gfx[];
+extern const u32 gPokedexMenuList_DECA_Gfx[];
+extern const u32 gPokedexInterface_Gfx[];
+extern const u32 gPokedexInterface_DECA_Gfx[];
+extern const u32 gPokedexMenu_1_Gfx[];
+extern const u32 gPokedexMenu_2_Gfx[];
+extern const u32 gPokedexMenu_3_Gfx[];
+extern const u32 gPokedexMenuSearch_Gfx[];
+extern const u32 gPokedexMenuSearch_DECA_Gfx[];
+extern const u32 gPokedexStartMenuMain_Tilemap[];
+extern const u32 gPokedexStartMenuSearchResults_Tilemap[];
+extern const u32 gUnused_PokedexNoBall[];
+extern const u32 gPokedexScreenSelectBarSubmenu_Tilemap[];
+extern const u32 gPokedexScreenSelectBarSubmenu_Tilemap_Clear[];
+
+extern const u32 gPokedexScreenList_Tilemap[];
+extern const u32 gPokedexScreenListUnderlay_Tilemap[];
+extern const u32 gPokedexScreenInfo_Tilemap[];
+extern const u32 gPokedexScreenStats_Tilemap[];
+extern const u32 gPokedexScreenEvolution_Tilemap[];
+extern const u32 gPokedexScreenEvolution_Tilemap_PE[];
+extern const u32 gPokedexScreenForms_Tilemap[];
+extern const u32 gPokedexScreenCry_Tilemap[];
+extern const u32 gPokedexScreenSize_Tilemap[];
+extern const u32 gPokedexScreenSearchHoenn_Tilemap[];
+extern const u32 gPokedexScreenSearchNational_Tilemap[];
+
 
 // berry tag screen
 extern const u32 gBerryCheck_Gfx[];
diff --git a/src/graphics.c b/src/graphics.c
index bf69f95bba..411bcc5be4 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1253,37 +1253,43 @@ const u16 gFrontierPassMedalsSilver_Pal[] = INCBIN_U16("graphics/frontier_pass/s
 const u16 gFrontierPassMedalsGold_Pal[] = INCBIN_U16("graphics/frontier_pass/gold.gbapal");
 
 // Pokedex
-const u16 gPokedexBgHoenn_Pal[] = INCBIN_U16("graphics/pokedex/bg_hoenn.gbapal");
-const u16 gPokedexCaughtScreen_Pal[] = INCBIN_U16("graphics/pokedex/caught_screen.gbapal");
-const u16 gPokedexSearchResults_Pal[] = INCBIN_U16("graphics/pokedex/search_results_bg.gbapal");
-const u16 gPokedexBgNational_Pal[] = INCBIN_U16("graphics/pokedex/bg_national.gbapal");
-const u32 gPokedexMenuRest_Gfx[] = INCBIN_U32("graphics/pokedex/menu_rest.4bpp.lz");
-const u32 gPokedexEvo_Gfx[] = INCBIN_U32("graphics/pokedex/evo_tileset.4bpp.lz");
-const u32 gPokedexMenuList_Gfx[] = INCBIN_U32("graphics/pokedex/menu_list.4bpp.lz");
-const u32 gPokedexMenu_Gfx[] = INCBIN_U32("graphics/pokedex/menu.4bpp.lz");
-const u32 gPokedexInterface_Gfx[] = INCBIN_U32("graphics/pokedex/interface.4bpp.lz");
-const u32 gUnused_PokedexNoBall[] = INCBIN_U32("graphics/pokedex/noball_unused.4bpp.lz");
-const u32 gPokedexStartMenuMain_Tilemap[] = INCBIN_U32("graphics/pokedex/start_menu_main.bin.lz");
-const u32 gPokedexStartMenuSearchResults_Tilemap[] = INCBIN_U32("graphics/pokedex/start_menu_search_results.bin.lz");
-const u32 gPokedexList_Tilemap[] = INCBIN_U32("graphics/pokedex/list.bin.lz");
-const u32 gPokedexListUnderlay_Tilemap[] = INCBIN_U32("graphics/pokedex/list_underlay.bin.lz");
-const u32 gPokedexSizeScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/size_screen.bin.lz");
-const u32 gPokedexScreenSelectBarMain_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_main.bin.lz");
-const u32 gPokedexScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu.bin.lz");
-const u32 gPokedexScreenSelectBarSubmenu_Tilemap_Clear[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu_clear.bin.lz");
-// const u32 gPokedexScreenSelectBarSubmenu_Area_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu_area.bin.lz");
-// const u32 gPokedexScreenSelectBarSubmenu_Cry_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu_cry.bin.lz");
-// const u32 gPokedexScreenSelectBarSubmenu_Size_Tilemap[] = INCBIN_U32("graphics/pokedex/screen_select_bar_submenu_size.bin.lz");
-const u32 gPokedexInfoScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/info_screen.bin.lz");
-const u32 gPokedexStatsScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/stats_screen.bin.lz");
-const u32 gPokedexEvolutionScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/evo_tilemap.bin.lz");
-const u32 gPokedexEvolutionScreen_Tilemap_PE[] = INCBIN_U32("graphics/pokedex/evoPE_tilemap.bin.lz");
-const u32 gPokedexFormsScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/forms_tilemap.bin.lz");
-const u32 gPokedexCryScreen_Tilemap[] = INCBIN_U32("graphics/pokedex/cry_screen.bin.lz");
-const u16 gPokedexSearchMenu_Pal[] = INCBIN_U16("graphics/pokedex/search_menu.gbapal");
-const u32 gPokedexSearchMenu_Gfx[] = INCBIN_U32("graphics/pokedex/search_menu.4bpp.lz");
-const u32 gPokedexSearchMenuNational_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_national.bin.lz");
-const u32 gPokedexSearchMenuHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/search_menu_hoenn.bin.lz");
+const u16 gPokedexDefault_Pal[]             = INCBIN_U16("graphics/pokedex/HGSS_palette_default.gbapal");
+const u16 gPokedexNational_Pal[]            = INCBIN_U16("graphics/pokedex/HGSS_palette_national.gbapal");
+const u16 gPokedexMenuSearch_Pal[]          = INCBIN_U16("graphics/pokedex/HGSS_palette_search_menu.gbapal");
+const u16 gPokedexSearchResults_Pal[]       = INCBIN_U16("graphics/pokedex/HGSS_palette_search_results.gbapal");
+const u16 gPokedexDefault_dark_Pal[]             = INCBIN_U16("graphics/pokedex/HGSS_palette_default_dark.gbapal");
+const u16 gPokedexNational_dark_Pal[]            = INCBIN_U16("graphics/pokedex/HGSS_palette_national_dark.gbapal");
+const u16 gPokedexMenuSearch_dark_Pal[]          = INCBIN_U16("graphics/pokedex/HGSS_palette_search_menu_dark.gbapal");
+const u16 gPokedexSearchResults_dark_Pal[]       = INCBIN_U16("graphics/pokedex/HGSS_palette_search_results_dark.gbapal");
+
+const u32 gPokedexMenuList_Gfx[]        = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu_list.4bpp.lz");
+const u32 gPokedexMenuList_DECA_Gfx[]   = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu_list_DECA.4bpp.lz");
+const u32 gPokedexInterface_Gfx[]       = INCBIN_U32("graphics/pokedex/HGSS_tileset_interface.4bpp.lz");
+const u32 gPokedexInterface_DECA_Gfx[]  = INCBIN_U32("graphics/pokedex/HGSS_tileset_interface_DECA.4bpp.lz");
+const u32 gPokedexMenu_1_Gfx[]      = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu1.4bpp.lz");
+const u32 gPokedexMenu_2_Gfx[]      = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu2.4bpp.lz");
+const u32 gPokedexMenu_3_Gfx[]      = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu3.4bpp.lz");
+const u32 gPokedexMenuSearch_Gfx[]          = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu_search.4bpp.lz");
+const u32 gPokedexMenuSearch_DECA_Gfx[]     = INCBIN_U32("graphics/pokedex/HGSS_tileset_menu_search_DECA.4bpp.lz");
+const u32 gPokedexStartMenuMain_Tilemap[]           = INCBIN_U32("graphics/pokedex/HGSS_tilemap_start_menu.bin.lz");
+const u32 gPokedexStartMenuSearchResults_Tilemap[]  = INCBIN_U32("graphics/pokedex/HGSS_tilemap_start_menu_search_results.bin.lz");
+const u32 gUnused_PokedexNoBall[]                   = INCBIN_U32("graphics/pokedex/noball_unused.4bpp.lz");
+const u32 gPokedexScreenSelectBarSubmenu_Tilemap[]          = INCBIN_U32("graphics/pokedex/HGSS_SelectBar.bin.lz");
+const u32 gPokedexScreenSelectBarSubmenu_Tilemap_Clear[]    = INCBIN_U32("graphics/pokedex/HGSS_SelectBar_clear.bin.lz");
+
+const u32 gPokedexScreenList_Tilemap[]          = INCBIN_U32("graphics/pokedex/HGSS_tilemap_list_screen.bin.lz");
+const u32 gPokedexScreenListUnderlay_Tilemap[]  = INCBIN_U32("graphics/pokedex/HGSS_tilemap_list_screen_underlay.bin.lz");
+const u32 gPokedexScreenInfo_Tilemap[]          = INCBIN_U32("graphics/pokedex/HGSS_tilemap_info_screen.bin.lz");
+const u32 gPokedexScreenStats_Tilemap[]         = INCBIN_U32("graphics/pokedex/HGSS_tilemap_stats_screen.bin.lz");
+const u32 gPokedexScreenEvolution_Tilemap[]     = INCBIN_U32("graphics/pokedex/HGSS_tilemap_evo_screen.bin.lz");
+const u32 gPokedexScreenEvolution_Tilemap_PE[]  = INCBIN_U32("graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin.lz");
+const u32 gPokedexScreenForms_Tilemap[]         = INCBIN_U32("graphics/pokedex/HGSS_tilemap_forms_screen.bin.lz");
+const u32 gPokedexScreenCry_Tilemap[]           = INCBIN_U32("graphics/pokedex/HGSS_tilemap_cry_screen.bin.lz");
+const u32 gPokedexScreenSize_Tilemap[]          = INCBIN_U32("graphics/pokedex/HGSS_tilemap_size_screen.bin.lz");
+const u32 gPokedexScreenSearchHoenn_Tilemap[]   = INCBIN_U32("graphics/pokedex/HGSS_tilemap_search_screen_hoenn.bin.lz");
+const u32 gPokedexScreenSearchNational_Tilemap[] = INCBIN_U32("graphics/pokedex/HGSS_tilemap_search_screen_national.bin.lz");
+
+
 
 const u16 gSummaryScreenPowAcc_Tilemap[] = INCBIN_U16("graphics/interface/powacc_tilemap.bin");
 const u16 gSummaryScreenAppealJam_Tilemap[] = INCBIN_U16("graphics/interface/appealjam_tilemap.bin");
diff --git a/src/pokedex.c b/src/pokedex.c
index 5fa51ea292..fce07ce619 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -207,10 +207,10 @@ struct PokedexView
     #ifdef BATTLE_ENGINE
     u8 splitIconSpriteId;  //HGSS_Ui Physical/Special Split from BE
     #endif
-    u8 numEggMoves;
-    u8 numLevelUpMoves;
-    u8 numTMHMMoves;
-    u8 numTutorMoves;
+    u8 numEggMoves; //HGSS_Ui
+    u8 numLevelUpMoves; //HGSS_Ui
+    u8 numTMHMMoves; //HGSS_Ui
+    u8 numTutorMoves; //HGSS_Ui
     u16 selectedMonSpriteId;
     s16 pokeBallRotationStep;
     s16 pokeBallRotationBackup;
@@ -344,6 +344,9 @@ static void SetSpriteInvisibility(u8 spriteArrayId, bool8 invisible);
 static void CreateTypeIconSprites(void);
 //Stats screen HGSS_Ui
 #define SCROLLING_MON_X 146
+#define HGSS_DECAPPED 0 //0 false, 1 true
+#define HGSS_DARK_MODE 0 //0 false, 1 true
+static void LoadTilesetTilemapHGSS(u8 page);
 static void Task_HandleStatsScreenInput(u8 taskId);
 static void PrintMonStats(u8 taskId, u32 num, u32 value, u32 owned, u32 newEntry);
 static void Task_LoadStatsScreen(u8 taskId);
@@ -1001,12 +1004,13 @@ static const struct SpriteTemplate sDexListStartMenuCursorSpriteTemplate =
 static const struct CompressedSpriteSheet sInterfaceSpriteSheet[] =
 {
     {gPokedexInterface_Gfx, 0x2000, TAG_DEX_INTERFACE},
+    {gPokedexInterface_DECA_Gfx, 0x2000, TAG_DEX_INTERFACE},
     {0}
 };
 
 static const struct SpritePalette sInterfaceSpritePalette[] =
 {
-    {gPokedexBgHoenn_Pal, TAG_DEX_INTERFACE},
+    {gPokedexDefault_Pal, TAG_DEX_INTERFACE},
     {0}
 };
 
@@ -2327,9 +2331,12 @@ static bool8 LoadPokedexListPage(u8 page)
         SetBgTilemapBuffer(2, AllocZeroed(BG_SCREEN_SIZE));
         SetBgTilemapBuffer(1, AllocZeroed(BG_SCREEN_SIZE));
         SetBgTilemapBuffer(0, AllocZeroed(BG_SCREEN_SIZE));
-        DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuList_Gfx, 0x2000, 0, 0);
-        CopyToBgTilemapBuffer(1, gPokedexList_Tilemap, 0, 0);
-        CopyToBgTilemapBuffer(3, gPokedexListUnderlay_Tilemap, 0, 0);
+        if (!HGSS_DECAPPED)
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuList_Gfx, 0x2000, 0, 0);
+        else
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuList_DECA_Gfx, 0x2000, 0, 0);
+        CopyToBgTilemapBuffer(1, gPokedexScreenList_Tilemap, 0, 0);
+        CopyToBgTilemapBuffer(3, gPokedexScreenListUnderlay_Tilemap, 0, 0);
         if (page == PAGE_MAIN)
             CopyToBgTilemapBuffer(0, gPokedexStartMenuMain_Tilemap, 0, 0x280);
         else
@@ -2350,7 +2357,7 @@ static bool8 LoadPokedexListPage(u8 page)
         ResetSpriteData();
         FreeAllSpritePalettes();
         gReservedSpritePaletteCount = 8;
-        LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[0]);
+        LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[HGSS_DARK_MODE]);
         LoadSpritePalettes(sInterfaceSpritePalette);
         LoadSpritePalettes(sStatBarSpritePal); //HGSS_Ui
         CreateInterfaceSprites(page);
@@ -2410,13 +2417,27 @@ static bool8 LoadPokedexListPage(u8 page)
 
 static void LoadPokedexBgPalette(bool8 isSearchResults)
 {
-    if (isSearchResults == TRUE)
-        LoadPalette(gPokedexSearchResults_Pal + 1, 1, 0xBE);
-    else if (!IsNationalPokedexEnabled())
-        LoadPalette(gPokedexBgHoenn_Pal + 1, 1, 0xBE);
+    if (!HGSS_DARK_MODE)
+    {
+        if (isSearchResults == TRUE)
+            LoadPalette(gPokedexSearchResults_Pal + 1, 1, 0xBE);
+        else if (!IsNationalPokedexEnabled())
+            LoadPalette(gPokedexDefault_Pal + 1, 1, 0xBE);
+        else
+            LoadPalette(gPokedexNational_Pal + 1, 1, 0xBE);
+        LoadPalette(GetOverworldTextboxPalettePtr(), 0xF0, 32);
+    }
     else
-        LoadPalette(gPokedexBgNational_Pal + 1, 1, 0xBE);
-    LoadPalette(GetOverworldTextboxPalettePtr(), 0xF0, 32);
+    {
+        if (isSearchResults == TRUE)
+            LoadPalette(gPokedexSearchResults_dark_Pal + 1, 1, 0xBE);
+        else if (!IsNationalPokedexEnabled())
+            LoadPalette(gPokedexDefault_dark_Pal + 1, 1, 0xBE);
+        else
+            LoadPalette(gPokedexNational_dark_Pal + 1, 1, 0xBE);
+        LoadPalette(GetOverworldTextboxPalettePtr(), 0xF0, 32);
+    }
+
 }
 
 static void FreeWindowAndBgBuffers(void)
@@ -3542,8 +3563,9 @@ static void Task_LoadInfoScreen(u8 taskId)
         }
         break;
     case 1:
-        DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
-        CopyToBgTilemapBuffer(3, gPokedexInfoScreen_Tilemap, 0, 0);
+        LoadTilesetTilemapHGSS(INFO_SCREEN);
+        // DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
+        // CopyToBgTilemapBuffer(3, gPokedexInfoScreen_Tilemap, 0, 0);
         FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
         PutWindowTilemap(WIN_INFO);
         PutWindowTilemap(WIN_FOOTPRINT);
@@ -3858,8 +3880,9 @@ static void Task_LoadCryScreen(u8 taskId)
         }
         break;
     case 1:
-        DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenuRest_Gfx, 0x2000, 0, 0);
-        CopyToBgTilemapBuffer(3, &gPokedexCryScreen_Tilemap, 0, 0);
+        LoadTilesetTilemapHGSS(CRY_SCREEN);
+        // DecompressAndLoadBgGfxUsingHeap(3, &gPokedexMenuRest_Gfx, 0x2000, 0, 0);
+        // CopyToBgTilemapBuffer(3, &gPokedexCryScreen_Tilemap, 0, 0);
         FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
         PutWindowTilemap(WIN_INFO);
         PutWindowTilemap(WIN_VU_METER);
@@ -4052,8 +4075,9 @@ static void Task_LoadSizeScreen(u8 taskId)
         }
         break;
     case 1:
-        DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuRest_Gfx, 0x2000, 0, 0);
-        CopyToBgTilemapBuffer(3, gPokedexSizeScreen_Tilemap, 0, 0);
+        LoadTilesetTilemapHGSS(SIZE_SCREEN);
+        // DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuRest_Gfx, 0x2000, 0, 0);
+        // CopyToBgTilemapBuffer(3, gPokedexSizeScreen_Tilemap, 0, 0);
         FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
         PutWindowTilemap(WIN_INFO);
         gMain.state++;
@@ -4285,8 +4309,9 @@ static void Task_DisplayCaughtMonDexPage(u8 taskId)
         }
         break;
     case 1:
-        DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
-        CopyToBgTilemapBuffer(3, gPokedexInfoScreen_Tilemap, 0, 0);
+        LoadTilesetTilemapHGSS(INFO_SCREEN);
+        // DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
+        // CopyToBgTilemapBuffer(3, gPokedexInfoScreen_Tilemap, 0, 0);
         FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
         PutWindowTilemap(WIN_INFO);
         PutWindowTilemap(WIN_FOOTPRINT);
@@ -4345,11 +4370,17 @@ static void Task_HandleCaughtMonPageInput(u8 taskId)
     // Flicker caught screen color
     else if (++gTasks[taskId].tPalTimer & 16)
     {
-        LoadPalette(gPokedexBgHoenn_Pal + 1, 0x31, 14);
+        if (!HGSS_DARK_MODE)
+            LoadPalette(gPokedexDefault_Pal + 1, 0x31, 14);
+        else
+            LoadPalette(gPokedexDefault_dark_Pal + 1, 0x31, 14);
     }
     else
     {
-        LoadPalette(gPokedexCaughtScreen_Pal + 1, 0x31, 14);
+        if (!HGSS_DARK_MODE)
+            LoadPalette(gPokedexDefault_Pal + 1, 0x31, 14); //gPokedexCaughtScreen_Pal
+        else
+            LoadPalette(gPokedexDefault_dark_Pal + 1, 0x31, 14);
     }
 }
 
@@ -5339,18 +5370,23 @@ static void Task_LoadSearchMenu(u8 taskId)
             InitWindows(sSearchMenu_WindowTemplate);
             DeactivateAllTextPrinters();
             PutWindowTilemap(0);
-            DecompressAndLoadBgGfxUsingHeap(3, gPokedexSearchMenu_Gfx, 0x2000, 0, 0);
-
-            if (!IsNationalPokedexEnabled())
-                CopyToBgTilemapBuffer(3, gPokedexSearchMenuHoenn_Tilemap, 0, 0);
+            if (!HGSS_DECAPPED)
+                DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuSearch_Gfx, 0x2000, 0, 0);
             else
-                CopyToBgTilemapBuffer(3, gPokedexSearchMenuNational_Tilemap, 0, 0);
-            LoadPalette(gPokedexSearchMenu_Pal + 1, 1, 0x7E);
+                DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenuSearch_DECA_Gfx, 0x2000, 0, 0);
+            if (!IsNationalPokedexEnabled())
+                CopyToBgTilemapBuffer(3, gPokedexScreenSearchHoenn_Tilemap, 0, 0);
+            else
+                CopyToBgTilemapBuffer(3, gPokedexScreenSearchNational_Tilemap, 0, 0);
+            if (!HGSS_DARK_MODE)
+                LoadPalette(gPokedexMenuSearch_Pal + 1, 1, 0x7E);
+            else
+                LoadPalette(gPokedexMenuSearch_dark_Pal + 1, 1, 0x7E);
             gMain.state = 1;
         }
         break;
     case 1:
-        LoadCompressedSpriteSheet(sInterfaceSpriteSheet);
+        LoadCompressedSpriteSheet(&sInterfaceSpriteSheet[HGSS_DECAPPED]);
         LoadSpritePalettes(sInterfaceSpritePalette);
         LoadSpritePalettes(sStatBarSpritePal); //HGSS_Ui
         CreateSearchParameterScrollArrows(taskId);
@@ -6152,6 +6188,60 @@ static void ClearSearchParameterBoxText(void)
 
 
 
+//PokedexPlus HGSS_Ui
+static void LoadTilesetTilemapHGSS(u8 page)
+{
+    switch (page)
+    {
+    case INFO_SCREEN:
+        if (!HGSS_DECAPPED)
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_1_Gfx, 0x2000, 0, 0);
+        else
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_1_Gfx, 0x2000, 0, 0);
+        CopyToBgTilemapBuffer(3, gPokedexScreenInfo_Tilemap, 0, 0);
+        break;
+    case STATS_SCREEN:
+        if (!HGSS_DECAPPED)
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_1_Gfx, 0x2000, 0, 0);
+        else
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_1_Gfx, 0x2000, 0, 0);
+        CopyToBgTilemapBuffer(3, gPokedexScreenStats_Tilemap, 0, 0);
+        break;
+    case EVO_SCREEN:
+        if (!HGSS_DECAPPED)
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_2_Gfx, 0x2000, 0, 0);
+        else
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_2_Gfx, 0x2000, 0, 0);
+        #ifndef POKEMON_EXPANSION
+            CopyToBgTilemapBuffer(3, gPokedexScreenEvolution_Tilemap, 0, 0);
+        #endif
+        #ifdef POKEMON_EXPANSION
+            CopyToBgTilemapBuffer(3, gPokedexScreenEvolution_Tilemap_PE, 0, 0);
+        #endif
+        break;
+    case FORMS_SCREEN: //Pokemonexpansion only (rhh)
+        if (!HGSS_DECAPPED)
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_2_Gfx, 0x2000, 0, 0);
+        else
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_2_Gfx, 0x2000, 0, 0);
+        CopyToBgTilemapBuffer(3, gPokedexScreenForms_Tilemap, 0, 0);
+        break;
+    case CRY_SCREEN:
+        if (!HGSS_DECAPPED)
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_3_Gfx, 0x2000, 0, 0);
+        else
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_3_Gfx, 0x2000, 0, 0);
+        CopyToBgTilemapBuffer(3, gPokedexScreenCry_Tilemap, 0, 0);
+        break;
+    case SIZE_SCREEN:
+        if (!HGSS_DECAPPED)
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_3_Gfx, 0x2000, 0, 0);
+        else
+            DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_3_Gfx, 0x2000, 0, 0);
+        CopyToBgTilemapBuffer(3, gPokedexScreenSize_Tilemap, 0, 0);
+        break;
+    }
+}
 
 //PokedexPlus HGSS_Ui Stats Page
 #define tMonSpriteId data[4]
@@ -6178,8 +6268,9 @@ static void Task_LoadStatsScreen(u8 taskId)
         }
         break;
     case 1:
-        DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
-        CopyToBgTilemapBuffer(3, gPokedexStatsScreen_Tilemap, 0, 0);
+        LoadTilesetTilemapHGSS(STATS_SCREEN);
+        // DecompressAndLoadBgGfxUsingHeap(3, gPokedexMenu_Gfx, 0x2000, 0, 0);
+        // CopyToBgTilemapBuffer(3, gPokedexStatsScreen_Tilemap, 0, 0);
         FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
         PutWindowTilemap(WIN_INFO);
         CopyWindowToVram(WIN_INFO, 3);
@@ -7027,13 +7118,7 @@ static void Task_LoadEvolutionScreen(u8 taskId)
         }
         break;
     case 1:
-        DecompressAndLoadBgGfxUsingHeap(3, gPokedexEvo_Gfx, 0x2000, 0, 0);
-        #ifndef POKEMON_EXPANSION
-            CopyToBgTilemapBuffer(3, gPokedexEvolutionScreen_Tilemap, 0, 0);
-        #endif
-        #ifdef POKEMON_EXPANSION
-            CopyToBgTilemapBuffer(3, gPokedexEvolutionScreen_Tilemap_PE, 0, 0);
-        #endif
+        LoadTilesetTilemapHGSS(EVO_SCREEN);
         FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
         PutWindowTilemap(WIN_INFO);
         CopyWindowToVram(WIN_INFO, 3);
@@ -7731,8 +7816,9 @@ static void Task_LoadFormsScreen(u8 taskId)
         }
         break;
     case 1:
-        DecompressAndLoadBgGfxUsingHeap(3, gPokedexEvo_Gfx, 0x2000, 0, 0);
-        CopyToBgTilemapBuffer(3, gPokedexFormsScreen_Tilemap, 0, 0);
+        LoadTilesetTilemapHGSS(FORMS_SCREEN);
+        // DecompressAndLoadBgGfxUsingHeap(3, gPokedexEvo_Gfx, 0x2000, 0, 0);
+        // CopyToBgTilemapBuffer(3, gPokedexFormsScreen_Tilemap, 0, 0);
         FillWindowPixelBuffer(WIN_INFO, PIXEL_FILL(0));
         PutWindowTilemap(WIN_INFO);
         CopyWindowToVram(WIN_INFO, 3);