Added extra content in granitecave

data/event_scripts.s

@@ -1076,3 +1076,5 @@ Common_EventScript_LegendaryFlewAway::
 	.include "data/maps/RustboroCity_LeafsHouse/scripts.inc"
 
 	.include "data/maps/RustboroCity_LeafsHouse_2F/scripts.inc"
+
+	.include "data/maps/GraniteCave_B3F/scripts.inc"

data/layouts/GraniteCave_B3F/border.bin

@@ -0,0 +1 @@
+

data/layouts/GraniteCave_B3F/map.bin

@@ -0,0 +1,8 @@
+222222222BBBBBBBBBBBB222BBBBň
2
2
2
2
2
2ňBBB22BBBBB
2
2
2
2
2
2
2
2
2
2
2
2
2BBB222BBB
2
2
2
2
2
2
2
2
2
2
2
2
2
2BBB22BBB
2
2
2
2
2!B!B!B!B!B!B!B!B!B!BBBB222BBB
2
2
2
2
2
2B!B!B
+BBBBBBLBRBRBRB222BBB
2
2
2
2
2BBBRBRBRBOBBBBBB222BBB
2
2
2
2
2
2BBBBBBBBBBBB22B
2
2
2
2
2BBň222BBB!B
+
2
2
2
2
2
2BB
2
2
2
2VW
2BBBB
22!2!2!2
+2
2BB
2
2
2
2VW
2BBBBBBB
222222
2BB
2
2
2
2VW
2BBB22222
2BB
2
2
2
2
2BB
2
2
2
2
222222
2BB
2
2
2
2
2
2
2B
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2B2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2
2!!!
2
2!B!B!B!B!B!B!B!B!B!B!B!B!B!B!B!B
+
2!!!
2
2
2B>BBBBBBBBBBBBBBB
2
2
2
2BBBBBBBBBBBBň
22
2
2
2BBBB
2
2
2
22
2
2
2
2
2
2
2
2BBBňň2
2
2
2
2
2
2
2
2
2BBBB
"
"
"
"
"
"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
2222
"
"
"
"
"
"2!2!2
+
2
2
2
2
22!2
+2
"
"
"
"
"
"22
2
2
2
2
2222
"
"Y#
"
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

data/layouts/layouts.json

@@ -4510,6 +4510,16 @@
       "secondary_tileset": "gTileset_BrendansMaysHouse",
       "border_filepath": "data/layouts/RustboroCity_LeafsHouse_2F/border.bin",
       "blockdata_filepath": "data/layouts/RustboroCity_LeafsHouse_2F/map.bin"
+    },
+    {
+      "id": "LAYOUT_GRANITE_CAVE_B3F",
+      "name": "GraniteCave_B3F_Layout",
+      "width": 30,
+      "height": 30,
+      "primary_tileset": "gTileset_General",
+      "secondary_tileset": "gTileset_Cave",
+      "border_filepath": "data/layouts/GraniteCave_B3F/border.bin",
+      "blockdata_filepath": "data/layouts/GraniteCave_B3F/map.bin"
     }
   ]
 }

data/maps/EverGrandeCity/map.json

@@ -19,7 +19,9 @@
       "direction": "left"
     }
   ],
-  "object_events": [],
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 18,

data/maps/EverGrandeCity_ChampionsRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_WALLACE",
@@ -70,6 +70,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_DrakesRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_DRAKE",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_DRAKE",
@@ -44,6 +44,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_GlaciasRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_GLACIA",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_GLACIA",
@@ -44,6 +44,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_Hall1/map.json

@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -44,6 +46,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_Hall2/map.json

@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -44,6 +46,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_Hall3/map.json

@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -44,6 +46,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_Hall4/map.json

@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -30,6 +32,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_Hall5/map.json

@@ -12,8 +12,10 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
-  "object_events": [],
+  "connections": 0,
+  "object_events": [
+
+  ],
   "warp_events": [
     {
       "x": 5,
@@ -44,6 +46,10 @@
       "dest_warp_id": "2"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_HallOfFame/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_WALLACE",
@@ -37,6 +37,10 @@
       "dest_warp_id": "1"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_PhoebesRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_PHOEBE",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_PHOEBE",
@@ -44,6 +44,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_PokemonLeague_1F/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_NURSE",
@@ -104,6 +104,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/EverGrandeCity_SidneysRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_SIDNEY",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_SIDNEY",
@@ -44,6 +44,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/GraniteCave_1F/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_HIKER",
@@ -71,6 +71,10 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/GraniteCave_B1F/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -79,6 +79,10 @@
       "dest_warp_id": "4"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/GraniteCave_B2F/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -169,7 +169,9 @@
       "dest_warp_id": "6"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "hidden_item",

data/maps/GraniteCave_B3F/map.json

@@ -0,0 +1,105 @@
+{
+  "id": "MAP_GRANITE_CAVE_B3F",
+  "name": "GraniteCave_B3F",
+  "layout": "LAYOUT_GRANITE_CAVE_B3F",
+  "music": "MUS_PETALBURG_WOODS",
+  "region_map_section": "MAPSEC_GRANITE_CAVE",
+  "requires_flash": true,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_UNDERGROUND",
+  "allow_cycling": true,
+  "allow_escaping": false,
+  "allow_running": true,
+  "show_map_name": true,
+  "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
+  "connections": 0,
+  "object_events": [
+    {
+      "graphics_id": "OBJ_EVENT_GFX_STEVEN",
+      "x": 9,
+      "y": 25,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 2,
+      "y": 17,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B3F_EventScript_ItemRevive",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_3F_REVIVE"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
+      "x": 16,
+      "y": 6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_B3F_EventScript_ItemSuperPotion",
+      "flag": "FLAG_ITEM_GRANITE_CAVE_3F_SUPERPOTION"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_AGGRON",
+      "x": 22,
+      "y": 24,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_LAIRON",
+      "x": 26,
+      "y": 28,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_ARON",
+      "x": 18,
+      "y": 13,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_WANDER_AROUND",
+      "movement_range_x": 3,
+      "movement_range_y": 3,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    }
+  ],
+  "warp_events": [
+
+  ],
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
+}

data/maps/GraniteCave_B3F/scripts.inc

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

data/maps/GraniteCave_StevensRoom/map.json

@@ -12,7 +12,7 @@
   "allow_running": true,
   "show_map_name": true,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_STEVEN",
@@ -26,6 +26,32 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "GraniteCave_StevensRoom_EventScript_Steven",
       "flag": "FLAG_HIDE_GRANITE_CAVE_STEVEN"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
+      "x": -7,
+      "y": -7,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BALTOY",
+      "x": -7,
+      "y": -6,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "0"
     }
   ],
   "warp_events": [
@@ -37,6 +63,10 @@
       "dest_warp_id": "3"
     }
   ],
-  "coord_events": [],
-  "bg_events": []
+  "coord_events": [
+
+  ],
+  "bg_events": [
+
+  ]
 }

data/maps/GraniteCave_StevensRoom/scripts.inc

@@ -7,9 +7,9 @@ GraniteCave_StevensRoom_EventScript_Steven::
 	lock
 	faceplayer
 	msgbox GraniteCave_StevensRoom_Text_ImStevenLetterForMe, MSGBOX_DEFAULT
-	setvar VAR_0x8004, ITEM_LETTER
-	call Common_EventScript_PlayerHandedOverTheItem
-	setflag FLAG_DELIVERED_STEVEN_LETTER
+	//setvar VAR_0x8004, ITEM_LETTER
+	//call Common_EventScript_PlayerHandedOverTheItem
+	//setflag FLAG_DELIVERED_STEVEN_LETTER
 	msgbox GraniteCave_StevensRoom_Text_ThankYouTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_TM47
 	call_if_eq VAR_RESULT, FALSE, GraniteCave_StevensRoom_EventScript_BagFull
@@ -22,6 +22,8 @@ GraniteCave_StevensRoom_EventScript_Steven::
 	closemessage
 	delay 30
 	setflag FLAG_REGISTERED_STEVEN_POKENAV
+	//insert own script here
+	goto GraniteCave_StevensRoom_EventScript_Steven_AskForHelp
 	msgbox GraniteCave_StevensRoom_Text_IveGotToHurryAlong, MSGBOX_DEFAULT
 	closemessage
 	call_if_eq VAR_FACING, DIR_NORTH, GraniteCave_StevensRoom_EventScript_StevenExitNorth
@@ -118,4 +120,95 @@ GraniteCave_StevensRoom_Text_IveGotToHurryAlong:
 GraniteCave_StevensRoom_Text_OhBagIsFull:
 	.string "Oh, your BAG is full…\n"
 	.string "That's too bad, then.$"
+	
+//Extra
+GraniteCave_StevensRoom_EventScript_Steven_AskForHelp::
+	msgbox GraniteCave_StevensRoom_Text_CouldUseSomeHelp, MSGBOX_YESNO
+	//goto_if_eq VAR_RESULT, YES, GraniteCave_StevensRoom_EventScript_CouldUseSomeHelp_Yes
+	//msgbox GraniteCave_StevensRoom_Text_CouldUseSomeHelp_No, MSGBOX_NPC
+	closemessage
+	goto GraniteCave_StevensRoom_EventScript_Colapse
+	end
+
+GraniteCave_StevensRoom_Text_CouldUseSomeHelp:
+	.string "While I have you, maybe you could help\n"
+	.string "me. Would you mind?$"
+	
+GraniteCave_StevensRoom_Movement_CheckDoor:
+	walk_up
+	delay_16
+	walk_down
+	step_end
+
+GraniteCave_StevensRoom_Movement_StevenLookAround:
+	face_left
+	delay_16
+	face_right
+	delay_16
+	face_down
+	delay_16
+	step_end
+	
+GraniteCave_StevensRoom_Text_AfterFall:
+	.string "That was... interesting.\p"
+	.string "Looks like you will be helping me\n"
+	.string "afterall.\p"
+	.string "....................$"
+
+GraniteCave_StevensRoom_Text_UseDig:
+	.string "I have an Idea.\p"
+	.string "Baltoy, use dig!$"
+
+GraniteCave_StevensRoom_Movement_ReleaseBaltoy:
+	face_left
+	walk_faster_left
+	face_down
+	step_end
+
+GraniteCave_StevensRoom_EventScript_Colapse::
+	lock
+	delay 16
+	setvar VAR_0x8004, 0  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 40  @ num shakes
+	setvar VAR_0x8007, 4   @ shake delay
+	special ShakeCamera
+	playse SE_M_EARTHQUAKE 
+	delay 64
+	fadescreen 1 //screen to black
+	setobjectxyperm 2, 7, 4 //set rock to location
+	removeobject 2
+	setflag FLAG_STEVENS_CAVE_ROCK
+	clearflag FLAG_STEVENS_CAVE_ROCK
+	showobjectat 2, MAP_GRANITE_CAVE_STEVENS_ROOM
+	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_CheckDoor
+	waitstate // wait for shake
+	waitse
+	fadescreen 0 //fade back to normal
+	applymovement LOCALID_STEVEN, GraniteCave_StevensRoom_Movement_StevenLookAround
+	delay 128
+	lockall
+	faceplayer
+	msgbox GraniteCave_StevensRoom_Text_AfterFall, MSGBOX_NPC
+	delay 64
+	msgbox GraniteCave_StevensRoom_Text_UseDig
+	delay 32
+	fadescreen 3
+	//applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_ReleaseBaltoy
+	setobjectxyperm 3, 6, 8
+	showobjectat 3, MAP_GRANITE_CAVE_STEVENS_ROOM
+	addobject 3
+	fadescreen 2
+	delay 64
+	setvar VAR_0x8004, 0  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 30  @ num shakes
+	setvar VAR_0x8007, 2   @ shake delay
+	special ShakeCamera
+	waitstate
+	warp MAP_RUSTBORO_CITY, 0, 0, 0
+	release
+	end
+	
+	
 

data/maps/InsideOfTruck/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MOVING_BOX",

data/maps/LittlerootTown/map.json

@@ -164,8 +164,8 @@
       "x": 17,
       "y": 2,
       "elevation": 0,
-      "dest_map": "MAP_RUSTBORO_CITY_LEAFS_HOUSE",
-      "dest_warp_id": "0"
+      "dest_map": "MAP_GRANITE_CAVE_1F",
+      "dest_warp_id": "3"
     }
   ],
   "coord_events": [

data/maps/Route101ext/map.json

@@ -107,6 +107,32 @@
       "trainer_sight_or_berry_tree_id": "0",
       "script": "Route101ext_EventScript_LonelyWoman",
       "flag": "0"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_BREAKABLE_ROCK",
+      "x": 5,
+      "y": 24,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_NONE",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "NULL",
+      "flag": "FLAG_STEVENS_CAVE_ROCK"
+    },
+    {
+      "graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
+      "x": 7,
+      "y": 24,
+      "elevation": 0,
+      "movement_type": "MOVEMENT_TYPE_FACE_DOWN",
+      "movement_range_x": 0,
+      "movement_range_y": 0,
+      "trainer_type": "TRAINER_TYPE_NONE",
+      "trainer_sight_or_berry_tree_id": "0",
+      "script": "GraniteCave_StevensRoom_EventScript_Colapse",
+      "flag": "0"
     }
   ],
   "warp_events": [

data/maps/Route101ext/scripts.inc

@@ -16,6 +16,33 @@ Route101ext_EventScript_LonelyWoman::
 Route101ext_EventScript_Sign::
 	msgbox Route101ext_Text_Sign, MSGBOX_NPC
 	end
+	
+Route101ext_EventScript_RockTest::
+	goto_if_set FLAG_STEVENS_CAVE_ROCK, Route101ext_EventScript_RockTest_on
+	removeobject 7
+	setflag FLAG_STEVENS_CAVE_ROCK
+	
+	delay 16
+	setvar VAR_0x8004, 0  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 40  @ num shakes
+	setvar VAR_0x8007, 4   @ shake delay
+	special ShakeCamera
+	waitstate
+	
+	end
+
+Route101ext_EventScript_RockTest_on::
+	clearflag FLAG_STEVENS_CAVE_ROCK
+	setobjectxyperm 7, 5, 24
+	delay 16
+	setvar VAR_0x8004, 1  @ vertical pan
+	setvar VAR_0x8005, 2   @ horizontal pan
+	setvar VAR_0x8006, 3  @ num shakes
+	setvar VAR_0x8007, 1   @ shake delay
+	special ShakeCamera
+	waitstate
+	end
 
 Route101ext_Text_Sign:
 	.string "{LEFT_ARROW} OLDALE TOWN\n"

data/maps/Route124_DivingTreasureHuntersHouse/map.json

@@ -12,7 +12,7 @@
   "allow_running": false,
   "show_map_name": false,
   "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
-  "connections": null,
+  "connections": 0,
   "object_events": [
     {
       "graphics_id": "OBJ_EVENT_GFX_MAN_5",
@@ -44,7 +44,9 @@
       "dest_warp_id": "0"
     }
   ],
-  "coord_events": [],
+  "coord_events": [
+
+  ],
   "bg_events": [
     {
       "type": "sign",

data/maps/map_groups.json

@@ -439,7 +439,8 @@
     "AlteringCave",
     "MeteorFalls_StevensCave",
     "PetalburgWoodsExt",
-    "PetalburgWoodsext2"
+    "PetalburgWoodsext2",
+    "GraniteCave_B3F"
   ],
   "gMapGroup_IndoorDynamic": [
     "SecretBase_RedCave1",

data/scripts/item_ball_scripts.inc

@@ -381,6 +381,14 @@ GraniteCave_B2F_EventScript_ItemRepel::
 GraniteCave_B2F_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
+	
+GraniteCave_B3F_EventScript_ItemRevive::
+	finditem ITEM_REVIVE
+	end
+
+GraniteCave_B3F_EventScript_ItemSuperPotion::
+	finditem ITEM_SUPER_POTION
+	end
 
 JaggedPass_EventScript_ItemBurnHeal::
 	finditem ITEM_BURN_HEAL

include/constants/flags.h

@@ -1224,9 +1224,9 @@
 #define FLAG_RECEIVED_FEEBASS                                       0x496 // Unused Flag
 #define FLAG_ITEM_PETALBURGEXT2_WOODS_REVIVE                        0x497 // Unused Flag
 #define FLAG_LEAFS_ARRIVED                                          0x498 // Unused Flag
-#define FLAG_UNUSED_0x499                                           0x499 // Unused Flag
-#define FLAG_UNUSED_0x49A                                           0x49A // Unused Flag
-#define FLAG_UNUSED_0x49B                                           0x49B // Unused Flag
+#define FLAG_STEVENS_CAVE_ROCK                                      0x499 // Unused Flag
+#define FLAG_ITEM_GRANITE_CAVE_3F_SUPERPOTION                       0x49A // Unused Flag
+#define FLAG_ITEM_GRANITE_CAVE_3F_REVIVE                            0x49B // Unused Flag
 #define FLAG_UNUSED_0x49C                                           0x49C // Unused Flag
 #define FLAG_UNUSED_0x49D                                           0x49D // Unused Flag
 #define FLAG_UNUSED_0x49E                                           0x49E // Unused Flag

include/constants/layouts.h

@@ -456,5 +456,6 @@
 #define LAYOUT_PETALBURG_WOODSEXT2 449
 #define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE 450
 #define LAYOUT_RUSTBORO_CITY_LEAFS_HOUSE_2F 451
+#define LAYOUT_GRANITE_CAVE_B3F 452
 
 #endif // GUARD_CONSTANTS_LAYOUTS_H

include/constants/map_groups.h

@@ -410,6 +410,7 @@
 #define MAP_METEOR_FALLS_STEVENS_CAVE                (107 | (24 << 8))
 #define MAP_PETALBURG_WOODS_EXT                      (108 | (24 << 8))
 #define MAP_PETALBURG_WOODSEXT2                      (109 | (24 << 8))
+#define MAP_GRANITE_CAVE_B3F                         (110 | (24 << 8))
 
 // gMapGroup_IndoorDynamic
 #define MAP_SECRET_BASE_RED_CAVE1    (0 | (25 << 8))

src/new_game.c

@@ -127,6 +127,7 @@ static void ClearFrontierRecord(void)
 static void WarpToTruck(void)
 {
     SetWarpDestination(MAP_GROUP(INSIDE_OF_TRUCK), MAP_NUM(INSIDE_OF_TRUCK), WARP_ID_NONE, -1, -1);
+	//SetWarpDestination(MAP_GROUP(OLDALE_TOWN), MAP_NUM(OLDALE_TOWN), -1, 6, 18);
     WarpIntoMap();
 }