Merge branch 'romhack' into lighting

This commit is contained in:
Ariel A 2022-04-18 22:49:26 -04:00
commit 68497d81ce

View file

@ -1589,7 +1589,7 @@ bool8 ScrCmd_vmessage(struct ScriptContext *ctx)
bool8 ScrCmd_bufferspeciesname(struct ScriptContext *ctx)
{
u8 stringVarIndex = ScriptReadByte(ctx);
u16 species = VarGet(ScriptReadHalfword(ctx));
u16 species = VarGet(ScriptReadHalfword(ctx)) & ((1 << 10) - 1); // ignore possible shiny / form bits
StringCopy(sScriptStringVars[stringVarIndex], gSpeciesNames[species]);
return FALSE;