Merge pull request #1 from pret/master

synching with source repo

5 files changed, 327 insertions, 3 deletions

diff --git a/data/maps/Route101/border.bin b/data/maps/Route101/border.bin
deleted file mode 100644
index 03bcafef1..000000000
--- a/data/maps/Route101/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-Ô
Õ
Ü
Ý

\ No newline at end of file
diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc
new file mode 100644
index 000000000..82b674f9e
--- /dev/null
+++ b/data/maps/Route101/events.inc
@@ -0,0 +1,25 @@
+Route101_EventObjects: @ 8527E98
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720
+	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750
+	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_1EBE04, 991
+
+Route101_MapCoordEvents: @ 8527F28
+	coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
+	coord_event 11, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE
+	coord_event 10, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E
+	coord_event 11, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD4E
+	coord_event 6, 16, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+	coord_event 6, 15, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+	coord_event 6, 17, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+	coord_event 6, 18, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD64
+	coord_event 7, 13, 3, 0, VAR_0x4060, 2, 0, Route101_EventScript_1EBD7A
+
+Route101_MapBGEvents: @ 8527FB8
+	bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D
+
+Route101_MapEvents:: @ 8527FC4
+	map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
+
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
index 9550dc26b..ef027d1c6 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -1,5 +1,5 @@
 Route101: @ 8482678
-	.4byte Route101_MapAttributes
+	.4byte Route101_Layout
 	.4byte Route101_MapEvents
 	.4byte Route101_MapScripts
 	.4byte Route101_MapConnections
diff --git a/data/maps/Route101/map.bin b/data/maps/Route101/map.bin
deleted file mode 100644
index fab3a1d69..000000000
--- a/data/maps/Route101/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-ÔÕÔÕÔÕÔ×Ø1Ù1Ú1
0ÖÕÔÕÔÕÔÕÜÝäåäåäçà1á1â1
0æåäåÜÝÜÝÔÕ
0
0
0
0
0
0
0
0
0
0
0
0
0
0ÔÕÔÕäç5
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ÔÕÆ1Ç1
0
0
0
0
0
0
0
0
0Î1Ç1
0
0
0
0
0æåÔ×
0
0
0
0n‡‡‡ÖÖ×Æ1Ç1
0
0
0
0
0ÜÝÕ‡‡‡Ž
0
0
0
0ÜÝÔ×
0
0Ð1Ò1
0ÔÕÎ1Ï1
0
0
0
0
0
0
0ÔÕäç
0Ð1Ù1Ú1
0ÜÝÔ×
0
0Ð1Ñ1Ò1
0æç
0
0
0à1Ù1Ù1Ò1ÔÕÜÝ
0Ð1Ñ1Ù1Ù1Ú1
0
0
0
0
0
0
0à1Ù1Ú1ÜÝÔÕ
0à1Ù1Ù1Ù1â1
0
0
0
0
0
0
0
0à1â1ÔÕäç
0
0à1á1â1
0
0
0
0
0
0
0
0
0
0
0äç
0
0
0
0
0
0Õ‡‡ÖÆ1Ç1
0
0
0
0Î1Ï1
0
0
0
0
0
0
0
0
0
0
0
0Ö×
0
0
0
0ÖÕÆ1Ç1
0
0
0
0
0
0
0
0
0
0ÜÝÆ1Ç1Î1Ï1ÜÝÔ×
0
0
0
0
0
0
0
0
0
0ÔÕÔÕÔÕÔÕÜÝÆ1Ç1Æ1Ï1Î1Ï1Î1Ï1
0
0ÜÝÜÝÜÝÜÝÔÕÔÕÔÕÔÕÔ×
0
0ÔÕÔÕÔÕÔÕÜÝÜÝÜÝÜÝÜÝ
0
0ÜÝÜÝÜÝÜÝ
\ No newline at end of file
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
new file mode 100644
index 000000000..9593ae59e
--- /dev/null
+++ b/data/maps/Route101/scripts.inc
@@ -0,0 +1,301 @@
+Route101_MapScripts:: @ 81EBCBA
+	map_script 3, Route101_MapScript1_1EBCC5
+	map_script 2, Route101_MapScript2_1EBCCB
+	.byte 0
+
+Route101_MapScript1_1EBCC5: @ 81EBCC5
+	call Route101_EventScript_2720AD
+	end
+
+Route101_MapScript2_1EBCCB: @ 81EBCCB
+	map_script_2 VAR_0x4060, 0, Route101_EventScript_1EBCD5
+	.2byte 0
+
+Route101_EventScript_1EBCD5:: @ 81EBCD5
+	setflag FLAG_SPECIAL_FLAG_0x4000
+	setvar VAR_0x4060, 1
+	end
+
+Route101_EventScript_1EBCDE:: @ 81EBCDE
+	lockall
+	playbgm MUS_EVENT0, 1
+	msgbox Route101_Text_1EBE8F, 4
+	closemessage
+	setobjectxy 2, 0, 15
+	setobjectxy 4, 0, 16
+	applymovement 255, Route101_Movement_1EBDC2
+	applymovement 2, Route101_Movement_1EBDE7
+	applymovement 4, Route101_Movement_1EBDB5
+	waitmovement 0
+	applymovement 4, Route101_Movement_1EBD96
+	applymovement 2, Route101_Movement_1EBDC8
+	waitmovement 0
+	applymovement 2, Route101_Movement_2725A8
+	waitmovement 0
+	applymovement 4, Route101_Movement_1EBDBD
+	applymovement 2, Route101_Movement_1EBDEF
+	waitmovement 0
+	msgbox Route101_Text_1EBE9A, 4
+	closemessage
+	setvar VAR_0x4060, 2
+	releaseall
+	end
+
+Route101_EventScript_1EBD4E:: @ 81EBD4E
+	lockall
+	msgbox Route101_Text_1EBEDF, 4
+	closemessage
+	applymovement 255, Route101_Movement_1EBD90
+	waitmovement 0
+	releaseall
+	end
+
+Route101_EventScript_1EBD64:: @ 81EBD64
+	lockall
+	msgbox Route101_Text_1EBEDF, 4
+	closemessage
+	applymovement 255, Route101_Movement_1EBD92
+	waitmovement 0
+	releaseall
+	end
+
+Route101_EventScript_1EBD7A:: @ 81EBD7A
+	lockall
+	msgbox Route101_Text_1EBEDF, 4
+	closemessage
+	applymovement 255, Route101_Movement_1EBD94
+	waitmovement 0
+	releaseall
+	end
+
+Route101_Movement_1EBD90: @ 81EBD90
+	walk_up
+	step_end
+
+Route101_Movement_1EBD92: @ 81EBD92
+	walk_right
+	step_end
+
+Route101_Movement_1EBD94: @ 81EBD94
+	walk_down
+	step_end
+
+Route101_Movement_1EBD96: @ 81EBD96
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	step_end
+
+Route101_Movement_1EBDB5: @ 81EBDB5
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	step_end
+
+Route101_Movement_1EBDBC: @ 81EBDBC
+	step_end
+
+Route101_Movement_1EBDBD: @ 81EBDBD
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	step_end
+
+Route101_Movement_1EBDC2: @ 81EBDC2
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_left
+	step_end
+
+Route101_Movement_1EBDC8: @ 81EBDC8
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	step_end
+
+Route101_Movement_1EBDE7: @ 81EBDE7
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	step_end
+
+Route101_Movement_1EBDEE: @ 81EBDEE
+	step_end
+
+Route101_Movement_1EBDEF: @ 81EBDEF
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	step_end
+
+Route101_Movement_1EBDF4: @ 81EBDF4
+	walk_up
+	walk_up
+	step_end
+
+Route101_Movement_1EBDF7: @ 81EBDF7
+	walk_up
+	walk_left
+	walk_up
+	step_end
+
+Route101_EventScript_1EBDFB:: @ 81EBDFB
+	msgbox Route101_Text_1EBFDD, 2
+	end
+
+Route101_EventScript_1EBE04:: @ 81EBE04
+	msgbox Route101_Text_1EC04A, 2
+	end
+
+Route101_EventScript_1EBE0D:: @ 81EBE0D
+	msgbox Route101_Text_1EC0C8, 3
+	end
+
+Route101_EventScript_1EBE16:: @ 81EBE16
+	lock
+	faceplayer
+	setflag FLAG_SYS_POKEMON_GET
+	setflag FLAG_0x052
+	fadescreen 1
+	removeobject 4
+	setobjectxy 255, 6, 13
+	applymovement 255, Route101_Movement_2725A4
+	waitmovement 0
+	special ChooseStarter
+	waitstate
+	applymovement 2, Route101_Movement_1EBE8D
+	waitmovement 0
+	msgbox Route101_Text_1EBF12, 4
+	special HealPlayerParty
+	setflag FLAG_0x2D0
+	clearflag FLAG_0x2D1
+	setflag FLAG_0x2BC
+	setvar VAR_0x4084, 2
+	setvar VAR_0x4060, 3
+	clearflag FLAG_SPECIAL_FLAG_0x4000
+	checkplayergender
+	compare VAR_RESULT, 0
+	call_if 1, Route101_EventScript_1EBE85
+	compare VAR_RESULT, 1
+	call_if 1, Route101_EventScript_1EBE89
+	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
+	waitstate
+	release
+	end
+
+Route101_EventScript_1EBE85:: @ 81EBE85
+	setflag FLAG_0x2D2
+	return
+
+Route101_EventScript_1EBE89:: @ 81EBE89
+	setflag FLAG_0x2F8
+	return
+
+Route101_Movement_1EBE8D: @ 81EBE8D
+	walk_right
+	step_end
+
+Route101_Text_1EBE8F: @ 81EBE8F
+	.string "H-help me!$"
+
+Route101_Text_1EBE9A: @ 81EBE9A
+	.string "Hello! You over there!\n"
+	.string "Please! Help!\p"
+	.string "In my BAG!\n"
+	.string "There’s a POKé BALL!$"
+
+Route101_Text_1EBEDF: @ 81EBEDF
+	.string "Wh-Where are you going?!\n"
+	.string "Don’t leave me like this!$"
+
+Route101_Text_1EBF12: @ 81EBF12
+	.string "PROF. BIRCH: Whew…\p"
+	.string "I was in the tall grass studying wild\n"
+	.string "POKéMON when I was jumped.\p"
+	.string "You saved me.\n"
+	.string "Thanks a lot!\p"
+	.string "Oh?\p"
+	.string "Hi, you’re {PLAYER}{KUN}!\p"
+	.string "This is not the place to chat, so come\n"
+	.string "by my POKéMON LAB later, okay?$"
+
+Route101_Text_1EBFDD: @ 81EBFDD
+	.string "If POKéMON get tired, take them to\n"
+	.string "a POKéMON CENTER.\p"
+	.string "There’s a POKéMON CENTER in OLDALE\n"
+	.string "TOWN right close by.$"
+
+Route101_Text_1EC04A: @ 81EC04A
+	.string "Wild POKéMON will jump out at you in\n"
+	.string "tall grass.\p"
+	.string "If you want to catch POKéMON, you have\n"
+	.string "to go into the tall grass and search.$"
+
+Route101_Text_1EC0C8: @ 81EC0C8
+	.string "ROUTE 101\n"
+	.string "{0x79} OLDALE TOWN$"
+