ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-14 15:43:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix string issue as requested by Jaizu

Browse Source
This commit is contained in:
Bassoonian 2023-04-06 10:13:32 +02:00
parent dfee8a4759
commit 50b5dba655
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/strings.h
View File

@ -180,7 +180,6 @@ extern const u8 gText_Confirm3[];
extern const u8 gText_Cancel4[]; extern const u8 gText_Cancel4[];
extern const u8 gText_IsThisTheCorrectTime[]; extern const u8 gText_IsThisTheCorrectTime[];
extern const u8 gText_PkmnFainted_FldPsn[]; extern const u8 gText_PkmnFainted_FldPsn[];
extern const u8 gText_PkmnSurvived_FldPsn[];
extern const u8 gText_Coins[]; extern const u8 gText_Coins[];
extern const u8 gText_Silver[]; extern const u8 gText_Silver[];
extern const u8 gText_Gold[]; extern const u8 gText_Gold[];

4
src/field_poison.c
View File

@ -79,11 +79,7 @@ static void Task_TryFieldPoisonWhiteOut(u8 taskId)
if (MonFaintedFromPoison(tPartyIdx)) if (MonFaintedFromPoison(tPartyIdx))
{ {
FaintFromFieldPoison(tPartyIdx); FaintFromFieldPoison(tPartyIdx);
#if OW_POISON_DAMAGE < GEN_4
ShowFieldMessage(gText_PkmnFainted_FldPsn); ShowFieldMessage(gText_PkmnFainted_FldPsn);
#else
ShowFieldMessage(gText_PkmnSurvived_FldPsn);
#endif
tState++; tState++;
return; return;
} }

5
src/strings.c
View File

@ -1191,8 +1191,11 @@ const u8 gText_PsychUp48BP[] = _("PSYCH UP{CLEAR_TO 0x4E}48BP");
const u8 gText_IcePunch48BP[] = _("ICE PUNCH{CLEAR_TO 0x4E}48BP"); const u8 gText_IcePunch48BP[] = _("ICE PUNCH{CLEAR_TO 0x4E}48BP");
const u8 gText_ThunderPunch48BP[] = _("THUNDERPUNCH{CLEAR_TO 0x4E}48BP"); const u8 gText_ThunderPunch48BP[] = _("THUNDERPUNCH{CLEAR_TO 0x4E}48BP");
const u8 gText_FirePunch48BP[] = _("FIRE PUNCH{CLEAR_TO 0x4E}48BP"); const u8 gText_FirePunch48BP[] = _("FIRE PUNCH{CLEAR_TO 0x4E}48BP");
#if OW_POISON_DAMAGE < GEN_4
const u8 gText_PkmnFainted_FldPsn[] = _("{STR_VAR_1} fainted…\p\n"); const u8 gText_PkmnFainted_FldPsn[] = _("{STR_VAR_1} fainted…\p\n");
const u8 gText_PkmnSurvived_FldPsn[] = _("{STR_VAR_1} survived the poisoning.\nThe poison faded away!\p"); #else
const u8 gText_PkmnFainted_FldPsn[] = _("{STR_VAR_1} survived the poisoning.\nThe poison faded away!\p");
#endif
const u8 gText_Marco[] = _("MARCO"); const u8 gText_Marco[] = _("MARCO");
const u8 gText_TrainerCardName[] = _("NAME: "); const u8 gText_TrainerCardName[] = _("NAME: ");
const u8 gText_TrainerCardIDNo[] = _("IDNo."); const u8 gText_TrainerCardIDNo[] = _("IDNo.");