From 339c2914affc3c62ac9a5725aa1a0c7ccc3161ca Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Thu, 12 Mar 2020 12:46:40 -0700 Subject: Decompile/port event_object_movement --- include/constants/event_objects.h | 7 +++++++ include/constants/field_effects.h | 4 ++-- include/constants/global.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) (limited to 'include/constants') diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h index 0a94dc03b..3e48cf029 100644 --- a/include/constants/event_objects.h +++ b/include/constants/event_objects.h @@ -1,6 +1,13 @@ #ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H #define GUARD_CONSTANTS_EVENT_OBJECTS_H +#define NUM_OBJ_EVENT_GFX 239 + +// These are dynamic object gfx ids. +// They correspond with the values of the VAR_OBJ_GFX_ID_X vars. +// More info about them in include/constants/vars.h +#define OBJ_EVENT_GFX_VARS (NUM_OBJ_EVENT_GFX + 1) + #define OBJ_EVENT_ID_PLAYER 0xFF #define OBJ_EVENT_ID_CAMERA 0x7F diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 3ed7d8ce2..e8246ccc5 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -1,7 +1,7 @@ #ifndef GUARD_CONSTANTS_FIELD_EFFECTS_H #define GUARD_CONSTANTS_FIELD_EFFECTS_H -#define FLDEFF_EXCLAMATION_MARK_ICON_1 0 +#define FLDEFF_EXCLAMATION_MARK_ICON 0 #define FLDEFF_USE_CUT_ON_GRASS 1 #define FLDEFF_USE_CUT_ON_TREE 2 #define FLDEFF_SHADOW 3 @@ -34,7 +34,7 @@ #define FLDEFF_NPCFLY_OUT 30 #define FLDEFF_USE_FLY 31 #define FLDEFF_FLY_IN 32 -#define FLDEFF_EXCLAMATION_MARK_ICON_2 33 +#define FLDEFF_QUESTION_MARK_ICON 33 #define FLDEFF_FEET_IN_FLOWING_WATER 34 #define FLDEFF_BIKE_TIRE_TRACKS 35 #define FLDEFF_SAND_DISGUISE 36 diff --git a/include/constants/global.h b/include/constants/global.h index 7f3c80bb4..e398cc5be 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -31,6 +31,7 @@ #define BAG_POKEBALLS_COUNT 13 #define BAG_TMHM_COUNT 58 #define BAG_BERRIES_COUNT 43 +#define OBJECT_EVENT_TEMPLATES_COUNT 64 #define QUEST_LOG_SCENE_COUNT 4 -- cgit v1.2.3 From e1f7efb8e67fb5587a8baf20f421c20e134e8b24 Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Sun, 15 Mar 2020 19:44:47 -0700 Subject: Document some metatile behaviors and address review comments. --- include/constants/metatile_behaviors.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/constants') diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h index 0ceeda33f..da979084a 100644 --- a/include/constants/metatile_behaviors.h +++ b/include/constants/metatile_behaviors.h @@ -13,21 +13,21 @@ #define MB_SEMI_DEEP_WATER 0x11 #define MB_DEEP_WATER 0x12 #define MB_WATERFALL 0x13 -#define MB_SPLASHING_WATER 0x15 +#define MB_OCEAN_WATER 0x15 #define MB_PUDDLE 0x16 -#define MB_WATERFALL_BOTTOM 0x17 +#define MB_SHALLOW_WATER 0x17 #define MB_19 0x19 #define MB_1A 0x1A #define MB_1B 0x1B #define MB_STRENGTH_BUTTON 0x20 -#define MB_21 0x21 +#define MB_SAND 0x21 #define MB_22 0x22 #define MB_ICE 0x23 #define MB_THIN_ICE 0x26 #define MB_CRACKED_ICE 0x27 #define MB_HOT_SPRINGS 0x28 #define MB_ROCK_STAIRS 0x2A -#define MB_SAND 0x2B +#define MB_SAND_CAVE 0x2B #define MB_IMPASSABLE_EAST 0x30 #define MB_IMPASSABLE_WEST 0x31 #define MB_IMPASSABLE_NORTH 0x32 -- cgit v1.2.3