Use OBJ_EVENT_GFX_SPECIES_MASK in bufferspeciesname
#5088
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bassoonian
reviewed
Aug 4, 2024
| @@ -1693,7 +1693,7 @@ bool8 ScrCmd_vmessage(struct ScriptContext *ctx) | |||
| bool8 ScrCmd_bufferspeciesname(struct ScriptContext *ctx) | |||
| { | |||
| u8 stringVarIndex = ScriptReadByte(ctx); | |||
| u16 species = VarGet(ScriptReadHalfword(ctx)) & ((1 << 10) - 1); // ignore possible shiny / form bits | |||
| u16 species = VarGet(ScriptReadHalfword(ctx)) & OBJ_EVENT_GFX_SPECIES_MASK; // ignore possible shiny / form bits | |||
There was a problem hiding this comment.
If it's used for more than just GFX we probably ought to rename the define
There was a problem hiding this comment.
I did not give it too much thought, idk why we have to do it this way or why it's required in bufferspeciesname. I don't have a good name in my head, but if we find one we can change it. (or even refactor this) Currently it just breaks a lot of species printing so I'd like it fixed :)
There was a problem hiding this comment.
I'll approve it for now to fix the issue. We can update the name later.
AsparagusEduardo
approved these changes
Aug 5, 2024
Bassoonian
added
category: pokemon
Bassoonian
changed the title
OBJ_EVENT_GFX_SPECIES_MASK in bufferspeciesnameOBJ_EVENT_GFX_SPECIES_MASK in bufferspeciesname
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ScrCmd_bufferspeciesnamewould truncate species above 1023.Issue(s) that this PR fixes
fixes #5087
Discord contact info
karathan