Merge pull request #1 from pret/master

synching with source repo

5 files changed, 179 insertions, 2 deletions

diff --git a/data/maps/Route112/border.bin b/data/maps/Route112/border.bin
deleted file mode 100644
index 9ae2c2126..000000000
--- a/data/maps/Route112/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-qqqq
\ No newline at end of file
diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc
new file mode 100644
index 000000000..0e218cd78
--- /dev/null
+++ b/data/maps/Route112/events.inc
@@ -0,0 +1,32 @@
+Route112_EventObjects: @ 8529974
+	object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, 7, 1, 1, 0, 0, Route112_EventScript_1F1DB7, 819
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0
+	object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0
+	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_1F1E61, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011
+	object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 31, 7, 3, 18, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 15, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0
+
+Route112_MapWarps: @ 8529AC4
+	warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION
+	warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION
+	warp_def 6, 46, 3, 0, MAP_JAGGED_PASS
+	warp_def 7, 46, 3, 1, MAP_JAGGED_PASS
+	warp_def 11, 36, 0, 0, MAP_FIERY_PATH
+	warp_def 22, 10, 0, 1, MAP_FIERY_PATH
+
+Route112_MapBGEvents: @ 8529AF4
+	bg_event 19, 44, 3, 0, 0, Route112_EventScript_1F1E4F
+	bg_event 22, 37, 0, 0, 0, Route112_EventScript_1F1E46
+	bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58
+
+Route112_MapEvents:: @ 8529B18
+	map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
+
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc
index e0411ce05..397c0060a 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -1,5 +1,5 @@
 Route112: @ 84827AC
-	.4byte Route112_MapAttributes
+	.4byte Route112_Layout
 	.4byte Route112_MapEvents
 	.4byte Route112_MapScripts
 	.4byte Route112_MapConnections
diff --git a/data/maps/Route112/map.bin b/data/maps/Route112/map.bin
deleted file mode 100644
index ef3fd5f10..000000000
--- a/data/maps/Route112/map.bin
+++ /dev/null
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
new file mode 100644
index 000000000..0ad5ee47c
--- /dev/null
+++ b/data/maps/Route112/scripts.inc
@@ -0,0 +1,146 @@
+Route112_MapScripts:: @ 81F1DA8
+	map_script 3, Route112_MapScript1_1F1DAE
+	.byte 0
+
+Route112_MapScript1_1F1DAE: @ 81F1DAE
+	clearflag FLAG_0x09D
+	setvar VAR_0x40BD, 0
+	end
+
+Route112_EventScript_1F1DB7:: @ 81F1DB7
+	lockall
+	delay 40
+	applymovement 1, Route112_Movement_2725A8
+	waitmovement 0
+	delay 20
+	msgbox Route112_Text_1F1F3F, 4
+	closemessage
+	applymovement 1, Route112_Movement_2725A2
+	waitmovement 0
+	delay 40
+	applymovement 6, Route112_Movement_2725A4
+	waitmovement 0
+	delay 20
+	msgbox Route112_Text_1F1F7A, 4
+	closemessage
+	applymovement 6, Route112_Movement_2725A2
+	waitmovement 0
+	delay 40
+	applymovement 1, Route112_Movement_2725A8
+	waitmovement 0
+	delay 20
+	msgbox Route112_Text_1F1FBA, 4
+	closemessage
+	applymovement 1, Route112_Movement_2725A2
+	waitmovement 0
+	delay 40
+	applymovement 6, Route112_Movement_2725A4
+	waitmovement 0
+	delay 20
+	msgbox Route112_Text_1F2003, 4
+	closemessage
+	applymovement 6, Route112_Movement_2725A2
+	waitmovement 0
+	releaseall
+	end
+
+Route112_EventScript_1F1E46:: @ 81F1E46
+	msgbox Route112_Text_1F20C1, 3
+	end
+
+Route112_EventScript_1F1E4F:: @ 81F1E4F
+	msgbox Route112_Text_1F20ED, 3
+	end
+
+Route112_EventScript_1F1E58:: @ 81F1E58
+	msgbox Route112_Text_1F2138, 3
+	end
+
+Route112_EventScript_1F1E61:: @ 81F1E61
+	msgbox Route112_Text_1F204E, 2
+	end
+
+Route112_EventScript_1F1E6A:: @ 81F1E6A
+	trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_29978E, Route112_Text_2997CA
+	msgbox Route112_Text_2997DC, 6
+	end
+
+Route112_EventScript_1F1E81:: @ 81F1E81
+	trainerbattle 2, TRAINER_TRENT_1, 0, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route112_EventScript_1F1ECC
+	msgbox Route112_Text_299896, 4
+	release
+	end
+
+Route112_EventScript_1F1EAD:: @ 81F1EAD
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route112_Text_29993C, 4
+	setvar VAR_0x8004, 627
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 627
+	callstd 8
+	release
+	end
+
+Route112_EventScript_1F1ECC:: @ 81F1ECC
+	trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_2999BD, Route112_Text_2999F7
+	msgbox Route112_Text_299A0F, 6
+	end
+
+Route112_EventScript_1F1EE3:: @ 81F1EE3
+	trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_299A89, Route112_Text_299AAC
+	msgbox Route112_Text_299AB4, 6
+	end
+
+Route112_EventScript_1F1EFA:: @ 81F1EFA
+	trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_299AE4, Route112_Text_299B36
+	msgbox Route112_Text_299B4C, 6
+	end
+
+Route112_EventScript_1F1F11:: @ 81F1F11
+	trainerbattle 0, TRAINER_BRYANT, 0, Route112_Text_299BAE, Route112_Text_299BDF
+	msgbox Route112_Text_299BFB, 6
+	end
+
+Route112_EventScript_1F1F28:: @ 81F1F28
+	trainerbattle 0, TRAINER_SHAYLA, 0, Route112_Text_299C34, Route112_Text_299C8F
+	msgbox Route112_Text_299CC6, 6
+	end
+
+Route112_Text_1F1F3F: @ 81F1F3F
+	.string "Hey, man, is our leader really going\n"
+	.string "to awaken that thing?$"
+
+Route112_Text_1F1F7A: @ 81F1F7A
+	.string "Sounds like it, yeah. But I heard\n"
+	.string "we need a METEORITE to do it.$"
+
+Route112_Text_1F1FBA: @ 81F1FBA
+	.string "Oh, I get it now. That’s why the rest\n"
+	.string "of the crew went out to FALLARBOR.$"
+
+Route112_Text_1F2003: @ 81F2003
+	.string "You got it. And until they come back,\n"
+	.string "we’re not to let anyone pass, right.$"
+
+Route112_Text_1F204E: @ 81F204E
+	.string "Eh, I’d like to get to MAUVILLE, but if\n"
+	.string "I went down these ledges, it’d be no\l"
+	.string "easy matter to get back to LAVARIDGE.$"
+
+Route112_Text_1F20C1: @ 81F20C1
+	.string "MT. CHIMNEY CABLE CAR\n"
+	.string "“A short walk {0x79} way!”$"
+
+Route112_Text_1F20ED: @ 81F20ED
+	.string "MT. CHIMNEY\p"
+	.string "“For LAVARIDGE TOWN or the summit,\n"
+	.string "please take the CABLE CAR.”$"
+
+Route112_Text_1F2138: @ 81F2138
+	.string "ROUTE 112\n"
+	.string "{0x7B} LAVARIDGE TOWN$"
+