ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Document some weather, field effects

Browse Source
This commit is contained in:
GriffinR 2021-04-04 17:52:07 -04:00
parent 5fa20534f9
commit f90026826a
7 changed files with 179 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/event_object_movement.h
View File

@ -198,7 +198,7 @@ u8 GetMoveDirectionFastestAnimNum(u8);
u8 GetLedgeJumpDirection(s16, s16, u8); u8 GetLedgeJumpDirection(s16, s16, u8);
void CameraObjectSetFollowedObjectId(u8 objectId); void CameraObjectSetFollowedObjectId(u8 objectId);
u16 GetObjectPaletteTag(u8 palSlot); u16 GetObjectPaletteTag(u8 palSlot);
void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); void UpdateObjectEventSpriteInvisibility(struct Sprite *sprite, bool8 invisible);
s16 GetFigure8XOffset(s16 idx); s16 GetFigure8XOffset(s16 idx);
s16 GetFigure8YOffset(s16 idx); s16 GetFigure8YOffset(s16 idx);
void CameraObjectReset2(void); void CameraObjectReset2(void);

3
include/field_weather.h
View File

@ -160,13 +160,12 @@ void DroughtStateRun(void);
void Weather_SetBlendCoeffs(u8 eva, u8 evb); void Weather_SetBlendCoeffs(u8 eva, u8 evb);
void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay); void Weather_SetTargetBlendCoeffs(u8 eva, u8 evb, int delay);
bool8 Weather_UpdateBlend(void); bool8 Weather_UpdateBlend(void);
void sub_80AC274(u8 a);
u8 GetCurrentWeather(void); u8 GetCurrentWeather(void);
void SetRainStrengthFromSoundEffect(u16 soundEffect); void SetRainStrengthFromSoundEffect(u16 soundEffect);
void PlayRainStoppingSoundEffect(void); void PlayRainStoppingSoundEffect(void);
u8 IsWeatherChangeComplete(void); u8 IsWeatherChangeComplete(void);
void SetWeatherScreenFadeOut(void); void SetWeatherScreenFadeOut(void);
void sub_80AC3E4(void); void SetWeatherPalStateIdle(void);
void PreservePaletteInWeather(u8 preservedPalIndex); void PreservePaletteInWeather(u8 preservedPalIndex);
void ResetPreservedPalettesInWeather(void); void ResetPreservedPalettesInWeather(void);

16
src/event_object_movement.c
View File

@ -7919,11 +7919,11 @@ void GroundEffect_SpawnOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *
gFieldEffectArguments[0] = objEvent->currentCoords.x; gFieldEffectArguments[0] = objEvent->currentCoords.x;
gFieldEffectArguments[1] = objEvent->currentCoords.y; gFieldEffectArguments[1] = objEvent->currentCoords.y;
gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[2] = objEvent->previousElevation;
gFieldEffectArguments[3] = 2; gFieldEffectArguments[3] = 2; // priority
gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum;
gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[5] = objEvent->mapGroup;
gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup;
gFieldEffectArguments[7] = 1; gFieldEffectArguments[7] = TRUE; // skip to end of anim
FieldEffectStart(FLDEFF_TALL_GRASS); FieldEffectStart(FLDEFF_TALL_GRASS);
} }
@ -7932,11 +7932,11 @@ void GroundEffect_StepOnTallGrass(struct ObjectEvent *objEvent, struct Sprite *s
gFieldEffectArguments[0] = objEvent->currentCoords.x; gFieldEffectArguments[0] = objEvent->currentCoords.x;
gFieldEffectArguments[1] = objEvent->currentCoords.y; gFieldEffectArguments[1] = objEvent->currentCoords.y;
gFieldEffectArguments[2] = objEvent->previousElevation; gFieldEffectArguments[2] = objEvent->previousElevation;
gFieldEffectArguments[3] = 2; gFieldEffectArguments[3] = 2; // priority
gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum; gFieldEffectArguments[4] = objEvent->localId << 8 | objEvent->mapNum;
gFieldEffectArguments[5] = objEvent->mapGroup; gFieldEffectArguments[5] = objEvent->mapGroup;
gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup; gFieldEffectArguments[6] = (u8)gSaveBlock1Ptr->location.mapNum << 8 | (u8)gSaveBlock1Ptr->location.mapGroup;
gFieldEffectArguments[7] = 0; gFieldEffectArguments[7] = FALSE; // don't skip to end of anim
FieldEffectStart(FLDEFF_TALL_GRASS); FieldEffectStart(FLDEFF_TALL_GRASS);
} }
@ -8621,7 +8621,7 @@ bool8 SpriteAnimEnded(struct Sprite *sprite)
return FALSE; return FALSE;
} }
void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible) void UpdateObjectEventSpriteInvisibility(struct Sprite *sprite, bool8 invisible)
{ {
u16 x, y; u16 x, y;
s16 x2, y2; s16 x2, y2;
@ -8642,9 +8642,9 @@ void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible)
x2 = x - (sprite->centerToCornerVecX >> 1); x2 = x - (sprite->centerToCornerVecX >> 1);
y2 = y - (sprite->centerToCornerVecY >> 1); y2 = y - (sprite->centerToCornerVecY >> 1);
if ((s16)x > 255 || x2 < -16) if ((s16)x >= DISPLAY_WIDTH + 16 || x2 < -16)
sprite->invisible = TRUE; sprite->invisible = TRUE;
if ((s16)y > 175 || y2 < -16) if ((s16)y >= DISPLAY_HEIGHT + 16 || y2 < -16)
sprite->invisible = TRUE; sprite->invisible = TRUE;
} }
@ -8656,7 +8656,7 @@ static void UpdateObjectEventSprite(struct Sprite *sprite)
{ {
UpdateObjectEventSpritePosition(sprite); UpdateObjectEventSpritePosition(sprite);
SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1); SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1);
UpdateObjectEventSpriteVisibility(sprite, sprite->tInvisible); UpdateObjectEventSpriteInvisibility(sprite, sprite->tInvisible);
} }
// Unused // Unused

257
src/field_effect_helpers.c
View File

@ -19,13 +19,13 @@ static void UpdateObjectReflectionSprite(struct Sprite *);
static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite); static void LoadObjectReflectionPalette(struct ObjectEvent *objectEvent, struct Sprite *sprite);
static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, u8); static void LoadObjectHighBridgeReflectionPalette(struct ObjectEvent *, u8);
static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, u8); static void LoadObjectRegularReflectionPalette(struct ObjectEvent *, u8);
static void sub_81561FC(struct Sprite *, u8, u8); static void UpdateGrassFieldEffectSubpriority(struct Sprite *, u8, u8);
static void FadeFootprintsTireTracks_Step0(struct Sprite *); static void FadeFootprintsTireTracks_Step0(struct Sprite *);
static void FadeFootprintsTireTracks_Step1(struct Sprite *); static void FadeFootprintsTireTracks_Step1(struct Sprite *);
static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *); static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *);
static void UpdateAshFieldEffect_Step0(struct Sprite *); static void UpdateAshFieldEffect_Wait(struct Sprite *);
static void UpdateAshFieldEffect_Step1(struct Sprite *); static void UpdateAshFieldEffect_Show(struct Sprite *);
static void UpdateAshFieldEffect_Step2(struct Sprite *); static void UpdateAshFieldEffect_End(struct Sprite *);
static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *); static void SynchroniseSurfAnim(struct ObjectEvent *, struct Sprite *);
static void sub_81556E8(struct ObjectEvent *, struct Sprite *); static void sub_81556E8(struct ObjectEvent *, struct Sprite *);
static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *); static void CreateBobbingEffect(struct ObjectEvent *, struct Sprite *, struct Sprite *);
@ -273,6 +273,16 @@ void UpdateShadowFieldEffect(struct Sprite *sprite)
} }
} }
// Sprite data for FLDEFF_TALL_GRASS and FLDEFF_LONG_GRASS
#define sElevation data[0]
#define sX data[1]
#define sY data[2]
#define sMapNum data[3] // Lower 8 bits
#define sLocalId data[3] >> 8 // Upper 8 bits
#define sMapGroup data[4]
#define sCurrentMap data[5]
#define sObjectMoved data[7]
u32 FldEff_TallGrass(void) u32 FldEff_TallGrass(void)
{ {
s16 x; s16 x;
@ -289,16 +299,15 @@ u32 FldEff_TallGrass(void)
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3]; sprite->oam.priority = gFieldEffectArguments[3];
sprite->data[0] = gFieldEffectArguments[2]; sprite->sElevation = gFieldEffectArguments[2];
sprite->data[1] = gFieldEffectArguments[0]; sprite->sX = gFieldEffectArguments[0];
sprite->data[2] = gFieldEffectArguments[1]; sprite->sY = gFieldEffectArguments[1];
sprite->data[3] = gFieldEffectArguments[4]; sprite->sMapNum = gFieldEffectArguments[4]; // Also sLocalId
sprite->data[4] = gFieldEffectArguments[5]; sprite->sMapGroup = gFieldEffectArguments[5];
sprite->data[5] = gFieldEffectArguments[6]; sprite->sCurrentMap = gFieldEffectArguments[6];
if (gFieldEffectArguments[7]) if (gFieldEffectArguments[7])
{ SeekSpriteAnim(sprite, 4); // Skip to end of anim
SeekSpriteAnim(sprite, 4);
}
} }
return 0; return 0;
} }
@ -312,37 +321,48 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite)
u8 objectEventId; u8 objectEventId;
struct ObjectEvent *objectEvent; struct ObjectEvent *objectEvent;
mapNum = sprite->data[5] >> 8; mapNum = sprite->sCurrentMap >> 8;
mapGroup = sprite->data[5]; mapGroup = sprite->sCurrentMap;
if (gCamera.active && (gSaveBlock1Ptr->location.mapNum != mapNum || gSaveBlock1Ptr->location.mapGroup != mapGroup)) if (gCamera.active && (gSaveBlock1Ptr->location.mapNum != mapNum || gSaveBlock1Ptr->location.mapGroup != mapGroup))
{ {
sprite->data[1] -= gCamera.x; sprite->sX -= gCamera.x;
sprite->data[2] -= gCamera.y; sprite->sY -= gCamera.y;
sprite->data[5] = ((u8)gSaveBlock1Ptr->location.mapNum << 8) | (u8)gSaveBlock1Ptr->location.mapGroup; sprite->sCurrentMap = ((u8)gSaveBlock1Ptr->location.mapNum << 8) | (u8)gSaveBlock1Ptr->location.mapGroup;
} }
localId = sprite->data[3] >> 8; localId = sprite->sLocalId;
mapNum = sprite->data[3]; mapNum = sprite->sMapNum;
mapGroup = sprite->data[4]; mapGroup = sprite->sMapGroup;
metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->sX, sprite->sY);
if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)
|| !MetatileBehavior_IsTallGrass(metatileBehavior)
|| (sprite->sObjectMoved && sprite->animEnded))
{ {
FieldEffectStop(sprite, FLDEFF_TALL_GRASS); FieldEffectStop(sprite, FLDEFF_TALL_GRASS);
} }
else else
{ {
// Check if the object that triggered the effect has moved away
objectEvent = &gObjectEvents[objectEventId]; objectEvent = &gObjectEvents[objectEventId];
if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) if ((objectEvent->currentCoords.x != sprite->sX
sprite->data[7] = TRUE; || objectEvent->currentCoords.y != sprite->sY)
&& (objectEvent->previousCoords.x != sprite->sX
|| objectEvent->previousCoords.y != sprite->sY))
sprite->sObjectMoved = TRUE;
// Metatile behavior var re-used
metatileBehavior = 0; metatileBehavior = 0;
if (sprite->animCmdIndex == 0) if (sprite->animCmdIndex == 0)
metatileBehavior = 4; metatileBehavior = 4;
UpdateObjectEventSpriteVisibility(sprite, 0); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
sub_81561FC(sprite, sprite->data[0], metatileBehavior); UpdateGrassFieldEffectSubpriority(sprite, sprite->sElevation, metatileBehavior);
} }
} }
// Sprite data for FLDEFF_JUMP_TALL_GRASS and FLDEFF_JUMP_LONG_GRASS
#define sFldEff data[1]
u32 FldEff_JumpTallGrass(void) u32 FldEff_JumpTallGrass(void)
{ {
u8 spriteId; u8 spriteId;
@ -355,8 +375,8 @@ u32 FldEff_JumpTallGrass(void)
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3]; sprite->oam.priority = gFieldEffectArguments[3];
sprite->data[0] = gFieldEffectArguments[2]; sprite->sElevation = gFieldEffectArguments[2];
sprite->data[1] = FLDEFF_JUMP_TALL_GRASS; sprite->sFldEff = FLDEFF_JUMP_TALL_GRASS;
} }
return 0; return 0;
} }
@ -371,11 +391,14 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s
if (gSprites[i].inUse) if (gSprites[i].inUse)
{ {
sprite = &gSprites[i]; sprite = &gSprites[i];
if (sprite->callback == UpdateTallGrassFieldEffect && (x == sprite->data[1] && y == sprite->data[2]) && (localId == (u8)(sprite->data[3] >> 8) && mapNum == (sprite->data[3] & 0xFF) && mapGroup == sprite->data[4])) if (sprite->callback == UpdateTallGrassFieldEffect
&& (x == sprite->sX && y == sprite->sY)
&& localId == (u8)(sprite->sLocalId)
&& mapNum == (sprite->sMapNum & 0xFF)
&& mapGroup == sprite->sMapGroup)
return i; return i;
} }
} }
return MAX_SPRITES; return MAX_SPRITES;
} }
@ -395,16 +418,15 @@ u32 FldEff_LongGrass(void)
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = ZCoordToPriority(gFieldEffectArguments[2]); sprite->oam.priority = ZCoordToPriority(gFieldEffectArguments[2]);
sprite->data[0] = gFieldEffectArguments[2]; sprite->sElevation = gFieldEffectArguments[2];
sprite->data[1] = gFieldEffectArguments[0]; sprite->sX = gFieldEffectArguments[0];
sprite->data[2] = gFieldEffectArguments[1]; sprite->sY = gFieldEffectArguments[1];
sprite->data[3] = gFieldEffectArguments[4]; sprite->sMapNum = gFieldEffectArguments[4]; // Also sLocalId
sprite->data[4] = gFieldEffectArguments[5]; sprite->sMapGroup = gFieldEffectArguments[5];
sprite->data[5] = gFieldEffectArguments[6]; sprite->sCurrentMap = gFieldEffectArguments[6];
if (gFieldEffectArguments[7]) if (gFieldEffectArguments[7])
{ SeekSpriteAnim(sprite, 6); // Skip to end of anim
SeekSpriteAnim(sprite, 6);
}
} }
return 0; return 0;
} }
@ -418,34 +440,47 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite)
u8 objectEventId; u8 objectEventId;
struct ObjectEvent *objectEvent; struct ObjectEvent *objectEvent;
mapNum = sprite->data[5] >> 8; mapNum = sprite->sCurrentMap >> 8;
mapGroup = sprite->data[5]; mapGroup = sprite->sCurrentMap;
if (gCamera.active && (gSaveBlock1Ptr->location.mapNum != mapNum || gSaveBlock1Ptr->location.mapGroup != mapGroup)) if (gCamera.active && (gSaveBlock1Ptr->location.mapNum != mapNum || gSaveBlock1Ptr->location.mapGroup != mapGroup))
{ {
sprite->data[1] -= gCamera.x; sprite->sX -= gCamera.x;
sprite->data[2] -= gCamera.y; sprite->sY -= gCamera.y;
sprite->data[5] = ((u8)gSaveBlock1Ptr->location.mapNum << 8) | (u8)gSaveBlock1Ptr->location.mapGroup; sprite->sCurrentMap = ((u8)gSaveBlock1Ptr->location.mapNum << 8) | (u8)gSaveBlock1Ptr->location.mapGroup;
} }
localId = sprite->data[3] >> 8; localId = sprite->sLocalId;
mapNum = sprite->data[3]; mapNum = sprite->sMapNum;
mapGroup = sprite->data[4]; mapGroup = sprite->sMapGroup;
metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]); metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]);
if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded)) if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)
|| !MetatileBehavior_IsLongGrass(metatileBehavior)
|| (sprite->sObjectMoved && sprite->animEnded))
{ {
FieldEffectStop(sprite, FLDEFF_LONG_GRASS); FieldEffectStop(sprite, FLDEFF_LONG_GRASS);
} }
else else
{ {
// Check if the object that triggered the effect has moved away
objectEvent = &gObjectEvents[objectEventId]; objectEvent = &gObjectEvents[objectEventId];
if ((objectEvent->currentCoords.x != sprite->data[1] || objectEvent->currentCoords.y != sprite->data[2]) && (objectEvent->previousCoords.x != sprite->data[1] || objectEvent->previousCoords.y != sprite->data[2])) if ((objectEvent->currentCoords.x != sprite->data[1]
{ || objectEvent->currentCoords.y != sprite->data[2])
sprite->data[7] = TRUE; && (objectEvent->previousCoords.x != sprite->data[1]
} || objectEvent->previousCoords.y != sprite->data[2]))
UpdateObjectEventSpriteVisibility(sprite, 0); sprite->sObjectMoved = TRUE;
sub_81561FC(sprite, sprite->data[0], 0);
UpdateObjectEventSpriteInvisibility(sprite, FALSE);
UpdateGrassFieldEffectSubpriority(sprite, sprite->sElevation, 0);
} }
} }
#undef sX
#undef sY
#undef sMapNum
#undef sLocalId
#undef sMapGroup
#undef sCurrentMap
#undef sObjectMoved
u32 FldEff_JumpLongGrass(void) u32 FldEff_JumpLongGrass(void)
{ {
u8 spriteId; u8 spriteId;
@ -458,8 +493,8 @@ u32 FldEff_JumpLongGrass(void)
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3]; sprite->oam.priority = gFieldEffectArguments[3];
sprite->data[0] = gFieldEffectArguments[2]; sprite->sElevation = gFieldEffectArguments[2];
sprite->data[1] = FLDEFF_JUMP_LONG_GRASS; sprite->sFldEff = FLDEFF_JUMP_LONG_GRASS;
} }
return 0; return 0;
} }
@ -520,7 +555,7 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite)
sprite->pos2.y = (graphicsInfo->height >> 1) - 8; sprite->pos2.y = (graphicsInfo->height >> 1) - 8;
sprite->subpriority = linkedSprite->subpriority - 1; sprite->subpriority = linkedSprite->subpriority - 1;
sprite->oam.priority = linkedSprite->oam.priority; sprite->oam.priority = linkedSprite->oam.priority;
UpdateObjectEventSpriteVisibility(sprite, linkedSprite->invisible); UpdateObjectEventSpriteInvisibility(sprite, linkedSprite->invisible);
} }
} }
@ -594,14 +629,14 @@ static void FadeFootprintsTireTracks_Step0(struct Sprite *sprite)
if (++sprite->data[1] > 40) if (++sprite->data[1] > 40)
sprite->data[0] = 1; sprite->data[0] = 1;
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
} }
static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite) static void FadeFootprintsTireTracks_Step1(struct Sprite *sprite)
{ {
sprite->invisible ^= 1; sprite->invisible ^= 1;
sprite->data[1]++; sprite->data[1]++;
UpdateObjectEventSpriteVisibility(sprite, sprite->invisible); UpdateObjectEventSpriteInvisibility(sprite, sprite->invisible);
if (sprite->data[1] > 56) if (sprite->data[1] > 56)
{ {
FieldEffectStop(sprite, sprite->data[7]); FieldEffectStop(sprite, sprite->data[7]);
@ -648,7 +683,7 @@ void UpdateSplashFieldEffect(struct Sprite *sprite)
{ {
sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x; sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x;
sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y; sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y;
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
} }
} }
@ -734,7 +769,7 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite)
sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.x = linkedSprite->pos1.x;
sprite->pos1.y = linkedSprite->pos1.y; sprite->pos1.y = linkedSprite->pos1.y;
sprite->subpriority = linkedSprite->subpriority; sprite->subpriority = linkedSprite->subpriority;
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4]) if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4])
{ {
sprite->data[3] = objectEvent->currentCoords.x; sprite->data[3] = objectEvent->currentCoords.x;
@ -804,7 +839,7 @@ void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite)
sprite->pos1.x = linkedSprite->pos1.x; sprite->pos1.x = linkedSprite->pos1.x;
sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8; sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8;
sprite->subpriority = linkedSprite->subpriority - 1; sprite->subpriority = linkedSprite->subpriority - 1;
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
} }
} }
@ -876,14 +911,21 @@ u32 FldEff_WaterSurfacing(void)
return 0; return 0;
} }
void StartAshFieldEffect(s16 x, s16 y, u16 metatileId, s16 d) // Sprite data for FLDEFF_ASH
#define sState data[0]
#define sX data[1]
#define sY data[2]
#define sMetatileId data[3]
#define sDelay data[4]
void StartAshFieldEffect(s16 x, s16 y, u16 metatileId, s16 delay)
{ {
gFieldEffectArguments[0] = x; gFieldEffectArguments[0] = x;
gFieldEffectArguments[1] = y; gFieldEffectArguments[1] = y;
gFieldEffectArguments[2] = 0x52; gFieldEffectArguments[2] = 82; // subpriority
gFieldEffectArguments[3] = 1; gFieldEffectArguments[3] = 1; // priority
gFieldEffectArguments[4] = metatileId; gFieldEffectArguments[4] = metatileId;
gFieldEffectArguments[5] = d; gFieldEffectArguments[5] = delay;
FieldEffectStart(FLDEFF_ASH); FieldEffectStart(FLDEFF_ASH);
} }
@ -903,50 +945,56 @@ u32 FldEff_Ash(void)
sprite = &gSprites[spriteId]; sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE; sprite->coordOffsetEnabled = TRUE;
sprite->oam.priority = gFieldEffectArguments[3]; sprite->oam.priority = gFieldEffectArguments[3];
sprite->data[1] = gFieldEffectArguments[0]; sprite->sX = gFieldEffectArguments[0];
sprite->data[2] = gFieldEffectArguments[1]; sprite->sY = gFieldEffectArguments[1];
sprite->data[3] = gFieldEffectArguments[4]; sprite->sMetatileId = gFieldEffectArguments[4];
sprite->data[4] = gFieldEffectArguments[5]; sprite->sDelay = gFieldEffectArguments[5];
} }
return 0; return 0;
} }
void (*const gAshFieldEffectFuncs[])(struct Sprite *) = { void (*const gAshFieldEffectFuncs[])(struct Sprite *) = {
UpdateAshFieldEffect_Step0, UpdateAshFieldEffect_Wait,
UpdateAshFieldEffect_Step1, UpdateAshFieldEffect_Show,
UpdateAshFieldEffect_Step2 UpdateAshFieldEffect_End
}; };
void UpdateAshFieldEffect(struct Sprite *sprite) void UpdateAshFieldEffect(struct Sprite *sprite)
{ {
gAshFieldEffectFuncs[sprite->data[0]](sprite); gAshFieldEffectFuncs[sprite->sState](sprite);
} }
static void UpdateAshFieldEffect_Step0(struct Sprite *sprite) static void UpdateAshFieldEffect_Wait(struct Sprite *sprite)
{ {
sprite->invisible = TRUE; sprite->invisible = TRUE;
sprite->animPaused = TRUE; sprite->animPaused = TRUE;
if (--sprite->data[4] == 0) if (--sprite->sDelay == 0)
sprite->data[0] = 1; sprite->sState = 1;
} }
static void UpdateAshFieldEffect_Step1(struct Sprite *sprite) static void UpdateAshFieldEffect_Show(struct Sprite *sprite)
{ {
sprite->invisible = FALSE; sprite->invisible = FALSE;
sprite->animPaused = FALSE; sprite->animPaused = FALSE;
MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]); MapGridSetMetatileIdAt(sprite->sX, sprite->sY, sprite->sMetatileId);
CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]); CurrentMapDrawMetatileAt(sprite->sX, sprite->sY);
gObjectEvents[gPlayerAvatar.objectEventId].triggerGroundEffectsOnMove = TRUE; gObjectEvents[gPlayerAvatar.objectEventId].triggerGroundEffectsOnMove = TRUE;
sprite->data[0] = 2; sprite->sState = 2;
} }
static void UpdateAshFieldEffect_Step2(struct Sprite *sprite) static void UpdateAshFieldEffect_End(struct Sprite *sprite)
{ {
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
if (sprite->animEnded) if (sprite->animEnded)
FieldEffectStop(sprite, FLDEFF_ASH); FieldEffectStop(sprite, FLDEFF_ASH);
} }
#undef sState
#undef sX
#undef sY
#undef sMetatileId
#undef sDelay
u32 FldEff_SurfBlob(void) u32 FldEff_SurfBlob(void)
{ {
u8 spriteId; u8 spriteId;
@ -1048,7 +1096,7 @@ void sub_81556E8(struct ObjectEvent *objectEvent, struct Sprite *sprite)
MoveCoords(i, &x, &y); MoveCoords(i, &x, &y);
if (MapGridGetZCoordAt(x, y) == 3) if (MapGridGetZCoordAt(x, y) == 3)
{ {
sprite->data[5] ++; sprite->data[5]++;
break; break;
} }
} }
@ -1182,7 +1230,7 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite)
sprite->pos1.x = x; sprite->pos1.x = x;
sprite->pos1.y = y; sprite->pos1.y = y;
sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority; sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority;
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
} }
} }
@ -1207,7 +1255,7 @@ void UpdateBubblesFieldEffect(struct Sprite *sprite)
sprite->data[0] += 0x80; sprite->data[0] += 0x80;
sprite->data[0] &= 0x100; sprite->data[0] &= 0x100;
sprite->pos1.y -= sprite->data[0] >> 8; sprite->pos1.y -= sprite->data[0] >> 8;
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
if (sprite->invisible || sprite->animEnded) if (sprite->invisible || sprite->animEnded)
{ {
FieldEffectStop(sprite, FLDEFF_BUBBLES); FieldEffectStop(sprite, FLDEFF_BUBBLES);
@ -1551,16 +1599,17 @@ void UpdateRayquazaSpotlightEffect(struct Sprite *sprite)
#undef sAnimCounter #undef sAnimCounter
#undef sAnimState #undef sAnimState
// Used by FLDEFF_JUMP_TALL_GRASS and FLDEFF_JUMP_LONG_GRASS
void UpdateJumpImpactEffect(struct Sprite *sprite) void UpdateJumpImpactEffect(struct Sprite *sprite)
{ {
if (sprite->animEnded) if (sprite->animEnded)
{ {
FieldEffectStop(sprite, sprite->data[1]); FieldEffectStop(sprite, sprite->sFldEff);
} }
else else
{ {
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0); SetObjectSubpriorityByZCoord(sprite->sElevation, sprite, 0);
} }
} }
@ -1569,10 +1618,10 @@ void WaitFieldEffectSpriteAnim(struct Sprite *sprite)
if (sprite->animEnded) if (sprite->animEnded)
FieldEffectStop(sprite, sprite->data[0]); FieldEffectStop(sprite, sprite->data[0]);
else else
UpdateObjectEventSpriteVisibility(sprite, FALSE); UpdateObjectEventSpriteInvisibility(sprite, FALSE);
} }
static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset) static void UpdateGrassFieldEffectSubpriority(struct Sprite *sprite, u8 z, u8 offset)
{ {
u8 i; u8 i;
s16 var, xhi, lyhi, yhi, ylo; s16 var, xhi, lyhi, yhi, ylo;
@ -1606,17 +1655,17 @@ static void sub_81561FC(struct Sprite *sprite, u8 z, u8 offset)
} }
// Unused data. Feel free to remove. // Unused data. Feel free to remove.
static const u8 gUnknown_085CDC6E[] = static const u8 sUnusedData[] =
{ {
0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2,
0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 1, 2, 2, 1, 2, 2, 1, 2, 1, 1, 2, 1, 1, 2,
0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 1, 1, 2, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 0, 1, 1, 0,
0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0,
0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 1,
0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0,
0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, -1, 0, 0, -1, 0, 0, -1, 0, -1, -1, 0, -1,
0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00 -1, 0, -1, -1, -1, -1, -1, -1, -1, -2, 0, 0
}; };

27
src/field_weather.c
View File

@ -990,38 +990,39 @@ bool8 Weather_UpdateBlend(void)
return FALSE; return FALSE;
} }
void sub_80AC274(u8 a) // Unused. Uses the same numbering scheme as the coord events
static void SetFieldWeather(u8 weather)
{ {
switch (a) switch (weather)
{ {
case 1: case COORD_EVENT_WEATHER_SUNNY_CLOUDS:
SetWeather(WEATHER_SUNNY_CLOUDS); SetWeather(WEATHER_SUNNY_CLOUDS);
break; break;
case 2: case COORD_EVENT_WEATHER_SUNNY:
SetWeather(WEATHER_SUNNY); SetWeather(WEATHER_SUNNY);
break; break;
case 3: case COORD_EVENT_WEATHER_RAIN:
SetWeather(WEATHER_RAIN); SetWeather(WEATHER_RAIN);
break; break;
case 4: case COORD_EVENT_WEATHER_SNOW:
SetWeather(WEATHER_SNOW); SetWeather(WEATHER_SNOW);
break; break;
case 5: case COORD_EVENT_WEATHER_RAIN_THUNDERSTORM:
SetWeather(WEATHER_RAIN_THUNDERSTORM); SetWeather(WEATHER_RAIN_THUNDERSTORM);
break; break;
case 6: case COORD_EVENT_WEATHER_FOG_HORIZONTAL:
SetWeather(WEATHER_FOG_HORIZONTAL); SetWeather(WEATHER_FOG_HORIZONTAL);
break; break;
case 7: case COORD_EVENT_WEATHER_FOG_DIAGONAL:
SetWeather(WEATHER_FOG_DIAGONAL); SetWeather(WEATHER_FOG_DIAGONAL);
break; break;
case 8: case COORD_EVENT_WEATHER_VOLCANIC_ASH:
SetWeather(WEATHER_VOLCANIC_ASH); SetWeather(WEATHER_VOLCANIC_ASH);
break; break;
case 9: case COORD_EVENT_WEATHER_SANDSTORM:
SetWeather(WEATHER_SANDSTORM); SetWeather(WEATHER_SANDSTORM);
break; break;
case 10: case COORD_EVENT_WEATHER_SHADE:
SetWeather(WEATHER_SHADE); SetWeather(WEATHER_SHADE);
break; break;
} }
@ -1085,7 +1086,7 @@ void SetWeatherScreenFadeOut(void)
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT; gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_SCREEN_FADING_OUT;
} }
void sub_80AC3E4(void) void SetWeatherPalStateIdle(void)
{ {
gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE; gWeatherPtr->palProcessingState = WEATHER_PAL_STATE_IDLE;
} }

2
src/fldeff_sweetscent.c
View File

@ -92,7 +92,7 @@ static void FailSweetScentEncounter(u8 taskId)
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100); CpuFastSet(gPaletteDecompressionBuffer, gPlttBufferUnfaded, 0x100);
sub_80AC3E4(); SetWeatherPalStateIdle();
ScriptContext1_SetupScript(EventScript_FailSweetScent); ScriptContext1_SetupScript(EventScript_FailSweetScent);
DestroyTask(taskId); DestroyTask(taskId);
} }

2
src/overworld.c
View File

@ -3198,7 +3198,7 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite)
else else
StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(linkDirection(objEvent))); StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(linkDirection(objEvent)));
UpdateObjectEventSpriteVisibility(sprite, 0); UpdateObjectEventSpriteInvisibility(sprite, 0);
if (objEvent->triggerGroundEffectsOnMove) if (objEvent->triggerGroundEffectsOnMove)
{ {
sprite->invisible = ((sprite->data[7] & 4) >> 2); sprite->invisible = ((sprite->data[7] & 4) >> 2);