diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-18 00:40:30 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-10-18 00:40:30 +0100 |
| commit | 164e2ea8eb5501eed7a8b641c3cb97b7e1992e0d (patch) | |
| tree | f63e0507f0b4e3e85833288e248e749b4c65e216 /include | |
| parent | a0991cfc153d5b6c02bd2967da0ed6b0193e3353 (diff) | |
More synching
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/event_objects.h | 3 | ||||
| -rw-r--r-- | include/event_object_movement.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 7c236671d..32c7b7625 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -240,6 +240,9 @@ #define EVENT_OBJ_GFX_VAR_E 254 #define EVENT_OBJ_GFX_VAR_F 255 +#define NUM_OBJECT_GRAPHICS_INFO 217 +#define SPRITE_VAR 239 + #define SHADOW_SIZE_S 0 #define SHADOW_SIZE_M 1 #define SHADOW_SIZE_L 2 diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 594d90e6d..9f100a57c 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -368,8 +368,7 @@ void sub_805BD48(u8, u8, u8); void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y); void FreeAndReserveObjectSpritePalettes(void); void sub_805BDF8(u16); -u8 sub_805BE58(const struct SpritePalette *); -void PatchObjectPalette(u16, u16); +void PatchObjectPalette(u16, u8); u8 FindEventObjectPaletteIndexByTag(u16); void LoadPlayerObjectReflectionPalette(u16, u8); void LoadSpecialObjectReflectionPalette(u16, u8); |