Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from silasary/tx_pokedexPlus_hgss

Browse Source 
Prevent text glitch if a pokemon has an unspecified custom evolution
This commit is contained in:
TheXaman 2021-11-16 13:59:27 +01:00 committed by GitHub
commit d851ef9ec5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/strings.h
View File

@ -638,6 +638,7 @@ 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[];

7
src/pokedex.c
View File

@ -387,10 +387,10 @@ static void Task_SwitchScreensFromFormsScreen(u8 taskId);
static void Task_ExitFormsScreen(u8 taskId);
#endif
//COMPATIBILITY, delete if you are using a newer version
#ifndef TEXT_COLOR_LIGHT_GRAY // COMPATIBILITY
#define TEXT_COLOR_LIGHT_GRAY TEXT_COLOR_LIGHT_GREY
#define TEXT_COLOR_DARK_GRAY TEXT_COLOR_DARK_GREY
//COMPATIBILITY end
#endif
//HGSS_UI Physical Special Split icon for BattleEngine (rhh)
#ifdef BATTLE_ENGINE
@ -7778,6 +7778,9 @@ static u8 PrintEvolutionTargetSpeciesAndMethod(u8 taskId, u16 species, u8 depth,
StringExpandPlaceholders(gStringVar4, gText_EVO_SPECIFIC_MAP );
break;
#endif
default:
StringExpandPlaceholders(gStringVar4, gText_EVO_UNKNOWN );
break;
}//Switch end
PrintInfoScreenTextSmall(gStringVar4, base_x + depth_x*depth+base_x_offset, base_y + base_y_offset*base_i); //Print actual instructions

1
src/strings.c
View File

@ -1924,6 +1924,7 @@ const u8 gText_EVO_SPECIFIC_MON_IN_PARTY[] = _("LvlUp with {STR_VAR_2}
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}EVOLUTIONS");