From cb90fda18d63e0d780b6766d2fce95193127e208 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 13:27:37 -0400 Subject: Refactor some field effect graphics --- include/constants/field_effects.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'include') diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 92795246a..276d073b1 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -72,4 +72,41 @@ #define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos +#define FLDEFFGFX_SHADOW_SMALL 0 +#define FLDEFFGFX_SHADOW_MEDIUM 1 +#define FLDEFFGFX_SHADOW_LARGE 2 +#define FLDEFFGFX_SHADOW_EXTRA_LARGE 3 +#define FLDEFFGFX_04 4 +#define FLDEFFGFX_05 5 +#define FLDEFFGFX_06 6 +#define FLDEFFGFX_07 7 +#define FLDEFFGFX_08 8 +#define FLDEFFGFX_09 9 +#define FLDEFFGFX_10 10 +#define FLDEFFGFX_11 11 +#define FLDEFFGFX_12 12 +#define FLDEFFGFX_13 13 +#define FLDEFFGFX_14 14 +#define FLDEFFGFX_15 15 +#define FLDEFFGFX_16 16 +#define FLDEFFGFX_17 17 +#define FLDEFFGFX_18 18 +#define FLDEFFGFX_19 19 +#define FLDEFFGFX_20 20 +#define FLDEFFGFX_REFLECTION 21 +#define FLDEFFGFX_22 22 +#define FLDEFFGFX_23 23 +#define FLDEFFGFX_24 24 +#define FLDEFFGFX_25 25 +#define FLDEFFGFX_FLY_BLOB 26 +#define FLDEFFGFX_27 27 +#define FLDEFFGFX_28 28 +#define FLDEFFGFX_29 29 +#define FLDEFFGFX_30 30 +#define FLDEFFGFX_31 31 +#define FLDEFFGFX_32 32 +#define FLDEFFGFX_33 33 +#define FLDEFFGFX_34 34 +#define FLDEFFGFX_35 35 + #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H -- cgit v1.2.3 From 7f5075336072486bc3261b20551f9a035768d42b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 14:09:21 -0400 Subject: Sync field_effect_object_template_pointers.h with Emerald --- include/constants/field_effects.h | 72 +++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'include') diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 276d073b1..8c3ece863 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -72,41 +72,41 @@ #define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos -#define FLDEFFGFX_SHADOW_SMALL 0 -#define FLDEFFGFX_SHADOW_MEDIUM 1 -#define FLDEFFGFX_SHADOW_LARGE 2 -#define FLDEFFGFX_SHADOW_EXTRA_LARGE 3 -#define FLDEFFGFX_04 4 -#define FLDEFFGFX_05 5 -#define FLDEFFGFX_06 6 -#define FLDEFFGFX_07 7 -#define FLDEFFGFX_08 8 -#define FLDEFFGFX_09 9 -#define FLDEFFGFX_10 10 -#define FLDEFFGFX_11 11 -#define FLDEFFGFX_12 12 -#define FLDEFFGFX_13 13 -#define FLDEFFGFX_14 14 -#define FLDEFFGFX_15 15 -#define FLDEFFGFX_16 16 -#define FLDEFFGFX_17 17 -#define FLDEFFGFX_18 18 -#define FLDEFFGFX_19 19 -#define FLDEFFGFX_20 20 -#define FLDEFFGFX_REFLECTION 21 -#define FLDEFFGFX_22 22 -#define FLDEFFGFX_23 23 -#define FLDEFFGFX_24 24 -#define FLDEFFGFX_25 25 -#define FLDEFFGFX_FLY_BLOB 26 -#define FLDEFFGFX_27 27 -#define FLDEFFGFX_28 28 -#define FLDEFFGFX_29 29 -#define FLDEFFGFX_30 30 -#define FLDEFFGFX_31 31 -#define FLDEFFGFX_32 32 -#define FLDEFFGFX_33 33 -#define FLDEFFGFX_34 34 -#define FLDEFFGFX_35 35 +#define FLDEFFOBJ_SHADOW_S 0 +#define FLDEFFOBJ_SHADOW_M 1 +#define FLDEFFOBJ_SHADOW_L 2 +#define FLDEFFOBJ_SHADOW_XL 3 +#define FLDEFFOBJ_TALL_GRASS 4 +#define FLDEFFOBJ_RIPPLE 5 +#define FLDEFFOBJ_ASH 6 +#define FLDEFFOBJ_SURF_BLOB 7 +#define FLDEFFOBJ_ARROW 8 +#define FLDEFFOBJ_GROUND_IMPACT_DUST 9 +#define FLDEFFOBJ_JUMP_TALL_GRASS 10 +#define FLDEFFOBJ_SAND_FOOTPRINTS 11 +#define FLDEFFOBJ_JUMP_BIG_SPLASH 12 +#define FLDEFFOBJ_SPLASH 13 +#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14 +#define FLDEFFOBJ_LONG_GRASS 15 +#define FLDEFFOBJ_JUMP_LONG_GRASS 16 +#define FLDEFFOBJ_UNUSED_GRASS 17 +#define FLDEFFOBJ_UNUSED_GRASS_2 18 +#define FLDEFFOBJ_UNUSED_SAND 19 +#define FLDEFFOBJ_WATER_SURFACING 20 +#define FLDEFFOBJ_REFLECTION_DISTORTION 21 +#define FLDEFFOBJ_SPARKLE 22 +#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23 +#define FLDEFFOBJ_TREE_DISGUISE 24 +#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25 +#define FLDEFFOBJ_BIRD 26 +#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27 +#define FLDEFFOBJ_SAND_DISGUISE 28 +#define FLDEFFOBJ_SAND_PILE 29 +#define FLDEFFOBJ_SHORT_GRASS 30 +#define FLDEFFOBJ_HOT_SPRINGS_WATER 31 +#define FLDEFFOBJ_ASH_PUFF 32 +#define FLDEFFOBJ_ASH_LAUNCH 33 +#define FLDEFFOBJ_BUBBLES 34 +#define FLDEFFOBJ_SMALL_SPARKLE 35 #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H -- cgit v1.2.3 From 014dd7f0be6533cf08a137c7cba263edd01181fb Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 3 May 2021 15:22:13 -0400 Subject: Sync field_effect_objects.h from Emerald --- include/constants/field_effects.h | 95 ++++++++++++++++++++------------------- include/event_object_movement.h | 2 +- include/field_effect.h | 2 +- include/field_effect_helpers.h | 2 +- 4 files changed, 53 insertions(+), 48 deletions(-) (limited to 'include') diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 8c3ece863..47b5f2bed 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -1,16 +1,16 @@ #ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H #define GUARD_CONSTANTS_FIELD_EFFECTS_H -#define FLDEFF_EXCLAMATION_MARK_ICON 0 -#define FLDEFF_USE_CUT_ON_GRASS 1 -#define FLDEFF_USE_CUT_ON_TREE 2 -#define FLDEFF_SHADOW 3 -#define FLDEFF_TALL_GRASS 4 -#define FLDEFF_RIPPLE 5 -#define FLDEFF_FIELD_MOVE_SHOW_MON 6 -#define FLDEFF_ASH 7 -#define FLDEFF_SURF_BLOB 8 -#define FLDEFF_USE_SURF 9 +#define FLDEFF_EXCLAMATION_MARK_ICON 0 +#define FLDEFF_USE_CUT_ON_GRASS 1 +#define FLDEFF_USE_CUT_ON_TREE 2 +#define FLDEFF_SHADOW 3 +#define FLDEFF_TALL_GRASS 4 +#define FLDEFF_RIPPLE 5 +#define FLDEFF_FIELD_MOVE_SHOW_MON 6 +#define FLDEFF_ASH 7 +#define FLDEFF_SURF_BLOB 8 +#define FLDEFF_USE_SURF 9 #define FLDEFF_DUST 10 #define FLDEFF_USE_SECRET_POWER_CAVE 11 #define FLDEFF_JUMP_TALL_GRASS 12 @@ -72,41 +72,46 @@ #define FLDEFF_DESTROY_DEOXYS_ROCK 68 #define FLDEFF_UNK_45 69 // TODO: related to fame checker photos -#define FLDEFFOBJ_SHADOW_S 0 -#define FLDEFFOBJ_SHADOW_M 1 -#define FLDEFFOBJ_SHADOW_L 2 -#define FLDEFFOBJ_SHADOW_XL 3 -#define FLDEFFOBJ_TALL_GRASS 4 -#define FLDEFFOBJ_RIPPLE 5 +#define FLDEFF_PAL_TAG_GENERAL_0 0x1004 +#define FLDEFF_PAL_TAG_GENERAL_1 0x1005 +#define FLDEFF_PAL_TAG_ASH 0x100D +#define FLDEFF_PAL_TAG_SMALL_SPARKLE 0x100F + +#define FLDEFFOBJ_SHADOW_S 0 +#define FLDEFFOBJ_SHADOW_M 1 +#define FLDEFFOBJ_SHADOW_L 2 +#define FLDEFFOBJ_SHADOW_XL 3 +#define FLDEFFOBJ_TALL_GRASS 4 +#define FLDEFFOBJ_RIPPLE 5 #define FLDEFFOBJ_ASH 6 -#define FLDEFFOBJ_SURF_BLOB 7 -#define FLDEFFOBJ_ARROW 8 -#define FLDEFFOBJ_GROUND_IMPACT_DUST 9 -#define FLDEFFOBJ_JUMP_TALL_GRASS 10 -#define FLDEFFOBJ_SAND_FOOTPRINTS 11 -#define FLDEFFOBJ_JUMP_BIG_SPLASH 12 -#define FLDEFFOBJ_SPLASH 13 -#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14 -#define FLDEFFOBJ_LONG_GRASS 15 -#define FLDEFFOBJ_JUMP_LONG_GRASS 16 -#define FLDEFFOBJ_UNUSED_GRASS 17 -#define FLDEFFOBJ_UNUSED_GRASS_2 18 -#define FLDEFFOBJ_UNUSED_SAND 19 -#define FLDEFFOBJ_WATER_SURFACING 20 -#define FLDEFFOBJ_REFLECTION_DISTORTION 21 -#define FLDEFFOBJ_SPARKLE 22 -#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23 -#define FLDEFFOBJ_TREE_DISGUISE 24 -#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25 -#define FLDEFFOBJ_BIRD 26 -#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27 -#define FLDEFFOBJ_SAND_DISGUISE 28 -#define FLDEFFOBJ_SAND_PILE 29 -#define FLDEFFOBJ_SHORT_GRASS 30 -#define FLDEFFOBJ_HOT_SPRINGS_WATER 31 -#define FLDEFFOBJ_ASH_PUFF 32 -#define FLDEFFOBJ_ASH_LAUNCH 33 -#define FLDEFFOBJ_BUBBLES 34 -#define FLDEFFOBJ_SMALL_SPARKLE 35 +#define FLDEFFOBJ_SURF_BLOB 7 +#define FLDEFFOBJ_ARROW 8 +#define FLDEFFOBJ_GROUND_IMPACT_DUST 9 +#define FLDEFFOBJ_JUMP_TALL_GRASS 10 +#define FLDEFFOBJ_SAND_FOOTPRINTS 11 +#define FLDEFFOBJ_JUMP_BIG_SPLASH 12 +#define FLDEFFOBJ_SPLASH 13 +#define FLDEFFOBJ_JUMP_SMALL_SPLASH 14 +#define FLDEFFOBJ_LONG_GRASS 15 +#define FLDEFFOBJ_JUMP_LONG_GRASS 16 +#define FLDEFFOBJ_UNUSED_GRASS 17 +#define FLDEFFOBJ_UNUSED_GRASS_2 18 +#define FLDEFFOBJ_UNUSED_SAND 19 +#define FLDEFFOBJ_WATER_SURFACING 20 +#define FLDEFFOBJ_REFLECTION_DISTORTION 21 +#define FLDEFFOBJ_SPARKLE 22 +#define FLDEFFOBJ_DEEP_SAND_FOOTPRINTS 23 +#define FLDEFFOBJ_TREE_DISGUISE 24 +#define FLDEFFOBJ_MOUNTAIN_DISGUISE 25 +#define FLDEFFOBJ_BIRD 26 +#define FLDEFFOBJ_BIKE_TIRE_TRACKS 27 +#define FLDEFFOBJ_SAND_DISGUISE 28 +#define FLDEFFOBJ_SAND_PILE 29 +#define FLDEFFOBJ_SHORT_GRASS 30 +#define FLDEFFOBJ_HOT_SPRINGS_WATER 31 +#define FLDEFFOBJ_ASH_PUFF 32 +#define FLDEFFOBJ_ASH_LAUNCH 33 +#define FLDEFFOBJ_BUBBLES 34 +#define FLDEFFOBJ_SMALL_SPARKLE 35 #endif // GUARD_CONSTANTS_FIELD_EFFECTS_H diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 25fd988ea..f9b29a3f2 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -196,7 +196,7 @@ u8 GetMoveDirectionAnimNum(u8 direction); // Exported data declarations extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; -extern const struct SpritePalette gUnknown_83A5348; +extern const struct SpritePalette gSpritePalette_GeneralFieldEffect1; extern const struct SpriteTemplate * const gFieldEffectObjectTemplatePointers[]; extern const struct OamData gObjectEventBaseOam_32x32; extern const u16 gUnknown_8398648[]; diff --git a/include/field_effect.h b/include/field_effect.h index a0673c517..48143b0d3 100644 --- a/include/field_effect.h +++ b/include/field_effect.h @@ -26,7 +26,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, bool8 unused); void ReturnToFieldFromFlyMapSelect(void); void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b); void SpriteCB_PopOutOfAsh(struct Sprite * sprite); -void SpriteCB_LavaridgeGymWarp(struct Sprite * sprite); +void SpriteCB_AshLaunch(struct Sprite * sprite); void FieldEffectActiveListClear(void); #endif //GUARD_FIELD_EFFECTS_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index a842c5dc6..689f6d87b 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -25,7 +25,7 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y); void SetSpriteInvisible(u8 spriteId); void sub_80DC4A4(u8 spriteId, u8 value, s16 data1); -void sub_80DCCE0(struct Sprite * sprite); +void UpdateJumpImpactEffect(struct Sprite * sprite); void UpdateShadowFieldEffect(struct Sprite * sprite); void UpdateBubblesFieldEffect(struct Sprite * sprite); void UpdateSparkleFieldEffect(struct Sprite * sprite); -- cgit v1.2.3 From e07dd9507b3073a322fc88bc5f315a17c5a7552d Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 10:27:52 -0400 Subject: Name used object event palette tags --- include/event_object_movement.h | 10 +++++----- include/global.fieldmap.h | 4 ++-- include/sprite.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index f9b29a3f2..c1a9787f3 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -91,11 +91,11 @@ void ObjectEventTurn(struct ObjectEvent *, u8); void ObjectEventTurnByLocalIdAndMap(u8, u8, u8, u8); void ObjectEventForceSetHeldMovement(struct ObjectEvent *, u8); const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8); -void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8); +void ShowOrHideObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 state); void FreeAndReserveObjectSpritePalettes(void); -void sub_808E82C(u8, u8, u8, s16, s16); -void sub_805F400(u8, u8, u8); -void sub_805F3A8(u8, u8, u8, u8); +void SetObjectPositionByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); +void UnfixObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup); +void SetObjectPriorityByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority); void sub_808E75C(s16, s16); void ObjectEventGetLocalIdAndMap(struct ObjectEvent *objectEvent, void *localId, void *mapNum, void *mapGroup); void ShiftObjectEventCoords(struct ObjectEvent *, s16, s16); @@ -161,7 +161,7 @@ bool32 RfuUnionObjectIsInvisible(u8 objectEventId); void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo); bool32 RfuUnionObjectIsWarping(u8 objectEventId); u8 sub_80641C0(u32 direction); -void sub_805F378(s16 x, s16 y); +void EnableObjectGroundEffectsByXY(s16 x, s16 y); void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y); u8 CreateCopySpriteAt(struct Sprite * sprite, s16 x, s16 y, u8 subpriority); u16 GetObjectPaletteTag(u8 paletteIndex); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index 28737b520..7544fe418 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -249,8 +249,8 @@ struct ObjectEvent struct ObjectEventGraphicsInfo { /*0x00*/ u16 tileTag; - /*0x02*/ u16 paletteTag1; - /*0x04*/ u16 paletteTag2; + /*0x02*/ u16 paletteTag; + /*0x04*/ u16 reflectionPaletteTag; /*0x06*/ u16 size; /*0x08*/ s16 width; /*0x0A*/ s16 height; diff --git a/include/sprite.h b/include/sprite.h index 8f95eb788..80480e201 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -317,7 +317,7 @@ u8 SpriteTileAllocBitmapOp(u16 bit, u8 op); void ClearSpriteCopyRequests(void); void ResetAffineAnimData(void); void sub_8007FFC(struct Sprite* sprite, s16 a2, s16 a3); -void sub_80075C0(struct Sprite *sprite); +void FreeSpriteTilesIfNotUsingSheet(struct Sprite *sprite); s16 AllocSpriteTiles(u16 tileCount); void obj_pos2_update_enable(struct Sprite* sprite, s16 xmod, s16 ymod); -- cgit v1.2.3 From a64b074e7dd28a88719515ebe3ea152d42dbf1ff Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 11:34:38 -0400 Subject: Rename palette tags and files --- include/event_object_movement.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/event_object_movement.h b/include/event_object_movement.h index c1a9787f3..119fa7f07 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -71,7 +71,7 @@ void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); void TryMoveObjectEventToMapCoords(u8, u8, u8, s16, s16); void PatchObjectPalette(u16, u8); -void sub_805EDF0(s16, s16); +void ReloadMapObjectsWithOffset(s16 x, s16 y); void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8063AD4(s16, s16, s16 *, s16 *); u8 GetFaceDirectionAnimNum(u8); -- cgit v1.2.3 From c05af7f3941ab1aae6b45dfd0290b0d378a4aa72 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 8 May 2021 14:36:03 -0400 Subject: Rename NUM_FIELD_MAP_OBJECT_TEMPLATES --> MOVEMENT_TYPES_COUNT --- include/constants/event_object_movement.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h index 008d3a117..62c5a2ef2 100644 --- a/include/constants/event_object_movement.h +++ b/include/constants/event_object_movement.h @@ -83,6 +83,7 @@ #define MOVEMENT_TYPE_VS_SEEKER_4E 0x4E #define MOVEMENT_TYPE_VS_SEEKER_4F 0x4F #define MOVEMENT_TYPE_WANDER_AROUND_SLOWEST 0x50 +#define MOVEMENT_TYPES_COUNT 0x51 #define MOVEMENT_ACTION_FACE_DOWN 0x0 #define MOVEMENT_ACTION_FACE_UP 0x1 -- cgit v1.2.3