Merge pull request #5 from pret/master

Take files

3 files changed, 261 insertions, 0 deletions

diff --git a/data/maps/SSAnne_Kitchen/map.json b/data/maps/SSAnne_Kitchen/map.json
new file mode 100644
index 000000000..968c8c15c
--- /dev/null
+++ b/data/maps/SSAnne_Kitchen/map.json
@@ -0,0 +1,160 @@
+{
+  "id": "MAP_SSANNE_KITCHEN",
+  "name": "SSAnne_Kitchen",
+  "layout": "LAYOUT_SSANNE_KITCHEN",
+  "music": "BGM_FRLG_SS_ANNE",
+  "region_map_section": "MAPSEC_S_S_ANNE",
+  "requires_flash": false,
+  "weather": "WEATHER_NONE",
+  "map_type": "MAP_TYPE_8",
+  "unknown_18": 0,
+  "unknown_19": 6,
+  "elevator_flag": 0,
+  "battle_scene": "BATTLE_SCENE_0",
+  "connections": null,
+  "object_events": [
+    {
+      "graphics_id": "59",
+      "x": 1,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160AB3",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 6,
+      "y": 6,
+      "elevation": 3,
+      "movement_type": "3",
+      "movement_range_x": 1,
+      "movement_range_y": 2,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160ABC",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 10,
+      "y": 4,
+      "elevation": 3,
+      "movement_type": "18",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160AC5",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 8,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160ACE",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 5,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B1E",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 7,
+      "elevation": 3,
+      "movement_type": "9",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B27",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "59",
+      "x": 14,
+      "y": 9,
+      "elevation": 3,
+      "movement_type": "7",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_160B30",
+      "flag": "0"
+    },
+    {
+      "graphics_id": "92",
+      "x": 1,
+      "y": 10,
+      "elevation": 3,
+      "movement_type": "8",
+      "movement_range_x": 1,
+      "movement_range_y": 1,
+      "trainer_type": 0,
+      "trainer_sight_or_berry_tree_id": 0,
+      "script": "SSAnne_Kitchen_EventScript_1BE6AC",
+      "flag": "362"
+    }
+  ],
+  "warp_events": [
+    {
+      "x": 7,
+      "y": 1,
+      "elevation": 0,
+      "dest_map": "MAP_SSANNE_1F_CORRIDOR",
+      "dest_warp_id": 1
+    }
+  ],
+  "coord_events": [],
+  "bg_events": [
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 8,
+      "elevation": 0,
+      "item": "ITEM_CHESTO_BERRY",
+      "flag": "122",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 4,
+      "elevation": 0,
+      "item": "ITEM_PECHA_BERRY",
+      "flag": "120",
+      "unknown": 1
+    },
+    {
+      "type": "hidden_item",
+      "x": 14,
+      "y": 6,
+      "elevation": 0,
+      "item": "ITEM_CHERI_BERRY",
+      "flag": "121",
+      "unknown": 1
+    }
+  ]
+}
diff --git a/data/maps/SSAnne_Kitchen/scripts.inc b/data/maps/SSAnne_Kitchen/scripts.inc
new file mode 100644
index 000000000..b1b60056d
--- /dev/null
+++ b/data/maps/SSAnne_Kitchen/scripts.inc
@@ -0,0 +1,53 @@
+SSAnne_Kitchen_MapScripts:: @ 8160AB2
+	.byte 0
+
+SSAnne_Kitchen_EventScript_160AB3:: @ 8160AB3
+	msgbox gUnknown_81733F8, 2
+	end
+
+SSAnne_Kitchen_EventScript_160ABC:: @ 8160ABC
+	msgbox gUnknown_8173429, 2
+	end
+
+SSAnne_Kitchen_EventScript_160AC5:: @ 8160AC5
+	msgbox gUnknown_8173462, 2
+	end
+
+SSAnne_Kitchen_EventScript_160ACE:: @ 8160ACE
+	lock
+	faceplayer
+	msgbox gUnknown_8173570
+	random 3
+	copyvar VAR_0x8008, VAR_RESULT
+	compare_var_to_value VAR_0x8008, 0
+	call_if 1, EventScript_160B03
+	compare_var_to_value VAR_0x8008, 1
+	call_if 1, EventScript_160B0C
+	compare_var_to_value VAR_0x8008, 2
+	call_if 1, EventScript_160B15
+	release
+	end
+
+EventScript_160B03:: @ 8160B03
+	msgbox gUnknown_817359F
+	return
+
+EventScript_160B0C:: @ 8160B0C
+	msgbox gUnknown_81735DF
+	return
+
+EventScript_160B15:: @ 8160B15
+	msgbox gUnknown_8173611
+	return
+
+SSAnne_Kitchen_EventScript_160B1E:: @ 8160B1E
+	msgbox gUnknown_81734A0, 2
+	end
+
+SSAnne_Kitchen_EventScript_160B27:: @ 8160B27
+	msgbox gUnknown_81734D3, 2
+	end
+
+SSAnne_Kitchen_EventScript_160B30:: @ 8160B30
+	msgbox gUnknown_817353E, 2
+	end
diff --git a/data/maps/SSAnne_Kitchen/text.inc b/data/maps/SSAnne_Kitchen/text.inc
new file mode 100644
index 000000000..edd115076
--- /dev/null
+++ b/data/maps/SSAnne_Kitchen/text.inc
@@ -0,0 +1,48 @@
+gUnknown_81733F8:: @ 81733F8
+    .string "You, mon petit!\n"
+    .string "We're busy here!\l"
+    .string "Out of the way!$"
+
+gUnknown_8173429:: @ 8173429
+    .string "I saw an odd BERRY in the trash.\n"
+    .string "I wonder what that was?$"
+
+gUnknown_8173462:: @ 8173462
+    .string "I'm so busy I'm getting dizzy!\n"
+    .string "You have to give me room here!$"
+
+gUnknown_81734A0:: @ 81734A0
+    .string "Hum-de-hum-de-ho…\p"
+    .string "I peel spuds every day!\n"
+    .string "Hum-hum…$"
+
+gUnknown_81734D3:: @ 81734D3
+    .string "Did you hear about SNORLAX?\n"
+    .string "It's a glutton.\p"
+    .string "No other POKéMON eats and sleeps\n"
+    .string "the way SNORLAX can and does!$"
+
+gUnknown_817353E:: @ 817353E
+    .string "Snivel… Sniff…\p"
+    .string "I only get to peel onions…\n"
+    .string "Snivel…$"
+
+gUnknown_8173570:: @ 8173570
+    .string "Er-hem!\n"
+    .string "Indeed I am le CHEF!\p"
+    .string "Le main course is$"
+
+gUnknown_817359F:: @ 817359F
+    .string "Salmon du Salad!\p"
+    .string "Les guests may gripe it's fish\n"
+    .string "again, however!$"
+
+gUnknown_81735DF:: @ 81735DF
+    .string "Eels au Barbecue!\p"
+    .string "Les guests will mutiny, I fear.$"
+
+gUnknown_8173611:: @ 8173611
+    .string "Prime Beefsteak!\p"
+    .string "But, have I enough fillets du\n"
+    .string "beef?$"
+