[pokedex_plus] refactor #if to C if
This commit is contained in:
parent
ebdf14c620
commit
196038eaee
10 changed files with 397 additions and 601 deletions
1
Makefile
1
Makefile
|
@ -345,6 +345,7 @@ $(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
|
||||||
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
|
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
|
||||||
else
|
else
|
||||||
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
|
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
|
||||||
|
$(C_BUILDDIR)/pokedex_plus_hgss.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(DINFO),1)
|
ifeq ($(DINFO),1)
|
||||||
|
|
|
@ -7842,41 +7842,6 @@ extern const u32 gPokedexSearchMenu_Gfx[];
|
||||||
extern const u32 gPokedexSearchMenuHoenn_Tilemap[];
|
extern const u32 gPokedexSearchMenuHoenn_Tilemap[];
|
||||||
extern const u32 gPokedexSearchMenuNational_Tilemap[];
|
extern const u32 gPokedexSearchMenuNational_Tilemap[];
|
||||||
extern const u16 gPokedexSearchMenu_Pal[];
|
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
|
// berry tag screen
|
||||||
extern const u32 gBerryCheck_Gfx[];
|
extern const u32 gBerryCheck_Gfx[];
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
#ifndef GUARD_POKEDEX_PLUS_HGSS_H
|
#ifndef GUARD_POKEDEX_PLUS_HGSS_H
|
||||||
#define GUARD_POKEDEX_PLUS_HGSS_H
|
#define GUARD_POKEDEX_PLUS_HGSS_H
|
||||||
|
|
||||||
#if POKEDEX_PLUS_HGSS == TRUE
|
|
||||||
void CB2_OpenPokedexPlusHGSS(void);
|
void CB2_OpenPokedexPlusHGSS(void);
|
||||||
u16 NationalPokedexNumToSpeciesHGSS(u16 nationalNum);
|
|
||||||
void Task_DisplayCaughtMonDexPageHGSS(u8);
|
void Task_DisplayCaughtMonDexPageHGSS(u8);
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // GUARD_POKEDEX_PLUS_HGSS_H
|
#endif // GUARD_POKEDEX_PLUS_HGSS_H
|
||||||
|
|
|
@ -538,134 +538,6 @@ extern const u8 gText_SearchingPleaseWait[];
|
||||||
extern const u8 gText_SearchCompleted[];
|
extern const u8 gText_SearchCompleted[];
|
||||||
extern const u8 gText_NoMatchingPkmnWereFound[];
|
extern const u8 gText_NoMatchingPkmnWereFound[];
|
||||||
extern const u8 gText_SelectorArrow[];
|
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_FRIENDSHIP_MOVE_TYPE[];
|
|
||||||
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_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_LEVEL_NATURE_AMPED[];
|
|
||||||
extern const u8 gText_EVO_LEVEL_NATURE_LOW_KEY[];
|
|
||||||
extern const u8 gText_EVO_CRITICAL_HITS[];
|
|
||||||
extern const u8 gText_EVO_SCRIPT_TRIGGER_DMG[];
|
|
||||||
extern const u8 gText_EVO_DARK_SCROLL[];
|
|
||||||
extern const u8 gText_EVO_WATER_SCROLL[];
|
|
||||||
extern const u8 gText_EVO_ITEM_NIGHT[];
|
|
||||||
extern const u8 gText_EVO_ITEM_DAY[];
|
|
||||||
extern const u8 gText_EVO_ITEM_HOLD[];
|
|
||||||
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
|
// birch dex rating text
|
||||||
extern const u8 gBirchDexRatingText_LessThan10[];
|
extern const u8 gBirchDexRatingText_LessThan10[];
|
||||||
|
|
|
@ -1076,7 +1076,7 @@ static void _GiveEggFromDaycare(struct DayCare *daycare)
|
||||||
{
|
{
|
||||||
struct Pokemon egg;
|
struct Pokemon egg;
|
||||||
u16 species;
|
u16 species;
|
||||||
u8 parentSlots[DAYCARE_MON_COUNT];
|
u8 parentSlots[DAYCARE_MON_COUNT] = {0};
|
||||||
bool8 isEgg;
|
bool8 isEgg;
|
||||||
|
|
||||||
species = DetermineEggSpeciesAndParentSlots(daycare, parentSlots);
|
species = DetermineEggSpeciesAndParentSlots(daycare, parentSlots);
|
||||||
|
|
|
@ -1739,41 +1739,6 @@ 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 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 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 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/palette_default.gbapal");
|
|
||||||
const u16 gPokedexPlusHGSS_National_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_national.gbapal");
|
|
||||||
const u16 gPokedexPlusHGSS_MenuSearch_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_menu.gbapal");
|
|
||||||
const u16 gPokedexPlusHGSS_SearchResults_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_results.gbapal");
|
|
||||||
const u16 gPokedexPlusHGSS_Default_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_default_dark.gbapal");
|
|
||||||
const u16 gPokedexPlusHGSS_National_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_national_dark.gbapal");
|
|
||||||
const u16 gPokedexPlusHGSS_MenuSearch_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_menu_dark.gbapal");
|
|
||||||
const u16 gPokedexPlusHGSS_SearchResults_dark_Pal[] = INCBIN_U16("graphics/pokedex/hgss/palette_search_results_dark.gbapal");
|
|
||||||
const u32 gPokedexPlusHGSS_MenuList_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_list.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_MenuList_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_list_DECA.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_Interface_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_interface.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_Interface_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_interface_DECA.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_Menu_1_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu1.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_Menu_2_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu2.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_Menu_3_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu3.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_MenuSearch_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_search.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_MenuSearch_DECA_Gfx[] = INCBIN_U32("graphics/pokedex/hgss/tileset_menu_search_DECA.4bpp.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_StartMenuMain_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_start_menu.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_StartMenuSearchResults_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_start_menu_search_results.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/SelectBar.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenSelectBarSubmenu_Tilemap_Clear[] = INCBIN_U32("graphics/pokedex/hgss/SelectBar_clear.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenList_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_list_screen.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenListUnderlay_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_list_screen_underlay.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenInfo_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_info_screen.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenStats_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_stats_screen.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_evo_screen.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenEvolution_Tilemap_PE[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_evo_screen_PE.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenForms_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_forms_screen.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenCry_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_cry_screen.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenSize_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_size_screen.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenSearchHoenn_Tilemap[] = INCBIN_U32("graphics/pokedex/hgss/tilemap_search_screen_hoenn.bin.lz");
|
|
||||||
const u32 gPokedexPlusHGSS_ScreenSearchNational_Tilemap[] = INCBIN_U32("graphics/pokedex/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_Battle_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_battle.bin");
|
||||||
const u16 gSummaryScreen_MoveEffect_Contest_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_contest.bin");
|
const u16 gSummaryScreen_MoveEffect_Contest_Tilemap[] = INCBIN_U16("graphics/summary_screen/effect_contest.bin");
|
||||||
|
|
|
@ -1591,10 +1591,11 @@ static void ResetPokedexView(struct PokedexView *pokedexView)
|
||||||
|
|
||||||
void CB2_OpenPokedex(void)
|
void CB2_OpenPokedex(void)
|
||||||
{
|
{
|
||||||
#if POKEDEX_PLUS_HGSS == TRUE
|
if (POKEDEX_PLUS_HGSS)
|
||||||
CB2_OpenPokedexPlusHGSS();
|
{
|
||||||
return;
|
CB2_OpenPokedexPlusHGSS();
|
||||||
#endif
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
switch (gMain.state)
|
switch (gMain.state)
|
||||||
{
|
{
|
||||||
|
@ -3944,11 +3945,10 @@ static void HighlightSubmenuScreenSelectBarItem(u8 a, u16 b)
|
||||||
u8 DisplayCaughtMonDexPage(u16 dexNum, u32 otId, u32 personality)
|
u8 DisplayCaughtMonDexPage(u16 dexNum, u32 otId, u32 personality)
|
||||||
{
|
{
|
||||||
u8 taskId = 0;
|
u8 taskId = 0;
|
||||||
#if POKEDEX_PLUS_HGSS
|
if (POKEDEX_PLUS_HGSS)
|
||||||
taskId = CreateTask(Task_DisplayCaughtMonDexPageHGSS, 0);
|
taskId = CreateTask(Task_DisplayCaughtMonDexPageHGSS, 0);
|
||||||
#else
|
else
|
||||||
taskId = CreateTask(Task_DisplayCaughtMonDexPage, 0);
|
taskId = CreateTask(Task_DisplayCaughtMonDexPage, 0);
|
||||||
#endif // POKEDEX_PLUS_HGSS
|
|
||||||
|
|
||||||
gTasks[taskId].tState = 0;
|
gTasks[taskId].tState = 0;
|
||||||
gTasks[taskId].tDexNum = dexNum;
|
gTasks[taskId].tDexNum = dexNum;
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1733,6 +1733,9 @@ void ReceiveSecretBasesData(void *secretBases, size_t recordSize, u8 linkIdx)
|
||||||
struct SecretBaseRecordMixer mixers[3];
|
struct SecretBaseRecordMixer mixers[3];
|
||||||
u16 i;
|
u16 i;
|
||||||
|
|
||||||
|
if (linkIdx > 3)
|
||||||
|
return;
|
||||||
|
|
||||||
if (FlagGet(FLAG_RECEIVED_SECRET_POWER))
|
if (FlagGet(FLAG_RECEIVED_SECRET_POWER))
|
||||||
{
|
{
|
||||||
switch (GetLinkPlayerCount())
|
switch (GetLinkPlayerCount())
|
||||||
|
|
128
src/strings.c
128
src/strings.c
|
@ -207,7 +207,6 @@ const u8 gText_MaleSymbol[] = _("♂");
|
||||||
const u8 gText_FemaleSymbol[] = _("♀");
|
const u8 gText_FemaleSymbol[] = _("♀");
|
||||||
const u8 gText_LevelSymbol[] = _("{LV}");
|
const u8 gText_LevelSymbol[] = _("{LV}");
|
||||||
const u8 gText_NumberClear01[] = _("{NO}{CLEAR 0x01}");
|
const u8 gText_NumberClear01[] = _("{NO}{CLEAR 0x01}");
|
||||||
const u8 gText_PlusSymbol[] = _("+"); // Unused
|
|
||||||
const u8 gText_RightArrow[] = _("{RIGHT_ARROW}"); // Unused
|
const u8 gText_RightArrow[] = _("{RIGHT_ARROW}"); // Unused
|
||||||
const u8 gText_IDNumber2[] = _("{ID}{NO}");
|
const u8 gText_IDNumber2[] = _("{ID}{NO}");
|
||||||
const u8 gText_Space[] = _(" ");
|
const u8 gText_Space[] = _(" ");
|
||||||
|
@ -1834,130 +1833,3 @@ const u8 gText_Berries[] = _("BERRIES");
|
||||||
const u8 gText_ExpShareOn[] = _("The Exp. Share has been turned on.{PAUSE_UNTIL_PRESS}");
|
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}");
|
const u8 gText_ExpShareOff[] = _("The Exp. Share has been turned off.{PAUSE_UNTIL_PRESS}");
|
||||||
const u8 gText_BasePointsResetToZero[] = _("{STR_VAR_1}'s base points\nwere all reset to zero!{PAUSE_UNTIL_PRESS}");
|
const u8 gText_BasePointsResetToZero[] = _("{STR_VAR_1}'s base points\nwere all reset to zero!{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[] = _("{LV}{UP_ARROW}, high friendship");
|
|
||||||
const u8 gText_EVO_FRIENDSHIP_DAY[] = _("{LV}{UP_ARROW}, high friendship, day");
|
|
||||||
const u8 gText_EVO_FRIENDSHIP_NIGHT[] = _("{LV}{UP_ARROW}, high friendship, night");
|
|
||||||
const u8 gText_EVO_FRIENDSHIP_MOVE_TYPE[] = _("{LV}{UP_ARROW}, high friendship, {STR_VAR_2} move");
|
|
||||||
const u8 gText_EVO_LEVEL[] = _("{LV}{UP_ARROW} 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[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Atk > Def");
|
|
||||||
const u8 gText_EVO_LEVEL_ATK_EQ_DEF[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Atk = Def");
|
|
||||||
const u8 gText_EVO_LEVEL_ATK_LT_DEF[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Atk < Def");
|
|
||||||
const u8 gText_EVO_LEVEL_SILCOON[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Silcoon persona");
|
|
||||||
const u8 gText_EVO_LEVEL_CASCOON[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Cascoon persona");
|
|
||||||
const u8 gText_EVO_LEVEL_NINJASK[] = _("{LV}{UP_ARROW} to {STR_VAR_2}");
|
|
||||||
const u8 gText_EVO_LEVEL_SHEDINJA[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, party<6, 1x POKéBALL");
|
|
||||||
const u8 gText_EVO_BEAUTY[] = _("{LV}{UP_ARROW}, high beauty");
|
|
||||||
const u8 gText_EVO_LEVEL_FEMALE[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, is female");
|
|
||||||
const u8 gText_EVO_LEVEL_MALE[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, is male");
|
|
||||||
const u8 gText_EVO_LEVEL_NIGHT[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, night");
|
|
||||||
const u8 gText_EVO_LEVEL_DAY[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, day");
|
|
||||||
const u8 gText_EVO_LEVEL_DUSK[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, dusk (5-6PM)");
|
|
||||||
const u8 gText_EVO_ITEM_HOLD_DAY[] = _("{LV}{UP_ARROW}, holds {STR_VAR_2}, day");
|
|
||||||
const u8 gText_EVO_ITEM_HOLD_NIGHT[] = _("{LV}{UP_ARROW}, holds {STR_VAR_2}, night");
|
|
||||||
const u8 gText_EVO_MOVE[] = _("{LV}{UP_ARROW}, knows {STR_VAR_2}");
|
|
||||||
const u8 gText_EVO_MAPSEC[] = _("{LV}{UP_ARROW} 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[] = _("{LV}{UP_ARROW} to {STR_VAR_2} while raining");
|
|
||||||
const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[] = _("{LV}{UP_ARROW} with {STR_VAR_2} in party");
|
|
||||||
const u8 gText_EVO_LEVEL_DARK_TYPE_MON_IN_PARTY[] = _("{LV}{UP_ARROW} with dark type in party");
|
|
||||||
const u8 gText_EVO_TRADE_SPECIFIC_MON[] = _("Traded for {STR_VAR_2}");
|
|
||||||
const u8 gText_EVO_SPECIFIC_MAP[] = _("{LV}{UP_ARROW} on {STR_VAR_2}");
|
|
||||||
const u8 gText_EVO_LEVEL_NATURE_AMPED[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Amped natures");
|
|
||||||
const u8 gText_EVO_LEVEL_NATURE_LOW_KEY[] = _("{LV}{UP_ARROW} to {STR_VAR_2}, Low Key natures");
|
|
||||||
const u8 gText_EVO_CRITICAL_HITS[] = _("Land {STR_VAR_2} critical hits in\nsingle battle");
|
|
||||||
const u8 gText_EVO_SCRIPT_TRIGGER_DMG[] = _("Takes at least {STR_VAR_2} HP in damage");
|
|
||||||
const u8 gText_EVO_DARK_SCROLL[] = _("ScrllOfDrknss is used");
|
|
||||||
const u8 gText_EVO_WATER_SCROLL[] = _("ScrollOfWatrs is used");
|
|
||||||
const u8 gText_EVO_ITEM_NIGHT[] = _("{STR_VAR_2} is used, night");
|
|
||||||
const u8 gText_EVO_ITEM_DAY[] = _("{STR_VAR_2} is used, day");
|
|
||||||
const u8 gText_EVO_ITEM_HOLD[] = _("{LV}{UP_ARROW}, holds {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
|
|
||||||
|
|
Loading…
Reference in a new issue