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.

Sign up for GitHub

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

Jump to bottom

Convert gBattleStringsTable to COMPOUND_STRINGs #5649

Merged
merged 8 commits into from
Nov 9, 2024
Merged

Convert gBattleStringsTable to COMPOUND_STRINGs #5649

merged 8 commits into from
Nov 9, 2024

Conversation

AsparagusEduardo
Copy link
Collaborator

Description

Supersedes #5598

Discord contact info

AsparagusEduardo

@AsparagusEduardo AsparagusEduardo mentioned this pull request Nov 6, 2024
Closed
@AsparagusEduardo AsparagusEduardo changed the title Moved strings on top of the table Convert gBattleStringsTable to COMPOUND_STRINGs Nov 6, 2024
@AlexOn1ine
Copy link
Collaborator

Just in case nobody else starts to suddenly review it, I planning to review this tomorrow.

@ShinyDragonHunter
Copy link

Might not be needed for this PR but there's a function in battle_setup.c named ReturnEmptyStringIfNull which returns an empty string if the string pointer passed to it is NULL.

It could be useful for places you use COMPOUND_STRING as it means you might not always need to put a pointer to an empty string in string tables (or if you changed trainer names to use COMPOUND_STRING for example) and could also come in handy for places that use text but said text hasn't been made yet

AlexOn1ine
AlexOn1ine reviewed Nov 9, 2024
View reviewed changes
Copy link
Collaborator

@AlexOn1ine AlexOn1ine left a comment

Choose a reason for hiding this comment

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

2 minor things but looks good otherwise

src/battle_message.c Show resolved Hide resolved
src/battle_message.c Show resolved Hide resolved
@AlexOn1ine AlexOn1ine merged commit 5f87d2e into rh-hideout:upcoming Nov 9, 2024
1 check passed
@AsparagusEduardo AsparagusEduardo added this to the 1.10 milestone Nov 9, 2024
@AsparagusEduardo AsparagusEduardo deleted the _RHH/pr/upcoming/compoundBattleString2 branch November 10, 2024 01:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kittenchilly kittenchilly kittenchilly left review comments

@AlexOn1ine AlexOn1ine AlexOn1ine approved these changes

Assignees
No one assigned
Labels
type: cleanup
Projects
None yet
Milestone
1.10
Development

Successfully merging this pull request may close these issues.
5 participants
@AsparagusEduardo @AlexOn1ine @ShinyDragonHunter @kittenchilly @Pawkkie