Added test pokemon encounters

data/event_scripts.s

@@ -1065,3 +1065,5 @@ Common_EventScript_LegendaryFlewAway::
 	.include "data/maps/InsideOfStartBoat_1F/scripts.inc"
 
 	.include "data/maps/InsideOfStartBoat_0F/scripts.inc"
+
+	.include "data/maps/BudportCity/scripts.inc"

data/layouts/BudportCity/border.bin

@@ -0,0 +1 @@
+p
p
p
p

data/layouts/InsideOfStartBoat_0F/map.bin

@@ -1 +1 @@
-6!!!7
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2>))<06>?
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2>2<>2<EFBFBD>2?
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2>222?
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2>222?
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2





2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
+6!!!7
2
2
2
2
2
26l2<6C>2c2<63>2
2
2
2
2
2
2
2
2
2
2
2
2
2
2>))<06>?
2
2
2
2
2
2>t2<74>2+2<>2
2
2
2
2
2
2
2
2
2
2
2
2
2
2>2<>2<EFBFBD>?
2
2
2
2
2
2>2222
2
2
2
2
2
2
2
2
2
2
2
2
2
2>222?
2
2
2
2
2
2>2222
2
2
2
2
2
2
2
2
2
2
2
2
2
2>222?
2
2
2
2
2
2>2222
2
2
2
2
2
2
2
2
2
2
2
2
2
2





2
2
2
2
2
2>2222
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2

data/layouts/InsideOfStartBoat_1F/map.bin

@@ -1,2 +1,2 @@
-6!011112!011112!011112!2!27>)011112)011112)011112)2)2?>201111220111122011112
-22?>2 !!"#&2 !!"#&2 !!"#&22?>2())*+2.2())*+2.2())*+2.22?>22222222222222222222222?>2N2222'2O22N2222'2O22N2222'2O222?>20111122011112201111222?>20111122011112201111222?>'011112'011112'011112''?
+6!011112!011112!011112!!!7>)011112)011112)011112)))?>2011112201111220111122
+22?>2 !!"#&2 !!"#&2 !!"#&222?>2())*+2.2())*+2.2())*+2.222?>222222222222222222222222?>2N2222/2O22N2222/2O22N2222/2O2222?>201111220111122011112222?>201111220111122011112222?>'011112'011112'011112'''?

data/layouts/layouts.json

@@ -4424,7 +4424,7 @@
     {
       "id": "LAYOUT_INSIDE_OF_START_BOAT_1F",
       "name": "InsideOfStartBoat_1F_Layout",
-      "width": 25,
+      "width": 26,
       "height": 10,
       "primary_tileset": "gTileset_General",
       "secondary_tileset": "gTileset_InsideShip",
@@ -4440,6 +4440,16 @@
       "secondary_tileset": "gTileset_InsideShip",
       "border_filepath": "data/layouts/InsideOfStartBoat_0F/border.bin",
       "blockdata_filepath": "data/layouts/InsideOfStartBoat_0F/map.bin"
+    },
+    {
+      "id": "LAYOUT_BUDPORT_CITY",
+      "name": "BudportCity_Layout",
+      "width": 46,
+      "height": 40,
+      "primary_tileset": "gTileset_GeneralWithStairs",
+      "secondary_tileset": "gTileset_Budport",
+      "border_filepath": "data/layouts/BudportCity/border.bin",
+      "blockdata_filepath": "data/layouts/BudportCity/map.bin"
     }
   ]
 }

data/maps/BudportCity/map.json

@@ -0,0 +1,34 @@
+{
+  "id": "MAP_BUDPORT_CITY",
+  "name": "BudportCity",
+  "layout": "LAYOUT_BUDPORT_CITY",
+  "music": "MUS_SLATEPORT",
+  "region_map_section": "MAPSEC_SLATEPORT_CITY",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_NONE",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+    {
+      "x": 34,
+      "y": 30,
+      "elevation": 0,
+      "dest_map": "MAP_INSIDE_OF_START_BOAT_0F",
+      "dest_warp_id": "3"
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}

data/maps/BudportCity/scripts.inc

@@ -0,0 +1,2 @@
+BudportCity_MapScripts::
+	.byte 0

data/maps/InsideOfStartBoat_0F/map.json

@@ -17,7 +17,34 @@
 
   ],
   "warp_events": [
-
+    {
+      "x": 2,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_INSIDE_OF_START_BOAT_1F",
+      "dest_warp_id": "6"
+    },
+    {
+      "x": 2,
+      "y": 4,
+      "elevation": 0,
+      "dest_map": "MAP_INSIDE_OF_START_BOAT_0F",
+      "dest_warp_id": "2"
+    },
+    {
+      "x": 14,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_INSIDE_OF_START_BOAT_0F",
+      "dest_warp_id": "1"
+    },
+    {
+      "x": 13,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_BUDPORT_CITY",
+      "dest_warp_id": "0"
+    }
   ],
   "coord_events": [
 

data/maps/InsideOfStartBoat_1F/map.json

@@ -58,6 +58,13 @@
       "elevation": 0,
       "dest_map": "MAP_INSIDE_OF_START_BOAT_CABINS",
       "dest_warp_id": "7"
+    },
+    {
+      "x": 23,
+      "y": 2,
+      "elevation": 0,
+      "dest_map": "MAP_INSIDE_OF_START_BOAT_0F",
+      "dest_warp_id": "0"
     }
   ],
   "coord_events": [

data/maps/Route109/map.json

@@ -347,7 +347,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/Route134/map.json

@@ -169,7 +169,13 @@
       "flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
     }
   ],
-  "warp_events": [],
-  "coord_events": [],
-  "bg_events": []
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/Underwater_Route125/map.json

@@ -19,7 +19,9 @@
       "direction": "emerge"
     }
   ],
-  "object_events": [],
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 22,
@@ -36,6 +38,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/map_groups.json

@@ -92,7 +92,8 @@
     "Underwater_Route128",
     "Underwater_Route129",
     "Underwater_Route105",
-    "Underwater_Route125"
+    "Underwater_Route125",
+    "BudportCity"
   ],
   "gMapGroup_IndoorLittleroot": [
     "LittlerootTown_BrendansHouse_1F",

data/tilesets/secondary/budport/palettes/00.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+255 0 255
+115 189 246
+98 172 238
+115 189 246
+98 164 222
+82 139 197
+74 115 172
+115 197 164

data/tilesets/secondary/budport/palettes/01.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+115 189 246
+98 172 238
+255 189 131
+238 148 115
+222 106 98
+205 65 82
+115 197 164

data/tilesets/secondary/budport/palettes/02.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+180 255 131
+131 197 98
+57 139 49
+57 82 0
+222 148 115
+106 90 90
+164 98 90
+65 57 49
+255 197 148
+222 106 98
+205 65 82
+164 213 197
+115 197 164
+65 180 131
+24 164 106

data/tilesets/secondary/budport/palettes/03.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+213 213 213
+189 189 189
+164 164 164
+131 131 139
+255 0 255
+255 0 255
+65 49 65
+238 213 205
+222 180 164
+189 148 139
+156 115 115
+131 90 90
+98 65 82
+115 197 164

data/tilesets/secondary/budport/palettes/04.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+255 0 255
+255 0 255
+255 0 255
+255 0 255
+82 106 213
+65 90 189
+57 82 164
+49 74 148
+172 197 230
+139 164 222
+106 131 213
+82 106 213
+115 197 164

data/tilesets/secondary/budport/palettes/05.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+131 131 139
+98 98 123
+65 74 106
+41 49 90
+115 189 246
+98 172 238
+238 230 164
+222 205 131
+213 180 106
+205 156 82
+115 197 164

data/tilesets/secondary/budport/palettes/06.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+230 230 238
+205 205 222
+197 180 222
+123 131 156
+98 98 123
+65 74 106
+41 49 90
+205 205 148
+172 148 90
+222 213 238
+197 180 189
+164 156 164
+131 106 172
+115 197 164

data/tilesets/secondary/budport/palettes/07.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+213 106 255
+255 156 0
+205 205 222
+148 139 164
+65 74 106
+255 255 222
+222 205 148
+172 164 106
+139 115 74
+238 57 32
+197 82 16
+197 148 57
+230 222 57
+0 213 156
+65 164 115

data/tilesets/secondary/budport/palettes/08.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+230 230 205
+222 222 180
+189 189 156
+164 156 131
+131 131 90
+115 115 123
+65 74 106
+41 49 90
+115 189 246
+98 172 238
+189 230 222
+148 213 197
+98 172 180
+98 148 123
+115 197 164

data/tilesets/secondary/budport/palettes/09.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+246 180 131
+230 139 98
+189 106 82
+123 98 65
+246 230 172
+222 180 115
+197 131 65
+205 222 172
+131 172 123
+238 246 230
+189 197 246
+123 148 246
+82 123 180
+90 115 98
+65 74 106

data/tilesets/secondary/budport/palettes/10.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+222 205 148
+189 172 82
+156 131 32
+115 106 49
+148 148 156
+98 98 123
+65 74 106
+41 49 90
+238 246 246
+148 205 255
+222 222 189
+90 148 156
+156 197 90
+115 139 65
+115 197 164

data/tilesets/secondary/budport/palettes/11.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+24 41 82
+255 255 255
+222 230 238
+189 205 230
+156 180 222
+255 189 139
+246 115 74
+156 82 49
+189 246 197
+148 230 115
+8 139 65
+90 197 238
+98 164 172
+255 230 156
+230 197 65
+65 74 106

data/tilesets/secondary/budport/palettes/12.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/tilesets/secondary/budport/palettes/13.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/tilesets/secondary/budport/palettes/14.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

data/tilesets/secondary/budport/palettes/15.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+255 213 180
+255 197 148
+222 148 115
+123 65 65
+57 74 123
+41 57 98
+24 41 82
+16 32 57
+222 230 238
+255 197 90
+189 156 90
+255 98 90
+197 65 65
+255 255 255
+0 0 0

include/constants/layouts.h

@@ -448,5 +448,7 @@
 #define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED 441
 #define LAYOUT_INSIDE_OF_START_BOAT_CABINS 442
 #define LAYOUT_INSIDE_OF_START_BOAT_1F 443
+#define LAYOUT_INSIDE_OF_START_BOAT_0F 444
+#define LAYOUT_BUDPORT_CITY 445
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H

include/constants/map_groups.h

@@ -63,6 +63,7 @@
 #define MAP_UNDERWATER_ROUTE129 (54 | (0 << 8))
 #define MAP_UNDERWATER_ROUTE105 (55 | (0 << 8))
 #define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8))
+#define MAP_BUDPORT_CITY        (57 | (0 << 8))
 
 // gMapGroup_IndoorLittleroot
 #define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F    (0 | (1 << 8))

include/constants/metatile_labels.h

@@ -258,6 +258,7 @@
 #define METATILE_InsideOfTruck_ExitLight_Top           0x208
 
 // gTileset_InsideShip
+#define METATILE_InsideShip_DoorIndent_Locked           0x234
 #define METATILE_InsideShip_DoorIndent_Unlocked         0x21A
 #define METATILE_InsideShip_IntactDoor_Bottom_Interior  0x297
 #define METATILE_InsideShip_IntactDoor_Bottom_Locked    0x233

src/battle_script_commands.c

@@ -15216,6 +15216,12 @@ static void Cmd_trysetcaughtmondexflags(void)
     {
         gBattlescriptCurrInstr = cmd->failInstr;
     }
+    // With the following change, if you catch a Pokémon without having the Pokédex, it won't show their entry. It will still register them, for when you do get the Dex
+    else if (!FlagGet(FLAG_SYS_POKEDEX_GET))
+    {
+        HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality);
+        gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
+    }
     else
     {
         HandleSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_SET_CAUGHT, personality);

src/data/map_group_count.h

@@ -1 +1 @@
-static const u8 MAP_GROUP_COUNT[] = {57, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 63, 89, 2, 1, 13, 1, 1, 3, 1, 0};
+static const u8 MAP_GROUP_COUNT[] = {58, 5, 5, 6, 7, 8, 9, 7, 7, 14, 8, 17, 10, 23, 13, 15, 15, 2, 2, 2, 3, 1, 1, 1, 108, 64, 89, 2, 1, 13, 1, 1, 3, 1, 0};

src/data/tilesets/graphics.h

@@ -1653,3 +1653,22 @@ const u16 gTilesetPalettes_GeneralWithStairs[][16] =
 };
 
 const u32 gTilesetTiles_GeneralWithStairs[] = INCBIN_U32("data/tilesets/primary/general_with_stairs/tiles.4bpp.lz");
+
+const u16 gTilesetPalettes_Budport[][16] =
+{
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/00.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/01.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/02.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/03.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/04.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/05.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/06.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/07.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/08.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/09.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/10.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/11.gbapal"),
+    INCBIN_U16("data/tilesets/secondary/budport/palettes/12.gbapal"),
+};
+
+const u32 gTilesetTiles_Budport[] = INCBIN_U32("data/tilesets/secondary/budport/tiles.4bpp.lz");

src/data/tilesets/headers.h

@@ -836,3 +836,14 @@ const struct Tileset gTileset_GeneralWithStairs =
     .metatileAttributes = gMetatileAttributes_GeneralWithStairs,
     .callback = NULL,
 };
+
+const struct Tileset gTileset_Budport =
+{
+    .isCompressed = TRUE,
+    .isSecondary = TRUE,
+    .tiles = gTilesetTiles_Budport,
+    .palettes = gTilesetPalettes_Budport,
+    .metatiles = gMetatiles_Budport,
+    .metatileAttributes = gMetatileAttributes_Budport,
+    .callback = NULL,
+};

src/data/tilesets/metatiles.h

@@ -210,3 +210,6 @@ const u16 gMetatileAttributes_UnionRoom[] = INCBIN_U16("data/tilesets/secondary/
 
 const u16 gMetatiles_GeneralWithStairs[] = INCBIN_U16("data/tilesets/primary/general_with_stairs/metatiles.bin");
 const u16 gMetatileAttributes_GeneralWithStairs[] = INCBIN_U16("data/tilesets/primary/general_with_stairs/metatile_attributes.bin");
+
+const u16 gMetatiles_Budport[] = INCBIN_U16("data/tilesets/secondary/budport/metatiles.bin");
+const u16 gMetatileAttributes_Budport[] = INCBIN_U16("data/tilesets/secondary/budport/metatile_attributes.bin");

src/data/wild_encounters.json

@@ -11491,6 +11491,105 @@
               }
             ]
           }
+        },
+        {
+          "map": "MAP_BUDPORT_CITY",
+          "base_label": "gBudportCity0",
+          "water_mons": {
+            "encounter_rate": 0,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ARCEUS_WATER"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_TYRANITAR_MEGA"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ABSOL_MEGA"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              }
+            ]
+          },
+          "land_mons": {
+            "encounter_rate": 0,
+            "mons": [
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_ZACIAN_CROWNED_SWORD"
+              },
+              {
+                "min_level": 10,
+                "max_level": 10,
+                "species": "SPECIES_ZYGARDE_10"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_MEWTWO"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_KELDEO"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              },
+              {
+                "min_level": 5,
+                "max_level": 5,
+                "species": "SPECIES_NONE"
+              }
+            ]
+          }
         }
       ]
     },