diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-12 19:22:23 +0100 |
| commit | b5ea69cf74e24ab2b09572b3324ac4b3bbd8818a (patch) | |
| tree | cca355371fd2cdd9d9b6fd86c266a500837123a8 /src/field_specials.c | |
| parent | 734403fdfafd1dc4b738f98158dcec45bb01f58b (diff) | |
| parent | 54ad6794bce3ee534aa78a8c6e7f32715cd8f6a9 (diff) | |
Fix conflicts
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index 522cbdf94..1834f3523 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -595,7 +595,7 @@ static void LoadLinkPartnerEventObjectSpritePalette(u8 graphicsId, u8 localEvent graphicsId == EVENT_OBJ_GFX_RIVAL_MAY_NORMAL) { u8 obj = GetEventObjectIdByLocalIdAndMap(localEventId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup); - if (obj != NUM_EVENT_OBJECTS) + if (obj != EVENT_OBJECTS_COUNT) { u8 spriteId = gEventObjects[obj].spriteId; struct Sprite *sprite = &gSprites[spriteId]; @@ -1513,7 +1513,7 @@ bool8 FoundBlackGlasses(void) void SetRoute119Weather(void) { - if (is_map_type_1_2_3_5_or_6(get_map_light_from_warp0()) != TRUE) + if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()) != TRUE) { SetSav1Weather(20); } @@ -1521,7 +1521,7 @@ void SetRoute119Weather(void) void SetRoute123Weather(void) { - if (is_map_type_1_2_3_5_or_6(get_map_light_from_warp0()) != TRUE) + if (is_map_type_1_2_3_5_or_6(GetLastUsedWarpMapType()) != TRUE) { SetSav1Weather(21); } |