Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss
@ -153,6 +153,7 @@ SUPER_RE = A0
|
||||
'ä' = F4
|
||||
'ö' = F5
|
||||
'ü' = F6
|
||||
EMOJI_DIZZYEGG = F7
|
||||
TALL_PLUS = FC 0C FB
|
||||
'$' = FF
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.6 KiB |
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
BIN
graphics/pokedex/hgss/HGSS_SelectBar.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_SelectBar_clear.bin
Normal file
51
graphics/pokedex/hgss/HGSS_palette_default.pal
Normal file
@ -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
graphics/pokedex/hgss/HGSS_palette_default_dark.pal
Normal file
@ -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
graphics/pokedex/hgss/HGSS_palette_national.pal
Normal file
@ -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
graphics/pokedex/hgss/HGSS_palette_national_dark.pal
Normal file
@ -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
|
||||
67
graphics/pokedex/hgss/HGSS_palette_search_menu.pal
Normal file
@ -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
|
||||
67
graphics/pokedex/hgss/HGSS_palette_search_menu_dark.pal
Normal file
@ -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
|
||||
51
graphics/pokedex/hgss/HGSS_palette_search_results.pal
Normal file
@ -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
graphics/pokedex/hgss/HGSS_palette_search_results_dark.pal
Normal file
@ -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
|
||||
BIN
graphics/pokedex/hgss/HGSS_tilemap_cry_screen.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_evo_screen.bin
Executable file
BIN
graphics/pokedex/hgss/HGSS_tilemap_evo_screen_PE.bin
Executable file
BIN
graphics/pokedex/hgss/HGSS_tilemap_forms_screen.bin
Executable file
BIN
graphics/pokedex/hgss/HGSS_tilemap_info_screen.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_list_screen.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_list_screen_underlay.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_search_screen_hoenn.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_search_screen_national.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_size_screen.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_start_menu.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_start_menu_search_results.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tilemap_stats_screen.bin
Normal file
BIN
graphics/pokedex/hgss/HGSS_tileset_interface.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
graphics/pokedex/hgss/HGSS_tileset_interface_DECA.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
graphics/pokedex/hgss/HGSS_tileset_menu1.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
graphics/pokedex/hgss/HGSS_tileset_menu2.png
Normal file
|
After Width: | Height: | Size: 838 B |
BIN
graphics/pokedex/hgss/HGSS_tileset_menu3.png
Normal file
|
After Width: | Height: | Size: 1.1 KiB |
BIN
graphics/pokedex/hgss/HGSS_tileset_menu_list.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
graphics/pokedex/hgss/HGSS_tileset_menu_list_DECA.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
graphics/pokedex/hgss/HGSS_tileset_menu_search.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
graphics/pokedex/hgss/HGSS_tileset_menu_search_DECA.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
19
graphics/pokedex/hgss/RES_HGSS_palette.pal
Normal file
@ -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
|
||||
BIN
graphics/pokedex/hgss/stat_bars.png
Normal file
|
After Width: | Height: | Size: 396 B |
@ -75,5 +75,6 @@
|
||||
|
||||
// General settings
|
||||
#define EXPANSION_INTRO TRUE // If TRUE, a custom RHH intro will play after the vanilla copyright screen.
|
||||
#define POKEDEX_PLUS_HGSS TRUE
|
||||
|
||||
#endif // GUARD_CONFIG_H
|
||||
|
||||
@ -30,5 +30,9 @@ void SetDaycareCompatibilityString(void);
|
||||
bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio);
|
||||
void ShowDaycareLevelMenu(void);
|
||||
void ChooseSendDaycareMon(void);
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
u8 GetEggMovesSpecies(u16 species, u16 *eggMoves);
|
||||
bool8 SpeciesCanLearnEggMove(u16 species, u16 move);
|
||||
#endif
|
||||
|
||||
#endif // GUARD_DAYCARE_H
|
||||
|
||||
@ -7676,6 +7676,42 @@ extern const u32 gPokedexSearchMenu_Gfx[];
|
||||
extern const u32 gPokedexSearchMenuHoenn_Tilemap[];
|
||||
extern const u32 gPokedexSearchMenuNational_Tilemap[];
|
||||
extern const u16 gPokedexSearchMenu_Pal[];
|
||||
// pokedex HGSS
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
extern const u16 gPokedexPlusHGSS_Default_Pal[];
|
||||
extern const u16 gPokedexPlusHGSS_National_Pal[];
|
||||
extern const u16 gPokedexPlusHGSS_MenuSearch_Pal[];
|
||||
extern const u16 gPokedexPlusHGSS_SearchResults_Pal[];
|
||||
extern const u16 gPokedexPlusHGSS_Default_dark_Pal[];
|
||||
extern const u16 gPokedexPlusHGSS_National_dark_Pal[];
|
||||
extern const u16 gPokedexPlusHGSS_MenuSearch_dark_Pal[];
|
||||
extern const u16 gPokedexPlusHGSS_SearchResults_dark_Pal[];
|
||||
extern const u32 gPokedexPlusHGSS_MenuList_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_MenuList_DECA_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_Interface_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_Interface_DECA_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_Menu_1_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_Menu_2_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_Menu_3_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_MenuSearch_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_MenuSearch_DECA_Gfx[];
|
||||
extern const u32 gPokedexPlusHGSS_StartMenuMain_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_StartMenuSearchResults_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap_Clear[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenList_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenListUnderlay_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenInfo_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenStats_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap_PE[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenForms_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenCry_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenSize_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenSearchHoenn_Tilemap[];
|
||||
extern const u32 gPokedexPlusHGSS_ScreenSearchNational_Tilemap[];
|
||||
#endif
|
||||
|
||||
|
||||
// berry tag screen
|
||||
extern const u32 gBerryCheck_Gfx[];
|
||||
|
||||
@ -96,5 +96,8 @@ void MoveDeleterForgetMove(void);
|
||||
void BufferMoveDeleterNicknameAndMove(void);
|
||||
void GetNumMovesSelectedMonHas(void);
|
||||
void MoveDeleterChooseMoveToForget(void);
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
u16 GetTMHMMoves(u16 position);
|
||||
#endif
|
||||
|
||||
#endif // GUARD_PARTY_MENU_H
|
||||
|
||||
@ -36,7 +36,7 @@ void ResetPokedex(void);
|
||||
u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
|
||||
u16 GetNationalPokedexCount(u8);
|
||||
u16 GetHoennPokedexCount(u8);
|
||||
u8 DisplayCaughtMonDexPage(u16 dexNum, u32 otId, u32 personality);
|
||||
u8 DisplayCaughtMonDexPage(u16 species, u32 otId, u32 personality);
|
||||
s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
|
||||
u16 CreateMonSpriteFromNationalDexNumber(u16, s16, s16, u16);
|
||||
bool16 HasAllHoennMons(void);
|
||||
|
||||
11
include/pokedex_plus_hgss.h
Normal file
@ -0,0 +1,11 @@
|
||||
#ifndef GUARD_POKEDEX_PLUS_HGSS_H
|
||||
#define GUARD_POKEDEX_PLUS_HGSS_H
|
||||
|
||||
extern u8 gUnusedPokedexU8;
|
||||
extern void (*gPokedexVBlankCB)(void);
|
||||
|
||||
|
||||
void CB2_OpenPokedexPlusHGSS(void);
|
||||
u16 NationalPokedexNumToSpeciesHGSS(u16 nationalNum);
|
||||
|
||||
#endif // GUARD_POKEDEX_PLUS_HGSS_H
|
||||
@ -8,6 +8,8 @@ extern u8 gLastViewedMonIndex;
|
||||
extern const u8 *const gMoveDescriptionPointers[];
|
||||
extern const u8 gNotDoneYetDescription[];
|
||||
extern const u8 *const gNatureNamePointers[];
|
||||
extern const struct SpriteTemplate sSpriteTemplate_MoveTypes;
|
||||
extern const struct CompressedSpriteSheet sSpriteSheet_MoveTypes;
|
||||
|
||||
void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
|
||||
void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove);
|
||||
|
||||
@ -538,6 +538,126 @@ extern const u8 gText_SearchingPleaseWait[];
|
||||
extern const u8 gText_SearchCompleted[];
|
||||
extern const u8 gText_NoMatchingPkmnWereFound[];
|
||||
extern const u8 gText_SelectorArrow[];
|
||||
//PokedexPlus HGSS_Ui
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
extern const u8 gText_Stats_Buttons[];
|
||||
extern const u8 gText_Stats_Buttons_Decapped[];
|
||||
extern const u8 gText_Stats_HP[];
|
||||
extern const u8 gText_Stats_Attack[];
|
||||
extern const u8 gText_Stats_Defense[];
|
||||
extern const u8 gText_Stats_Speed[];
|
||||
extern const u8 gText_Stats_SpAttack[];
|
||||
extern const u8 gText_Stats_SpDefense[];
|
||||
extern const u8 gText_Stats_EV_Plus1[];
|
||||
extern const u8 gText_Stats_EV_Plus2[];
|
||||
extern const u8 gText_Stats_EV_Plus3[];
|
||||
extern const u8 gText_Stats_EvStr1Str2[];
|
||||
extern const u8 gText_Stats_MoveSelectedMax[];
|
||||
extern const u8 gText_Stats_MoveLevel[];
|
||||
extern const u8 gText_Stats_Gender_0[];
|
||||
extern const u8 gText_Stats_Gender_12_5[];
|
||||
extern const u8 gText_Stats_Gender_25[];
|
||||
extern const u8 gText_Stats_Gender_50[];
|
||||
extern const u8 gText_Stats_Gender_75[];
|
||||
extern const u8 gText_Stats_Gender_87_5[];
|
||||
extern const u8 gText_Stats_Gender_100[];
|
||||
extern const u8 gText_Stats_CatchRate[];
|
||||
extern const u8 gText_Stats_CatchRate_Legend[];
|
||||
extern const u8 gText_Stats_CatchRate_VeryHard[];
|
||||
extern const u8 gText_Stats_CatchRate_Difficult[];
|
||||
extern const u8 gText_Stats_CatchRate_Medium[];
|
||||
extern const u8 gText_Stats_CatchRate_Relaxed[];
|
||||
extern const u8 gText_Stats_CatchRate_Easy[];
|
||||
extern const u8 gText_Stats_ExpYield[];
|
||||
extern const u8 gText_Stats_EggCycles[];
|
||||
extern const u8 gText_Stats_EggCycles_VeryFast[];
|
||||
extern const u8 gText_Stats_EggCycles_Fast[];
|
||||
extern const u8 gText_Stats_EggCycles_Normal[];
|
||||
extern const u8 gText_Stats_EggCycles_Slow[];
|
||||
extern const u8 gText_Stats_Growthrate[];
|
||||
extern const u8 gText_Stats_Friendship[];
|
||||
extern const u8 gText_Stats_Friendship_BigAnger[];
|
||||
extern const u8 gText_Stats_Friendship_Neutral[];
|
||||
extern const u8 gText_Stats_Friendship_Happy[];
|
||||
extern const u8 gText_Stats_Friendship_BigSmile[];
|
||||
extern const u8 gText_Stats_MEDIUM_FAST[];
|
||||
extern const u8 gText_Stats_ERRATIC[];
|
||||
extern const u8 gText_Stats_FLUCTUATING[];
|
||||
extern const u8 gText_Stats_MEDIUM_SLOW[];
|
||||
extern const u8 gText_Stats_FAST[];
|
||||
extern const u8 gText_Stats_SLOW[];
|
||||
extern const u8 gText_Stats_ContestHeart[];
|
||||
extern const u8 gText_PlusSymbol[];
|
||||
extern const u8 gText_Stats_Minus[];
|
||||
extern const u8 gText_Stats_eggGroup[];
|
||||
extern const u8 gText_Stats_eggGroup_Groups[];
|
||||
extern const u8 gText_Stats_eggGroup_MONSTER[];
|
||||
extern const u8 gText_Stats_eggGroup_WATER_1[];
|
||||
extern const u8 gText_Stats_eggGroup_BUG[];
|
||||
extern const u8 gText_Stats_eggGroup_FLYING[];
|
||||
extern const u8 gText_Stats_eggGroup_FIELD[];
|
||||
extern const u8 gText_Stats_eggGroup_FAIRY[];
|
||||
extern const u8 gText_Stats_eggGroup_GRASS[];
|
||||
extern const u8 gText_Stats_eggGroup_HUMAN_LIKE[];
|
||||
extern const u8 gText_Stats_eggGroup_WATER_3[];
|
||||
extern const u8 gText_Stats_eggGroup_MINERAL[];
|
||||
extern const u8 gText_Stats_eggGroup_AMORPHOUS[];
|
||||
extern const u8 gText_Stats_eggGroup_WATER_2[];
|
||||
extern const u8 gText_Stats_eggGroup_DITTO[];
|
||||
extern const u8 gText_Stats_eggGroup_DRAGON[];
|
||||
extern const u8 gText_Stats_eggGroup_UNDISCOVERED[];
|
||||
extern const u8 gText_Dex_SEEN[];
|
||||
extern const u8 gText_Dex_OWN[];
|
||||
|
||||
extern const u8 gText_EVO_Buttons[];
|
||||
extern const u8 gText_EVO_Buttons_Decapped[];
|
||||
extern const u8 gText_EVO_Buttons_PE[];
|
||||
extern const u8 gText_EVO_Buttons_Decapped_PE[];
|
||||
extern const u8 gText_EVO_Name[];
|
||||
extern const u8 gText_EVO_PreEvo[];
|
||||
extern const u8 gText_EVO_PreEvo_PE_Mega[];
|
||||
extern const u8 gText_EVO_FRIENDSHIP[];
|
||||
extern const u8 gText_EVO_FRIENDSHIP_DAY[];
|
||||
extern const u8 gText_EVO_FRIENDSHIP_NIGHT[];
|
||||
extern const u8 gText_EVO_LEVEL[];
|
||||
extern const u8 gText_EVO_TRADE[];
|
||||
extern const u8 gText_EVO_TRADE_ITEM[];
|
||||
extern const u8 gText_EVO_ITEM[];
|
||||
extern const u8 gText_EVO_LEVEL_ATK_GT_DEF[];
|
||||
extern const u8 gText_EVO_LEVEL_ATK_EQ_DEF[];
|
||||
extern const u8 gText_EVO_LEVEL_ATK_LT_DEF[];
|
||||
extern const u8 gText_EVO_LEVEL_SILCOON[];
|
||||
extern const u8 gText_EVO_LEVEL_CASCOON[];
|
||||
extern const u8 gText_EVO_LEVEL_NINJASK[];
|
||||
extern const u8 gText_EVO_LEVEL_SHEDINJA[];
|
||||
extern const u8 gText_EVO_BEAUTY[];
|
||||
extern const u8 gText_EVO_LEVEL_FEMALE[];
|
||||
extern const u8 gText_EVO_LEVEL_MALE[];
|
||||
extern const u8 gText_EVO_LEVEL_NIGHT[];
|
||||
extern const u8 gText_EVO_LEVEL_DAY[];
|
||||
extern const u8 gText_EVO_LEVEL_DUSK[];
|
||||
extern const u8 gText_EVO_ITEM_HOLD_DAY[];
|
||||
extern const u8 gText_EVO_ITEM_HOLD_NIGHT[];
|
||||
extern const u8 gText_EVO_MOVE[];
|
||||
extern const u8 gText_EVO_MOVE_TYPE[];
|
||||
extern const u8 gText_EVO_MAPSEC[];
|
||||
extern const u8 gText_EVO_ITEM_MALE[];
|
||||
extern const u8 gText_EVO_ITEM_FEMALE[];
|
||||
extern const u8 gText_EVO_LEVEL_RAIN[];
|
||||
extern const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[];
|
||||
extern const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[];
|
||||
extern const u8 gText_EVO_TRADE_SPECIFIC_MON[];
|
||||
extern const u8 gText_EVO_SPECIFIC_MAP[];
|
||||
extern const u8 gText_EVO_UNKNOWN[];
|
||||
extern const u8 gText_EVO_NONE[];
|
||||
|
||||
extern const u8 gText_FORMS_Buttons_PE[];
|
||||
extern const u8 gText_FORMS_Buttons_Decapped_PE[];
|
||||
extern const u8 gText_FORMS_Buttons_Submenu_PE[];
|
||||
extern const u8 gText_FORMS_Buttons_Submenu_Decapped_PE[];
|
||||
extern const u8 gText_FORMS_NONE[];
|
||||
#endif
|
||||
|
||||
|
||||
// birch dex rating text
|
||||
extern const u8 gBirchDexRatingText_LessThan10[];
|
||||
|
||||
@ -774,6 +774,65 @@ static u8 GetEggMoves(struct Pokemon *pokemon, u16 *eggMoves)
|
||||
return numEggMoves;
|
||||
}
|
||||
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
u8 GetEggMovesSpecies(u16 species, u16 *eggMoves)
|
||||
{
|
||||
u16 eggMoveIdx;
|
||||
u16 numEggMoves;
|
||||
u16 i;
|
||||
|
||||
numEggMoves = 0;
|
||||
eggMoveIdx = 0;
|
||||
for (i = 0; i < ARRAY_COUNT(gEggMoves) - 1; i++)
|
||||
{
|
||||
if (gEggMoves[i] == species + EGG_MOVES_SPECIES_OFFSET)
|
||||
{
|
||||
eggMoveIdx = i + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++)
|
||||
{
|
||||
if (gEggMoves[eggMoveIdx + i] > EGG_MOVES_SPECIES_OFFSET)
|
||||
{
|
||||
// TODO: the curly braces around this if statement are required for a matching build.
|
||||
break;
|
||||
}
|
||||
|
||||
eggMoves[i] = gEggMoves[eggMoveIdx + i];
|
||||
numEggMoves++;
|
||||
}
|
||||
|
||||
return numEggMoves;
|
||||
}
|
||||
#endif
|
||||
|
||||
bool8 SpeciesCanLearnEggMove(u16 species, u16 move) //Move search PokedexPlus HGSS_Ui
|
||||
{
|
||||
u16 eggMoveIdx;
|
||||
u16 i;
|
||||
eggMoveIdx = 0;
|
||||
for (i = 0; i < ARRAY_COUNT(gEggMoves) - 1; i++)
|
||||
{
|
||||
if (gEggMoves[i] == species + EGG_MOVES_SPECIES_OFFSET)
|
||||
{
|
||||
eggMoveIdx = i + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < EGG_MOVES_ARRAY_COUNT; i++)
|
||||
{
|
||||
if (gEggMoves[eggMoveIdx + i] > EGG_MOVES_SPECIES_OFFSET)
|
||||
return FALSE;
|
||||
|
||||
if (move == gEggMoves[eggMoveIdx + i])
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, struct BoxPokemon *mother)
|
||||
{
|
||||
u16 numSharedParentMoves;
|
||||
|
||||
37
src/fonts.c
@ -37,6 +37,42 @@ ALIGNED(4) const u8 gFontSmallNarrowLatinGlyphWidths[] = {
|
||||
};
|
||||
|
||||
ALIGNED(4) const u16 gFontSmallLatinGlyphs[] = INCBIN_U16("graphics/fonts/small.latfont");
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = {
|
||||
3, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 4, 4, 5, 5, 5,
|
||||
5, 5, 5, 5, 5, 5, 5, 5, 3, 5, 5, 5, 5, 5, 4, 3,
|
||||
4, 4, 5, 5, 5, 6, 5, 5, 5, 5, 5, 5, 8, 7, 8, 3,
|
||||
3, 3, 3, 3, 8, 8, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
5, 5, 5, 8, 8, 8, 8, 8, 8, 8, 4, 7, 5, 5, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 5, 3, 3, 3, 3, 3, 3, 4,
|
||||
3, 3, 3, 3, 3, 3, 3, 5, 3, 8, 8, 8, 8, 1, 2, 3,
|
||||
4, 5, 6, 7, 5, 7, 7, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
8, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5, 5, 5,
|
||||
5, 5, 5, 5, 5, 5, 5, 8, 5, 8, 5, 5, 5, 5, 5, 5,
|
||||
5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5,
|
||||
5, 5, 5, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 4, 5, 5,
|
||||
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 8,
|
||||
7, 5, 5, 5, 5, 5, 5, 9, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
||||
8, 8, 8, 8, 8, 8, 8, 8, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
||||
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
||||
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
||||
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3,
|
||||
};
|
||||
#else
|
||||
ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = {
|
||||
3, 5, 5, 5, 5, 5, 5, 5, 5, 4, 3, 4, 4, 5, 5, 5,
|
||||
5, 5, 5, 5, 5, 5, 5, 5, 3, 5, 5, 5, 5, 5, 4, 3,
|
||||
@ -71,6 +107,7 @@ ALIGNED(4) const u8 gFontSmallLatinGlyphWidths[] = {
|
||||
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8,
|
||||
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 3,
|
||||
};
|
||||
#endif
|
||||
|
||||
ALIGNED(4) const u16 gFontNarrowLatinGlyphs[] = INCBIN_U16("graphics/fonts/narrow.latfont");
|
||||
ALIGNED(4) const u8 gFontNarrowLatinGlyphWidths[] = {
|
||||
|
||||
@ -1739,6 +1739,41 @@ const u16 gPokedexSearchMenu_Pal[] = INCBIN_U16("graphics/pokedex/search_menu.gb
|
||||
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");
|
||||
// Pokedex HGSS
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
const u16 gPokedexPlusHGSS_Default_Pal[] = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_default.gbapal");
|
||||
const u16 gPokedexPlusHGSS_National_Pal[] = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_national.gbapal");
|
||||
const u16 gPokedexPlusHGSS_MenuSearch_Pal[] = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_search_menu.gbapal");
|
||||
const u16 gPokedexPlusHGSS_SearchResults_Pal[] = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_search_results.gbapal");
|
||||
const u16 gPokedexPlusHGSS_Default_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_default_dark.gbapal");
|
||||
const u16 gPokedexPlusHGSS_National_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_national_dark.gbapal");
|
||||
const u16 gPokedexPlusHGSS_MenuSearch_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_search_menu_dark.gbapal");
|
||||
const u16 gPokedexPlusHGSS_SearchResults_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/HGSS_palette_search_results_dark.gbapal");
|
||||
const u32 gPokedexPlusHGSS_MenuList_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu_list.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_MenuList_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu_list_DECA.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_Interface_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_interface.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_Interface_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_interface_DECA.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_Menu_1_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu1.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_Menu_2_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu2.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_Menu_3_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu3.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_MenuSearch_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu_search.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_MenuSearch_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tileset_menu_search_DECA.4bpp.lz");
|
||||
const u32 gPokedexPlusHGSS_StartMenuMain_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_start_menu.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_StartMenuSearchResults_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_start_menu_search_results.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_SelectBar.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap_Clear[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_SelectBar_clear.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenList_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_list_screen.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenListUnderlay_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_list_screen_underlay.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenInfo_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_info_screen.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenStats_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_stats_screen.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_evo_screen.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap_PE[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_evo_screen_PE.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenForms_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_forms_screen.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenCry_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_cry_screen.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenSize_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_size_screen.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenSearchHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_search_screen_hoenn.bin.lz");
|
||||
const u32 gPokedexPlusHGSS_ScreenSearchNational_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/HGSS_tilemap_search_screen_national.bin.lz");
|
||||
#endif
|
||||
|
||||
const u16 gSummaryScreen_MoveEffect_Battle_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_battle.bin");
|
||||
const u16 gSummaryScreen_MoveEffect_Contest_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_contest.bin");
|
||||
|
||||
@ -6964,3 +6964,8 @@ void IsLastMonThatKnowsSurf(void)
|
||||
gSpecialVar_Result = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
u16 GetTMHMMoves(u16 position)
|
||||
{
|
||||
return sTMHMMoves[position];
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
#include "overworld.h"
|
||||
#include "palette.h"
|
||||
#include "pokedex.h"
|
||||
#include "pokedex_plus_hgss.h"
|
||||
#include "pokedex_area_screen.h"
|
||||
#include "pokedex_cry_screen.h"
|
||||
#include "scanline_effect.h"
|
||||
@ -1590,6 +1591,11 @@ static void ResetPokedexView(struct PokedexView *pokedexView)
|
||||
|
||||
void CB2_OpenPokedex(void)
|
||||
{
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
CB2_OpenPokedexPlusHGSS();
|
||||
return;
|
||||
#endif
|
||||
|
||||
switch (gMain.state)
|
||||
{
|
||||
case 0:
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
#include "menu.h"
|
||||
#include "overworld.h"
|
||||
#include "palette.h"
|
||||
#include "pokedex.h"
|
||||
#include "pokedex_area_screen.h"
|
||||
#include "region_map.h"
|
||||
#include "roamer.h"
|
||||
@ -666,19 +667,55 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId)
|
||||
return;
|
||||
break;
|
||||
case 1:
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
if (JOY_NEW(B_BUTTON))
|
||||
{
|
||||
gTasks[taskId].data[1] = 1;
|
||||
PlaySE(SE_PC_OFF);
|
||||
PlaySE(SE_DEX_PAGE);
|
||||
}
|
||||
else if (JOY_NEW(DPAD_LEFT) || (JOY_NEW(L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
|
||||
{
|
||||
gTasks[taskId].data[1] = 1;
|
||||
PlaySE(SE_DEX_PAGE);
|
||||
}
|
||||
else if (JOY_NEW(DPAD_RIGHT) || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
|
||||
{
|
||||
if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(sPokedexAreaScreen->species), FLAG_GET_CAUGHT))
|
||||
{
|
||||
PlaySE(SE_FAILURE);
|
||||
return;
|
||||
}
|
||||
gTasks[taskId].data[1] = 2;
|
||||
PlaySE(SE_DEX_PAGE);
|
||||
}
|
||||
else
|
||||
return;
|
||||
break;
|
||||
#else
|
||||
if (JOY_NEW(B_BUTTON))
|
||||
{
|
||||
gTasks[taskId].data[1] = 1;
|
||||
PlaySE(SE_DEX_PAGE);
|
||||
}
|
||||
else if (JOY_NEW(DPAD_LEFT) || (JOY_NEW(L_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
|
||||
{
|
||||
gTasks[taskId].data[1] = 1;
|
||||
PlaySE(SE_DEX_PAGE);
|
||||
}
|
||||
else if (JOY_NEW(DPAD_RIGHT) || (JOY_NEW(R_BUTTON) && gSaveBlock2Ptr->optionsButtonMode == OPTIONS_BUTTON_MODE_LR))
|
||||
{
|
||||
if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(sPokedexAreaScreen->species), FLAG_GET_CAUGHT))
|
||||
{
|
||||
PlaySE(SE_FAILURE);
|
||||
return;
|
||||
}
|
||||
gTasks[taskId].data[1] = 2;
|
||||
PlaySE(SE_DEX_PAGE);
|
||||
}
|
||||
else
|
||||
return;
|
||||
break;
|
||||
#endif
|
||||
case 2:
|
||||
BeginNormalPaletteFade(PALETTES_ALL & ~(0x14), 0, 0, 16, RGB_BLACK);
|
||||
break;
|
||||
|
||||
8752
src/pokedex_plus_hgss.c
Normal file
@ -935,13 +935,13 @@ static const union AnimCmd *const sSpriteAnimTable_MoveTypes[NUMBER_OF_MON_TYPES
|
||||
sSpriteAnim_CategoryTough,
|
||||
};
|
||||
|
||||
static const struct CompressedSpriteSheet sSpriteSheet_MoveTypes =
|
||||
const struct CompressedSpriteSheet sSpriteSheet_MoveTypes =
|
||||
{
|
||||
.data = gMoveTypes_Gfx,
|
||||
.size = (NUMBER_OF_MON_TYPES + CONTEST_CATEGORIES_COUNT) * 0x100,
|
||||
.tag = TAG_MOVE_TYPES
|
||||
};
|
||||
static const struct SpriteTemplate sSpriteTemplate_MoveTypes =
|
||||
const struct SpriteTemplate sSpriteTemplate_MoveTypes =
|
||||
{
|
||||
.tileTag = TAG_MOVE_TYPES,
|
||||
.paletteTag = TAG_MOVE_TYPES,
|
||||
@ -3888,7 +3888,7 @@ static void CreateMoveTypeIcons(void)
|
||||
}
|
||||
}
|
||||
|
||||
static void SetTypeSpritePosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
|
||||
void SetTypeSpritePosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
|
||||
{
|
||||
struct Sprite *sprite = &gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]];
|
||||
StartSpriteAnim(sprite, typeId);
|
||||
|
||||
119
src/strings.c
@ -1833,3 +1833,122 @@ const u8 gText_Berry[] = _("BERRY");
|
||||
const u8 gText_Berries[] = _("BERRIES");
|
||||
const u8 gText_ExpShareOn[] = _("The Exp. Share has been turned on.{PAUSE_UNTIL_PRESS}");
|
||||
const u8 gText_ExpShareOff[] = _("The Exp. Share has been turned off.{PAUSE_UNTIL_PRESS}");
|
||||
|
||||
//HGSS_Ui PokedexPlus
|
||||
#if POKEDEX_PLUS_HGSS == TRUE
|
||||
const u8 gText_Stats_Buttons[] = _("{A_BUTTON}TOGGLE {DPAD_UPDOWN}MOVES");
|
||||
const u8 gText_Stats_Buttons_Decapped[] = _("{A_BUTTON}Toggle {DPAD_UPDOWN}Moves");
|
||||
const u8 gText_Stats_HP[] = _("HP");
|
||||
const u8 gText_Stats_Attack[] = _("ATK");
|
||||
const u8 gText_Stats_Defense[] = _("DEF");
|
||||
const u8 gText_Stats_Speed[] = _("SPE");
|
||||
const u8 gText_Stats_SpAttack[] = _("SP.A");
|
||||
const u8 gText_Stats_SpDefense[] = _("SP.D");
|
||||
const u8 gText_Stats_EV_Plus1[] = _("{UP_ARROW_2}");
|
||||
const u8 gText_Stats_EV_Plus2[] = _("{UP_ARROW_2}{UP_ARROW_2}");
|
||||
const u8 gText_Stats_EV_Plus3[] = _("{UP_ARROW_2}{UP_ARROW_2}{UP_ARROW_2}");
|
||||
const u8 gText_Stats_EvStr1Str2[] = _("{STR_VAR_1}{STR_VAR_2}");
|
||||
const u8 gText_Stats_MoveSelectedMax[] = _("{STR_VAR_1} / {STR_VAR_2}");
|
||||
const u8 gText_Stats_MoveLevel[] = _("LVL");
|
||||
const u8 gText_Stats_Gender_0[] = _("♂");
|
||||
const u8 gText_Stats_Gender_12_5[] = _("♀ 1/7 ♂"); //_("♀ 12.5 / 87.5 ♂");
|
||||
const u8 gText_Stats_Gender_25[] = _("♀ 1/3 ♂"); //_("♀ 25 / 75 ♂");
|
||||
const u8 gText_Stats_Gender_50[] = _("♀ 1/1 ♂"); //_("♀ 50 / 50 ♂");
|
||||
const u8 gText_Stats_Gender_75[] = _("♀ 3/1 ♂"); //_("♀ 75 / 25 ♂");
|
||||
const u8 gText_Stats_Gender_87_5[] = _("♀ 7/1 ♂");
|
||||
const u8 gText_Stats_Gender_100[] = _("♀");
|
||||
const u8 gText_Stats_CatchRate[] = _("CATCH{0x5B}: ");
|
||||
const u8 gText_Stats_CatchRate_Legend[] = _("LEGENDARY");
|
||||
const u8 gText_Stats_CatchRate_VeryHard[] = _("VERY HARD");
|
||||
const u8 gText_Stats_CatchRate_Difficult[] = _("DIFFICULT");
|
||||
const u8 gText_Stats_CatchRate_Medium[] = _("MEDIUM");
|
||||
const u8 gText_Stats_CatchRate_Relaxed[] = _("RELAXED");
|
||||
const u8 gText_Stats_CatchRate_Easy[] = _("EASY");
|
||||
const u8 gText_Stats_ExpYield[] = _("EXP YIELD: ");
|
||||
const u8 gText_Stats_EggCycles[] = _("HATCH STEPS:");
|
||||
const u8 gText_Stats_EggCycles_VeryFast[] = _("{EMOJI_BOLT}{EMOJI_DIZZYEGG}");
|
||||
const u8 gText_Stats_EggCycles_Fast[] = _("{EMOJI_DIZZYEGG}");
|
||||
const u8 gText_Stats_EggCycles_Normal[] = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}");
|
||||
const u8 gText_Stats_EggCycles_Slow[] = _("{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}{EMOJI_DIZZYEGG}");
|
||||
const u8 gText_Stats_Growthrate[] = _("GROW: ");
|
||||
const u8 gText_Stats_Friendship[] = _("FRIENDSHIP:");
|
||||
const u8 gText_Stats_Friendship_BigAnger[] = _("{EMOJI_BIGANGER}");
|
||||
const u8 gText_Stats_Friendship_Neutral[] = _("{EMOJI_NEUTRAL}");
|
||||
const u8 gText_Stats_Friendship_Happy[] = _("{EMOJI_HAPPY}");
|
||||
const u8 gText_Stats_Friendship_BigSmile[] = _("{EMOJI_BIGSMILE}");
|
||||
const u8 gText_Stats_MEDIUM_FAST[] = _("MED. FAST");
|
||||
const u8 gText_Stats_ERRATIC[] = _("ERRATIC");
|
||||
const u8 gText_Stats_FLUCTUATING[] = _("FLUCTUATING");
|
||||
const u8 gText_Stats_MEDIUM_SLOW[] = _("MED. SLOW");
|
||||
const u8 gText_Stats_FAST[] = _("FAST");
|
||||
const u8 gText_Stats_SLOW[] = _("SLOW");
|
||||
const u8 gText_Stats_ContestHeart[] = _("H");
|
||||
const u8 gText_Stats_Minus[] = _("-");
|
||||
const u8 gText_Stats_eggGroup[] = _("EGG G1:");
|
||||
const u8 gText_Stats_eggGroup_Groups[] = _("{STR_VAR_1}/{STR_VAR_2}");
|
||||
const u8 gText_Stats_eggGroup_MONSTER[] = _("MONSTER");
|
||||
const u8 gText_Stats_eggGroup_WATER_1[] = _("WATER {CIRCLE_1}");
|
||||
const u8 gText_Stats_eggGroup_BUG[] = _("BUG");
|
||||
const u8 gText_Stats_eggGroup_FLYING[] = _("FLYING");
|
||||
const u8 gText_Stats_eggGroup_FIELD[] = _("FIELD");
|
||||
const u8 gText_Stats_eggGroup_FAIRY[] = _("FAIRY");
|
||||
const u8 gText_Stats_eggGroup_GRASS[] = _("GRASS");
|
||||
const u8 gText_Stats_eggGroup_HUMAN_LIKE[] = _("HUMANE");
|
||||
const u8 gText_Stats_eggGroup_WATER_3[] = _("WATER {CIRCLE_3}");
|
||||
const u8 gText_Stats_eggGroup_MINERAL[] = _("MINERAL");
|
||||
const u8 gText_Stats_eggGroup_AMORPHOUS[] = _("AMORPHOUS");
|
||||
const u8 gText_Stats_eggGroup_WATER_2[] = _("WATER {CIRCLE_2}");
|
||||
const u8 gText_Stats_eggGroup_DITTO[] = _("DITTO");
|
||||
const u8 gText_Stats_eggGroup_DRAGON[] = _("DRAGON");
|
||||
const u8 gText_Stats_eggGroup_UNDISCOVERED[]= _("---");
|
||||
const u8 gText_Dex_SEEN[] = _("SEEN");
|
||||
const u8 gText_Dex_OWN[] = _("OWN");
|
||||
|
||||
const u8 gText_EVO_Buttons[] = _("{DPAD_UPDOWN}EVOs {A_BUTTON}CHECK");
|
||||
const u8 gText_EVO_Buttons_Decapped[] = _("{DPAD_UPDOWN}Evos {A_BUTTON}Check");
|
||||
const u8 gText_EVO_Buttons_PE[] = _("{DPAD_UPDOWN}EVOs {A_BUTTON}CHECK {START_BUTTON}FORMs");
|
||||
const u8 gText_EVO_Buttons_Decapped_PE[] = _("{DPAD_UPDOWN}Evos {A_BUTTON}Check {START_BUTTON}Froms");
|
||||
const u8 gText_EVO_Name[] = _("{STR_VAR_3}:");
|
||||
const u8 gText_EVO_PreEvo[] = _("{STR_VAR_1} evolves from {STR_VAR_2}");
|
||||
const u8 gText_EVO_PreEvo_PE_Mega[] = _("{STR_VAR_1} mega evolves with {STR_VAR_2}");
|
||||
const u8 gText_EVO_FRIENDSHIP[] = _("LvlUp, high friendship");
|
||||
const u8 gText_EVO_FRIENDSHIP_DAY[] = _("LvlUp, high friendship, day");
|
||||
const u8 gText_EVO_FRIENDSHIP_NIGHT[] = _("Lvlup, high friendship, night");
|
||||
const u8 gText_EVO_LEVEL[] = _("LvlUp to {STR_VAR_2}");
|
||||
const u8 gText_EVO_TRADE[] = _("Trading");
|
||||
const u8 gText_EVO_TRADE_ITEM[] = _("Trading, holding {STR_VAR_2}");
|
||||
const u8 gText_EVO_ITEM[] = _("{STR_VAR_2} is used");
|
||||
const u8 gText_EVO_LEVEL_ATK_GT_DEF[] = _("LvlUp to {STR_VAR_2}, Atk > Def");
|
||||
const u8 gText_EVO_LEVEL_ATK_EQ_DEF[] = _("LvlUp to {STR_VAR_2}, Atk = Def");
|
||||
const u8 gText_EVO_LEVEL_ATK_LT_DEF[] = _("LvlUp to {STR_VAR_2}, Atk < Def");
|
||||
const u8 gText_EVO_LEVEL_SILCOON[] = _("LvlUp to {STR_VAR_2}, Silcoon persona");
|
||||
const u8 gText_EVO_LEVEL_CASCOON[] = _("LvlUp to {STR_VAR_2}, Cascoon persona");
|
||||
const u8 gText_EVO_LEVEL_NINJASK[] = _("LvlUp to {STR_VAR_2}");
|
||||
const u8 gText_EVO_LEVEL_SHEDINJA[] = _("LvlUp to {STR_VAR_2}, party<6, 1x POKéBALL");
|
||||
const u8 gText_EVO_BEAUTY[] = _("LvlUp, high beauty");
|
||||
const u8 gText_EVO_LEVEL_FEMALE[] = _("LvlUp to {STR_VAR_2}, is female");
|
||||
const u8 gText_EVO_LEVEL_MALE[] = _("LvlUp to {STR_VAR_2}, is male");
|
||||
const u8 gText_EVO_LEVEL_NIGHT[] = _("LvlUp to {STR_VAR_2}, night");
|
||||
const u8 gText_EVO_LEVEL_DAY[] = _("LvlUp to {STR_VAR_2}, day");
|
||||
const u8 gText_EVO_LEVEL_DUSK[] = _("LvlUp to {STR_VAR_2}, dusk (5-6PM)");
|
||||
const u8 gText_EVO_ITEM_HOLD_DAY[] = _("LvlUp, holds {STR_VAR_2}, day");
|
||||
const u8 gText_EVO_ITEM_HOLD_NIGHT[] = _("LvlUp, holds {STR_VAR_2}, night");
|
||||
const u8 gText_EVO_MOVE[] = _("LvlUp, knows {STR_VAR_2}");
|
||||
const u8 gText_EVO_MOVE_TYPE[] = _("LvlUp, knows {STR_VAR_2} move");
|
||||
const u8 gText_EVO_MAPSEC[] = _("LvlUp on {STR_VAR_2}");
|
||||
const u8 gText_EVO_ITEM_MALE[] = _("{STR_VAR_2} used on male");
|
||||
const u8 gText_EVO_ITEM_FEMALE[] = _("{STR_VAR_2} used on female");
|
||||
const u8 gText_EVO_LEVEL_RAIN[] = _("LvlUp to {STR_VAR_2} while raining");
|
||||
const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[] = _("LvlUp with {STR_VAR_2} in party");
|
||||
const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("LvlUp with dark type in party");
|
||||
const u8 gText_EVO_TRADE_SPECIFIC_MON[] = _("Traded for {STR_VAR_2}");
|
||||
const u8 gText_EVO_SPECIFIC_MAP[] = _("LvlUp on {STR_VAR_2}");
|
||||
const u8 gText_EVO_UNKNOWN[] = _("Method unknown");
|
||||
const u8 gText_EVO_NONE[] = _("{STR_VAR_1} has no evolution.");
|
||||
|
||||
const u8 gText_FORMS_Buttons_PE[] = _("{A_BUTTON}FORM MODE {START_BUTTON}EVOs");
|
||||
const u8 gText_FORMS_Buttons_Decapped_PE[] = _("{START_BUTTON}Evos");
|
||||
const u8 gText_FORMS_Buttons_Submenu_PE[] = _("{DPAD_NONE}FORMs {A_BUTTON}CHECK {START_BUTTON}EVOs");
|
||||
const u8 gText_FORMS_Buttons_Submenu_Decapped_PE[] = _("{START_BUTTON}Evos");
|
||||
const u8 gText_FORMS_NONE[] = _("{STR_VAR_1} has no alternate forms.");
|
||||
#endif
|
||||
|
||||
@ -150,3 +150,4 @@
|
||||
.include "src/rayquaza_scene.o"
|
||||
.include "src/debug.o"
|
||||
.include "src/battle_controller_player.o"
|
||||
.include "src/pokedex_plus_hgss.o"
|
||||
|
||||