diff options
| -rw-r--r-- | include/constants/field_effects.h | 2 | ||||
| -rw-r--r-- | include/constants/flags.h | 8 | ||||
| -rw-r--r-- | include/constants/vars.h | 8 | ||||
| -rw-r--r-- | src/field_player_avatar.c | 7 |
4 files changed, 11 insertions, 14 deletions
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h index 2c5f700e0..add195df8 100644 --- a/include/constants/field_effects.h +++ b/include/constants/field_effects.h @@ -67,6 +67,6 @@ #define FLDEFF_USE_TELEPORT 63 #define FLDEFF_64 64 #define FLDEFF_65 65 -#define FLDEFF_MOVE_DEOXYS_ROCK 66 +#define FLDEFF_MOVE_DEOXYS_ROCK 66 #endif diff --git a/include/constants/flags.h b/include/constants/flags.h index 261ba6be0..b1dce013e 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1355,10 +1355,10 @@ #define FLAG_SYS_PYRAMID_GOLD (SYSTEM_FLAGS + 0x71) #define FLAG_SYS_FRONTIER_PASS (SYSTEM_FLAGS + 0x72) -#define FLAG_0x8D3 (SYSTEM_FLAGS + 0x73) -#define FLAG_DEOXYS_ROCK_COMPLETE (SYSTEM_FLAGS + 0x74) -#define FLAG_0x8D5 (SYSTEM_FLAGS + 0x75) -#define FLAG_0x8D6 (SYSTEM_FLAGS + 0x76) +#define FLAG_0x8D3 (SYSTEM_FLAGS + 0x73) +#define FLAG_DEOXYS_ROCK_COMPLETE (SYSTEM_FLAGS + 0x74) +#define FLAG_0x8D5 (SYSTEM_FLAGS + 0x75) +#define FLAG_0x8D6 (SYSTEM_FLAGS + 0x76) #define FLAG_SYS_STORAGE_UNKNOWN_FLAG (SYSTEM_FLAGS + 0x77) diff --git a/include/constants/vars.h b/include/constants/vars.h index ef155b187..30df01f55 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -68,8 +68,8 @@ #define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 #define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 -#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 -#define VAR_DEOXYS_ROCK_LEVEL 0x4035 +#define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 +#define VAR_DEOXYS_ROCK_LEVEL 0x4035 #define VAR_STORAGE_UNKNOWN 0x4036 #define VAR_0x4037 0x4037 #define VAR_0x4038 0x4038 @@ -81,8 +81,8 @@ #define VAR_ALTERING_CAVE_WILD_SET 0x403E #define VAR_0x403F 0x403F #define VAR_DAYS 0x4040 -#define VAR_FANCLUB_UNKNOWN_1 0x4041 -#define VAR_FANCLUB_UNKNOWN_2 0x4042 +#define VAR_FANCLUB_UNKNOWN_1 0x4041 +#define VAR_FANCLUB_UNKNOWN_2 0x4042 #define VAR_DEPT_STORE_FLOOR 0x4043 #define VAR_0x4044 0x4044 #define VAR_POKELOT_PRIZE 0x4045 diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c index 8cb3ce912..7423216a4 100644 --- a/src/field_player_avatar.c +++ b/src/field_player_avatar.c @@ -723,7 +723,7 @@ static bool8 sub_808B1BC(s16 x, s16 y, u8 direction) { if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) && MapGridGetZCoordAt(x, y) == 3 - && GetEventObjectIdByXYZ(x, y, 3) == 16) + && GetEventObjectIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT) { sub_808C750(direction); return TRUE; @@ -792,11 +792,8 @@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction) MoveCoords(direction, &playerX, &playerY); mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); - - if (mewObjectId == 16) - { + if (mewObjectId == EVENT_OBJECTS_COUNT) return FALSE; - } object = &gEventObjects[mewObjectId]; mewPrevX = object->previousCoords.x; |