From 8be376e12025436e5d3c3f5e6b88c5163c0085e2 Mon Sep 17 00:00:00 2001 From: tgsm Date: Sat, 23 Nov 2024 14:17:39 -0600 Subject: [PATCH] safari_zone: Give area 4 a proper name, define area 11 (desert) I erroneously assumed area 4 was unused since it's not in the default sets, but it's actually the Rocky Beach. I also missed area 11, which is the Desert. --- include/safari_zone.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/include/safari_zone.h b/include/safari_zone.h index 7c4d7f5bbf..045edb021f 100644 --- a/include/safari_zone.h +++ b/include/safari_zone.h @@ -11,17 +11,18 @@ #define SAFARI_ZONE_MAX_AREAS_PER_SET (SAFARI_ZONE_AREA_SET_COLS * SAFARI_ZONE_AREA_SET_ROWS) #define SAFARI_ZONE_MAX_AREA_SETS 2 -#define SAFARI_ZONE_AREA_PLAINS 0 -#define SAFARI_ZONE_AREA_MEADOW 1 -#define SAFARI_ZONE_AREA_SAVANNAH 2 -#define SAFARI_ZONE_AREA_PEAK 3 -#define SAFARI_ZONE_AREA_UNUSED 4 -#define SAFARI_ZONE_AREA_WETLAND 5 -#define SAFARI_ZONE_AREA_FOREST 6 -#define SAFARI_ZONE_AREA_SWAMP 7 -#define SAFARI_ZONE_AREA_MARSHLAND 8 -#define SAFARI_ZONE_AREA_WASTELAND 9 -#define SAFARI_ZONE_AREA_MOUNTAIN 10 +#define SAFARI_ZONE_AREA_PLAINS 0 +#define SAFARI_ZONE_AREA_MEADOW 1 +#define SAFARI_ZONE_AREA_SAVANNAH 2 +#define SAFARI_ZONE_AREA_PEAK 3 +#define SAFARI_ZONE_AREA_ROCKY_BEACH 4 +#define SAFARI_ZONE_AREA_WETLAND 5 +#define SAFARI_ZONE_AREA_FOREST 6 +#define SAFARI_ZONE_AREA_SWAMP 7 +#define SAFARI_ZONE_AREA_MARSHLAND 8 +#define SAFARI_ZONE_AREA_WASTELAND 9 +#define SAFARI_ZONE_AREA_MOUNTAIN 10 +#define SAFARI_ZONE_AREA_DESERT 11 typedef struct SAFARIZONE_OBJECT { u8 unk[4];