dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #534 from GriffinRichards/sync-scriptcmds

Browse Source 
Sync script commands
This commit is contained in:
GriffinR
2022-08-14 17:28:52 -04:00
committed by GitHub
parent 442935bba0 f113da30ad
commit b3c2c7291f
218 changed files with 3855 additions and 5070 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_specials.c
+12 -4
View File
@@ -1542,18 +1542,26 @@ void SetSeenMon(void)
void ResetContextNpcTextColor(void)
{
gSelectedObjectEvent = 0;
gSpecialVar_TextColor = 0xFF;
gSpecialVar_TextColor = NPC_TEXT_COLOR_DEFAULT;
}
u8 ContextNpcGetTextColor(void)
{
u8 gfxId;
if (gSpecialVar_TextColor != 0xFF)
if (gSpecialVar_TextColor != NPC_TEXT_COLOR_DEFAULT)
{
// A text color has been specified, use that
return gSpecialVar_TextColor;
}
else if (gSelectedObjectEvent == 0)
return 3;
{
// No text color specified and no object selected, use neutral
return NPC_TEXT_COLOR_NEUTRAL;
}
else
{
// An object is selected and no color has been specified.
// Use the text color normally associated with this object's sprite.
gfxId = gObjectEvents[gSelectedObjectEvent].graphicsId;
if (gfxId >= OBJ_EVENT_GFX_VAR_0)
gfxId = VarGetObjectEventGraphicsId(gfxId - OBJ_EVENT_GFX_VAR_0);
@@ -2419,7 +2427,7 @@ static void MoveDeoxysObject(u8 num)
else
gFieldEffectArguments[5] = 5;
FieldEffectStart(FLDEFF_MOVE_DEOXYS_ROCK);
Overworld_SetMapObjTemplateCoords(1, sDeoxysCoords[num][0], sDeoxysCoords[num][1]);
SetObjEventTemplateCoords(1, sDeoxysCoords[num][0], sDeoxysCoords[num][1]);
}
static void Task_WaitDeoxysFieldEffect(u8 taskId)