checkpoint 5

data/event_scripts.s

@@ -1096,3 +1096,11 @@ Common_EventScript_LegendaryFlewAway::
 	.include "data/maps/Checkpoint4_Mart/scripts.inc"
 
 	.include "data/maps/Checkpoint4_Pokecenter/scripts.inc"
+
+	.include "data/maps/Checkpoint5Transition/scripts.inc"
+
+	.include "data/maps/Checkpoint5/scripts.inc"
+
+	.include "data/maps/Checkpoint5_Mart/scripts.inc"
+
+	.include "data/maps/Checkpoint5_Pokecenter/scripts.inc"

data/layouts/Checkpoint5/map.bin

@@ -0,0 +1 @@
+������S������������������SSS
HIJ�SSSSSSSS���SS


��PQR�
0(0)0)0+0�0�0
0S��hklmj��D\DS
00123��
0
0S�psqur
0����
0089:;
0
0�
0K2Sp{�}r
0L2SSS0
0`ABC
0
0K2K2�
0xy�yz
0H0I0J0K0
0`2a2a2L2
0
0HIJ
0
0
0X2Z2
00
0PQRS�`2a2b2
0K2PQR
0�
0`2a2Z2
00XYZ[
0`2a2j2
0
0S���K2
0
0h2a2a2Y2Z2`abcX2a2b20
0�0�0S�S�K2K2
0L2i2a2a2Y2Y2Y2Y2a2a2b2
0��
0S
0HIJ
0
0h2i2i2i2a2a2a2a2a2=0>0?0�0�0
0�PQRIIIIII0h2i2a2a2a2E0
0G0�0�0�0
0[A[
00y2z2{2
0
0
0`2a2a2M0N0O0�0�0�0
0��S0
0pqr
0
0
0
0h2a2a2a2b2
0
0�0�0
0�S2
0�0�0�0
0
0�0�0�0
00h2a2a2b2
00�0�0K2S
0
0�0�0�0�0�0�0�0�0
0
0`2a2b20
0
0
0�K2
0
0�0�0�0�0�0�0�0�00
0
0`2a2j2y2z2{2K2��K2
0
0
0�0�0�0�0
00�0
0`2b2
0pqr����K2K2
0
0
0
0
0
0
00
0
0`2b2
0
0
0
0������K2K2K2K2K2K2
0
0
0
0h2j2
0K2K2K2������������K2K2K2K2K2K2K2�����

data/layouts/Checkpoint5Transition/border.bin

@@ -0,0 +1 @@
+

data/layouts/Checkpoint5Transition/map.bin

@@ -0,0 +1,2 @@
+2222222222222222222222222222222222222222222222222222222222222222222222222222222222222
222222222
22222222222222222222222222222222222222222222222222222
22222222;222
22
22222222222;22222222222222222;2222222222222					
+222222222
222222222222'
22
222222
222

222222222222222222222''222222222222222222222222222222222#	XYZ	#
$	XYZ$2

data/layouts/Checkpoint5_Mart/map.bin

@@ -0,0 +1,3 @@
+"D*) 22222212222%8292929292:2
2
2
2-@AAAAB2+,2+
+22222223423
+2
2
2
2
2
2
2;<2;2
2
2
2
22222

data/layouts/Checkpoint5_Pokecenter/map.bin

@@ -0,0 +1 @@
+	ijJKqrH"#RSI22y2z2P*+2[Q$2222 2&2422X!!!Y<222'2 2222`2l2m2n2o22%222'2 22222021222322222'2 22228292:2;2242=>'2 22222@2A2B2C22&2EF'2(2222222222&2427

data/layouts/layouts.json

@@ -4580,6 +4580,46 @@
       "secondary_tileset": "gTileset_PokemonCenter",
       "border_filepath": "data/layouts/Checkpoint4_Pokecenter/border.bin",
       "blockdata_filepath": "data/layouts/Checkpoint4_Pokecenter/map.bin"
+    },
+    {
+      "id": "LAYOUT_CHECKPOINT5TRANSITION",
+      "name": "Checkpoint5Transition_Layout",
+      "width": 20,
+      "height": 20,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/Checkpoint5Transition/border.bin",
+      "blockdata_filepath": "data/layouts/Checkpoint5Transition/map.bin"
+    },
+    {
+      "id": "LAYOUT_CHECKPOINT5",
+      "name": "Checkpoint5_Layout",
+      "width": 22,
+      "height": 22,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Fortree",
+      "border_filepath": "data/layouts/Checkpoint5/border.bin",
+      "blockdata_filepath": "data/layouts/Checkpoint5/map.bin"
+    },
+    {
+      "id": "LAYOUT_CHECKPOINT5_MART",
+      "name": "Checkpoint5_Mart_Layout",
+      "width": 11,
+      "height": 8,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_Shop",
+      "border_filepath": "data/layouts/Checkpoint5_Mart/border.bin",
+      "blockdata_filepath": "data/layouts/Checkpoint5_Mart/map.bin"
+    },
+    {
+      "id": "LAYOUT_CHECKPOINT5_POKECENTER",
+      "name": "Checkpoint5_Pokecenter_Layout",
+      "width": 14,
+      "height": 9,
+      "primary_tileset": "gTileset_Building",
+      "secondary_tileset": "gTileset_PokemonCenter",
+      "border_filepath": "data/layouts/Checkpoint5_Pokecenter/border.bin",
+      "blockdata_filepath": "data/layouts/Checkpoint5_Pokecenter/map.bin"
     }
   ]
 }

data/maps/Checkpoint2/map.json

@@ -7,7 +7,7 @@
   "requires_flash": false,
   "weather": "WEATHER_NONE",
   "map_type": "MAP_TYPE_TOWN",
-  "allow_cycling": true,
+  "allow_cycling": false,
   "allow_escaping": false,
   "allow_running": true,
   "show_map_name": true,

data/maps/Checkpoint2/scripts.pory

@@ -23,10 +23,6 @@ mapscripts Checkpoint2_MapScripts {
 }
 
 script Random_NPC_CheckPoint2{
-    // buffernumberstring(STR_VAR_1, VAR_OBJ_GFX_ID_A)
-    // msgbox("GFX var: {STR_VAR_1}")
-    // buffernumberstring(STR_VAR_2, VAR_RANDOM_NPC_STATE)
-    // msgbox("NPC var: {STR_VAR_2}")
     switch (var(VAR_CHECKPOINT2_NPC_STATE)){
         case 0:
         case 1: 

data/maps/Checkpoint2_Mart/scripts.inc

@@ -29,7 +29,6 @@ MartInventory:
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_BERRY_JUICE
-	.2byte ITEM_MAX_REPEL
 	.2byte ITEM_MAX_POTION
 	.2byte ITEM_ETHER
 	.2byte ITEM_NONE

data/maps/Checkpoint2_Mart/scripts.pory

@@ -29,7 +29,6 @@ mart MartInventory {
     ITEM_GREAT_BALL
     ITEM_ULTRA_BALL
     ITEM_BERRY_JUICE
-    ITEM_MAX_REPEL
 	ITEM_MAX_POTION
 	ITEM_ETHER
 }

data/maps/Checkpoint4/map.json

@@ -9,7 +9,7 @@
   "map_type": "MAP_TYPE_NONE",
   "allow_cycling": false,
   "allow_escaping": false,
-  "allow_running": false,
+  "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
   "connections": [

data/maps/Checkpoint4_Mart/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_CHECKPOINT4_MART",
   "name": "Checkpoint4_Mart",
   "layout": "LAYOUT_CHECKPOINT4_MART",
-  "music": "MUS_ABANDONED_SHIP",
+  "music": "MUS_POKE_MART",
   "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/Checkpoint4_Pokecenter/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_CHECKPOINT4_POKECENTER",
   "name": "Checkpoint4_Pokecenter",
   "layout": "LAYOUT_CHECKPOINT4_POKECENTER",
-  "music": "MUS_ABANDONED_SHIP",
+  "music": "MUS_POKE_CENTER",
   "region_map_section": "MAPSEC_LITTLEROOT_TOWN",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/Checkpoint5/map.json

@@ -0,0 +1,48 @@
+{
+  "id": "MAP_CHECKPOINT5",
+  "name": "Checkpoint5",
+  "layout": "LAYOUT_CHECKPOINT5",
+  "music": "MUS_VERDANTURF",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_RAIN",
+  "map_type": "MAP_TYPE_NONE",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+    {
+      "x": 3,
+      "y": 6,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5TRANSITION",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 9,
+      "y": 9,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5_POKECENTER",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 14,
+      "y": 5,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5_MART",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}

data/maps/Checkpoint5/scripts.pory

@@ -0,0 +1 @@
+mapscripts Checkpoint5_MapScripts {}

data/maps/Checkpoint5Transition/map.json

@@ -0,0 +1,41 @@
+{
+  "id": "MAP_CHECKPOINT5TRANSITION",
+  "name": "Checkpoint5Transition",
+  "layout": "LAYOUT_CHECKPOINT5TRANSITION",
+  "music": "MUS_ROUTE104",
+  "region_map_section": "MAPSEC_ROUTE_105",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_ROUTE105",
+      "dest_warp_id": 0
+    },
+    {
+      "x": 16,
+      "y": 18,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5",
+      "dest_warp_id": 0
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}

data/maps/Checkpoint5Transition/scripts.pory

@@ -0,0 +1 @@
+mapscripts Checkpoint5Transition_MapScripts {}

data/maps/Checkpoint5_Mart/map.json

@@ -0,0 +1,41 @@
+{
+  "id": "MAP_CHECKPOINT5_MART",
+  "name": "Checkpoint5_Mart",
+  "layout": "LAYOUT_CHECKPOINT5_MART",
+  "music": "MUS_POKE_MART",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+    {
+      "x": 4,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5",
+      "dest_warp_id": 2
+    },
+    {
+      "x": 3,
+      "y": 7,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5",
+      "dest_warp_id": 2
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}

data/maps/Checkpoint5_Mart/scripts.pory

@@ -0,0 +1 @@
+mapscripts Checkpoint5_Mart_MapScripts {}

data/maps/Checkpoint5_Pokecenter/map.json

@@ -0,0 +1,41 @@
+{
+  "id": "MAP_CHECKPOINT5_POKECENTER",
+  "name": "Checkpoint5_Pokecenter",
+  "layout": "LAYOUT_CHECKPOINT5_POKECENTER",
+  "music": "MUS_POKE_CENTER",
+  "region_map_section": "MAPSEC_VERDANTURF_TOWN",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_INDOOR",
+  "allow_cycling": false,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": false,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+
+  ],
+  "warp_events": [
+    {
+      "x": 6,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5",
+      "dest_warp_id": 1
+    },
+    {
+      "x": 7,
+      "y": 8,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}

data/maps/Checkpoint5_Pokecenter/scripts.pory

@@ -0,0 +1 @@
+mapscripts Checkpoint5_Pokecenter_MapScripts {}

data/maps/FortreeCity/map.json

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

data/maps/LavaridgeTown_Gym_1F/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GYM",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_FLANNERY",
@@ -277,7 +277,9 @@
       "dest_warp_id": 23
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/Route105/map.json

@@ -110,7 +110,13 @@
     }
   ],
   "warp_events": [
-
+    {
+      "x": 30,
+      "y": 15,
+      "elevation": 0,
+      "dest_map": "MAP_CHECKPOINT5TRANSITION",
+      "dest_warp_id": 0
+    }
   ],
   "coord_events": [
     {

data/maps/map_groups.json

@@ -102,15 +102,19 @@
     "Checkpoint2",
     "Checkpoint3",
     "Checkpoint4",
-    "Checkpoint4Transition"
+    "Checkpoint4Transition",
+    "Checkpoint5Transition",
+    "Checkpoint5"
   ],
   "gMapGroup_CheckpointsIndoor": [
     "Checkpoint2_Mart",
     "Checkpoint2_Pokecenter",
     "Checkpoint3_Mart",
     "Checkpoint3_Pokecenter",
     "Checkpoint4_Mart",
-    "Checkpoint4_Pokecenter"
+    "Checkpoint4_Pokecenter",
+    "Checkpoint5_Mart",
+    "Checkpoint5_Pokecenter"
   ],
   "gMapGroup_SideAreas": [
     "Route102_SideArea",

include/constants/flags.h

@@ -377,7 +377,7 @@
 // Trainer Rematch Flags
 #define FLAG_MATCH_CALL_REGISTERED           0x15C
 #define FLAG_REMATCH_ROSE                    0x15D
-//#define FLAG_REMATCH_ANDRES                  0x15E
+//#define FLAG_REMATCH_ANDRES                0x15E
 #define FLAG_REMATCH_DUSTY                   0x15F
 #define FLAG_REMATCH_LOLA                    0x160
 #define FLAG_REMATCH_RICKY                   0x161