Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update battle messages to Gen 5+ standards #3240

Merged
merged 105 commits into from
Oct 21, 2024

Conversation

kittenchilly
Copy link

@kittenchilly kittenchilly commented Aug 19, 2023

Description

Updates almost every vanilla battle message to be consistent with gen 5+ and a lot of the custom messages we add. This results in better grammar and decapitalization of terms in most cases.
Also changes a few scripts that pertain to battle messages, as well as adding new weather and terrain strings if caused due to an overworld condition.

Images

pokeemerald-0

Discord contact info

kittenchilly

@AsparagusEduardo
Copy link
Collaborator

Before you continue modifying this, please fix failing test messages.

Copy link

@MandL27 MandL27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks mostly good to me. Saw a few strings that could use further adjustment. Didn't review tests yet.

src/battle_message.c Outdated Show resolved Hide resolved
static const u8 sText_PkmnBlewAwaySpikes[] = _("{B_ATK_NAME_WITH_PREFIX} blew away\nspikes!");
static const u8 sText_PkmnGotFree[] = _("{B_ATK_NAME_WITH_PREFIX} got free of\n{B_DEF_NAME_WITH_PREFIX}'s {B_BUFF1}!"); //not in gen 5+, generic rapid spin?
static const u8 sText_PkmnShedLeechSeed[] = _("{B_ATK_NAME_WITH_PREFIX} shed\nLeech Seed!"); //not in gen 5+, generic rapid spin?
static const u8 sText_PkmnBlewAwaySpikes[] = _("{B_ATK_NAME_WITH_PREFIX} blew away\nspikes!"); //not in gen 5+, generic rapid spin?
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gens 5+ use generic entry hazard removal text for this; unsure on Leech Seed tho

src/battle_message.c Outdated Show resolved Hide resolved
src/battle_message.c Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
@kittenchilly
Copy link
Author

Finally got all tests to pass. Should be reviewable now

@kittenchilly kittenchilly marked this pull request as ready for review August 19, 2023 06:43
Copy link
Collaborator

@AsparagusEduardo AsparagusEduardo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some of these is stuff I forgot to clean up.

data/battle_scripts_1.s Outdated Show resolved Hide resolved
data/battle_scripts_1.s Outdated Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
src/battle_message.c Outdated Show resolved Hide resolved
@kittenchilly kittenchilly marked this pull request as ready for review October 21, 2024 16:39
@AsparagusEduardo AsparagusEduardo merged commit db24128 into rh-hideout:upcoming Oct 21, 2024
1 check passed
kittenchilly added a commit to kittenchilly/pokeemerald-expansion that referenced this pull request Oct 26, 2024
AsparagusEduardo pushed a commit that referenced this pull request Oct 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants