Added additional map, PEtalburg North

include/constants/layouts.h

@@ -459,5 +459,8 @@
 #define LAYOUT_GRANITE_CAVE_B3F 452
 #define LAYOUT_GRANITE_CAVE_B4F 453
 #define LAYOUT_GRANITE_CAVE_B4FNORTH 454
+#define LAYOUT_NEW_MAP2 455
+#define LAYOUT_RUSTBORO_CITY_EAST 456
+#define LAYOUT_PETALBURF_FORREST_RIVER 457
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H

include/constants/map_groups.h

@@ -415,6 +415,7 @@
 #define MAP_GRANITE_CAVE_B3F                         (110 | (24 << 8))
 #define MAP_GRANITE_CAVE_B4F                         (111 | (24 << 8))
 #define MAP_GRANITE_CAVE_B4FNORTH                    (112 | (24 << 8))
+#define MAP_PETALBURF_FORREST_RIVER                  (113 | (24 << 8))
 
 // gMapGroup_IndoorDynamic
 #define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))

include/constants/opponents.h

@@ -859,12 +859,15 @@
 #define TRAINER_BART						855
 #define TRAINER_LEWIS						856
 #define TRAINER_COLEMAN						867
+#define TRAINER_ANDY						868
+#define TRAINER_AMBER						869
+#define TRAINER_BERRY						870
 
 // NOTE: Because each Trainer uses a flag to determine when they are defeated, there is only space for 9 additional trainers before trainer flag space overflows
 //       More space can be made by shifting flags around in constants/flags.h or changing how trainer flags are handled
 //       MAX_TRAINERS_COUNT can be increased but will take up additional saveblock space
 
-#define TRAINERS_COUNT                      868
+#define TRAINERS_COUNT                      890
 #define MAX_TRAINERS_COUNT                  900//864
 
 #endif  // GUARD_CONSTANTS_OPPONENTS_H