diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_object_movement.h | 15 | ||||
| -rw-r--r-- | include/field_effect_helpers.h | 2 | ||||
| -rw-r--r-- | include/field_weather.h | 2 | ||||
| -rw-r--r-- | include/global.fieldmap.h | 12 | ||||
| -rw-r--r-- | include/global.h | 4 |
5 files changed, 21 insertions, 14 deletions
diff --git a/include/event_object_movement.h b/include/event_object_movement.h index edc5c8b11..7828d0bcb 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -33,10 +33,10 @@ u8 GetObjectEventIdByXY(s16, s16); void ObjectEventSetDirection(struct ObjectEvent *, u8); u8 sub_808D4F4(void); void RemoveObjectEventByLocalIdAndMap(u8, u8, u8); -void npc_load_two_palettes__no_record(u16, u8); -void npc_load_two_palettes__and_record(u16, u8); +void LoadPlayerObjectReflectionPalette(u16, u8); +void LoadSpecialObjectReflectionPalette(u16, u8); void sub_805F7C4(u8, u8, u8, s16, s16); -void pal_patch_for_npc(u16, u8); +void PatchObjectPalette(u16, u8); void sub_808E16C(s16, s16); void sub_808F28C(u8 localId, u8 mapNum, u8 mapGroup, u8 decorCat); void sub_8092FF0(s16, s16, s16 *, s16 *); @@ -121,6 +121,13 @@ u8 sub_8064194(u8 direction); u8 sub_80641C0(u8 direction); void sub_805F378(s16 x, s16 y); +void sub_805F724(struct ObjectEvent *, s16 x, s16 y); +u8 CreateCopySpriteAt(struct Sprite * sprite, s16 x, s16 y, u8 subpriority); +u16 GetObjectPaletteTag(u8 paletteIndex); +void SetSpritePosToMapCoords(s16 x, s16 y, s16 *x2, s16 *y2); +void UpdateObjectEventSpriteVisibility(struct Sprite *sprite, bool8 invisible); +u8 ZCoordToPriority(u8 z); +void SetObjectSubpriorityByZCoord(u8 z, struct Sprite * sprite, u8 offset); // Exported data declarations @@ -131,6 +138,6 @@ extern const struct OamData gObjectEventBaseOam_32x32; extern const struct UCoords16 gUnknown_83A64C8[]; extern const u16 gUnknown_8398648[]; extern const u16 gUnknown_8398688[]; -void sub_805F724(struct ObjectEvent *, s16 x, s16 y); +extern const u8 gReflectionEffectPaletteMap[]; #endif // GUARD_EVENT_OBJECT_MOVEMENT_H diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h index c3e5ae29a..831f83fd5 100644 --- a/include/field_effect_helpers.h +++ b/include/field_effect_helpers.h @@ -13,7 +13,7 @@ // Exported ROM declarations u8 sub_8154228(void); -bool8 sub_8155DA0(struct ObjectEvent *); +bool8 sub_80DCBE0(struct ObjectEvent *); void sub_80DC44C(u8, u8); void sub_80DC478(u8, u8); void StartAshFieldEffect(s16, s16, u16, s16); diff --git a/include/field_weather.h b/include/field_weather.h index 7488c8c5a..115cc0dca 100644 --- a/include/field_weather.h +++ b/include/field_weather.h @@ -18,7 +18,7 @@ void SetWeatherScreenFadeOut(void); void sub_807B070(void); u8 GetCurrentWeather(void); void FieldWeather_StartFadingOutCreditsMap(u8, u8, u32); -void sub_807AA8C(u8 palIdx); +void UpdateSpritePaletteWithWeather(u8 palIdx); void ResetPreservedPalettesInWeather(void); void PreservePaletteInWeather(u8 palIdx); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index b3f5b1d42..9c380d993 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -217,17 +217,17 @@ struct ObjectEvent /*0x0C*/ struct Coords16 initialCoords; /*0x10*/ struct Coords16 currentCoords; /*0x14*/ struct Coords16 previousCoords; - /*0x18*/ u8 facingDirection:4; //current direction? - /*0x18*/ u8 placeholder18:4; + /*0x18*/ u8 facingDirection:4; + /*0x18*/ u8 movementDirection:4; /*0x19*/ union ObjectEventRange range; - /*0x1A*/ u8 mapobj_unk_1A; + /*0x1A*/ u8 fieldEffectSpriteId; /*0x1B*/ u8 mapobj_unk_1B; /*0x1C*/ u8 mapobj_unk_1C; /*0x1D*/ u8 trainerRange_berryTreeId; - /*0x1E*/ u8 mapobj_unk_1E; - /*0x1F*/ u8 mapobj_unk_1F; + /*0x1E*/ u8 currentMetatileBehavior; + /*0x1F*/ u8 previousMetatileBehavior; /*0x20*/ u8 mapobj_unk_20; - /*0x21*/ u8 mapobj_unk_21; + /*0x21*/ u8 directionSequenceIndex; /*0x22*/ u8 animId; /*size = 0x24*/ }; diff --git a/include/global.h b/include/global.h index b3fdfe231..8a8877143 100644 --- a/include/global.h +++ b/include/global.h @@ -612,8 +612,8 @@ struct QuestLogObjectEvent /*0x0a*/ s16 x; /*0x0c*/ s16 y; /*0x0e*/ u8 trainerRange_berryTreeId; - /*0x0f*/ u8 mapobj_unk_1F; - /*0x10*/ u8 mapobj_unk_21; + /*0x0f*/ u8 previousMetatileBehavior; + /*0x10*/ u8 directionSequenceIndex; /*0x11*/ u8 animId; }; |