Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pok…

…eemerald into dex
BuffelSaft · Jul 17, 2021 · 08d8ffc · 08d8ffc
2 parents 2d972d1 + 883995d
commit 08d8ffc
Show file tree

Hide file tree

Showing 53 changed files with 2,423 additions and 710 deletions.
diff --git a/charmap.txt b/charmap.txt
@@ -151,6 +151,7 @@ SUPER_RE    = A0
 'ä'         = F4
 'ö'         = F5
 'ü'         = F6
+EMOJI_DIZZYEGG = F7
 TALL_PLUS   = FC 0C FB
 '$'         = FF
 

diff --git a/graphics/fonts/font0_latin.png b/graphics/fonts/font0_latin.png
diff --git a/graphics/fonts/font0_latin_widths.inc b/graphics/fonts/font0_latin_widths.inc
@@ -13,7 +13,7 @@
 	.byte  5,  5,  5,  4,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  4,  5
 	.byte  5,  5,  5,  4,  5,  5,  5,  5,  5,  5,  5,  5,  5,  4,  5,  5
 	.byte  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  5,  8
-	.byte  7,  5,  5,  5,  5,  5,  5,  3,  3,  3,  3,  3,  3,  3,  3,  3
+	.byte  7,  5,  5,  5,  5,  5,  5,  9,  3,  3,  3,  3,  3,  3,  3,  3
 	.byte  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8,  8
 	.byte  8,  8,  8,  8,  8,  8,  8,  8,  3,  3,  3,  3,  3,  3,  3,  3
 	.byte  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3

diff --git a/graphics/pokedex/HGSS_SelectBar.bin b/graphics/pokedex/HGSS_SelectBar.bin
diff --git a/...kedex/screen_select_bar_submenu_clear.bin → graphics/pokedex/HGSS_SelectBar_clear.bin b/...kedex/screen_select_bar_submenu_clear.bin → graphics/pokedex/HGSS_SelectBar_clear.bin
diff --git a/graphics/pokedex/HGSS_palette_default.pal 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
@@ -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
@@ -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
@@ -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 → ...hics/pokedex/HGSS_palette_search_menu.pal b/graphics/pokedex/search_menu.pal → ...hics/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
@@ -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_palette_search_results.pal b/graphics/pokedex/HGSS_palette_search_results.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_search_results_dark.pal b/graphics/pokedex/HGSS_palette_search_results_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_tilemap_cry_screen.bin b/graphics/pokedex/HGSS_tilemap_cry_screen.bin
diff --git a/graphics/pokedex/HGSS_tilemap_evo_screen.bin b/graphics/pokedex/HGSS_tilemap_evo_screen.bin
diff --git a/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin b/graphics/pokedex/HGSS_tilemap_evo_screen_PE.bin
diff --git a/graphics/pokedex/HGSS_tilemap_forms_screen.bin b/graphics/pokedex/HGSS_tilemap_forms_screen.bin
diff --git a/graphics/pokedex/HGSS_tilemap_info_screen.bin b/graphics/pokedex/HGSS_tilemap_info_screen.bin
diff --git a/graphics/pokedex/list.bin → ...hics/pokedex/HGSS_tilemap_list_screen.bin b/graphics/pokedex/list.bin → ...hics/pokedex/HGSS_tilemap_list_screen.bin
diff --git a/graphics/pokedex/list_underlay.bin → ...dex/HGSS_tilemap_list_screen_underlay.bin b/graphics/pokedex/list_underlay.bin → ...dex/HGSS_tilemap_list_screen_underlay.bin
diff --git a/graphics/pokedex/search_menu_hoenn.bin → ...edex/HGSS_tilemap_search_screen_hoenn.bin b/graphics/pokedex/search_menu_hoenn.bin → ...edex/HGSS_tilemap_search_screen_hoenn.bin
diff --git a/graphics/pokedex/search_menu_national.bin → ...x/HGSS_tilemap_search_screen_national.bin b/graphics/pokedex/search_menu_national.bin → ...x/HGSS_tilemap_search_screen_national.bin
diff --git a/graphics/pokedex/HGSS_tilemap_size_screen.bin b/graphics/pokedex/HGSS_tilemap_size_screen.bin
diff --git a/graphics/pokedex/start_menu_main.bin → graphics/pokedex/HGSS_tilemap_start_menu.bin b/graphics/pokedex/start_menu_main.bin → graphics/pokedex/HGSS_tilemap_start_menu.bin
diff --git a/...ics/pokedex/start_menu_search_results.bin → ...GSS_tilemap_start_menu_search_results.bin b/...ics/pokedex/start_menu_search_results.bin → ...GSS_tilemap_start_menu_search_results.bin
diff --git a/graphics/pokedex/HGSS_tilemap_stats_screen.bin b/graphics/pokedex/HGSS_tilemap_stats_screen.bin
diff --git a/graphics/pokedex/interface.png → graphics/pokedex/HGSS_tileset_interface.png b/graphics/pokedex/interface.png → graphics/pokedex/HGSS_tileset_interface.png
diff --git a/graphics/pokedex/HGSS_tileset_interface_DECA.png b/graphics/pokedex/HGSS_tileset_interface_DECA.png
diff --git a/graphics/pokedex/HGSS_tileset_menu1.png b/graphics/pokedex/HGSS_tileset_menu1.png
diff --git a/graphics/pokedex/HGSS_tileset_menu2.png b/graphics/pokedex/HGSS_tileset_menu2.png
diff --git a/graphics/pokedex/HGSS_tileset_menu3.png b/graphics/pokedex/HGSS_tileset_menu3.png
diff --git a/graphics/pokedex/menu_list.png → graphics/pokedex/HGSS_tileset_menu_list.png b/graphics/pokedex/menu_list.png → 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
diff --git a/graphics/pokedex/search_menu.png → ...hics/pokedex/HGSS_tileset_menu_search.png b/graphics/pokedex/search_menu.png → ...hics/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