merge with battle tent update

5 files changed, 112 insertions, 2 deletions

diff --git a/data/maps/Route127/border.bin b/data/maps/Route127/border.bin
deleted file mode 100644
index c3fe51511..000000000
--- a/data/maps/Route127/border.bin
+++ /dev/null
@@ -1 +0,0 @@
-p
p
p
p

\ No newline at end of file
diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc
new file mode 100644
index 000000000..b7c378a96
--- /dev/null
+++ b/data/maps/Route127/events.inc
@@ -0,0 +1,23 @@
+Route127_EventObjects: @ 852C734
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 42, 21, 3, 9, 1, 1, 1, 0, Route127_EventScript_1F6A63, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1F6A91, 0
+	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 54, 14, 3, 7, 1, 1, 1, 0, Route127_EventScript_1F6A7A, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 15, 23, 3, 9, 1, 1, 1, 2, Route127_EventScript_1F6AA8, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1F6AD6, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 23, 3, 10, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155
+
+Route127_MapBGEvents: @ 852C83C
+	bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0
+	bg_event 59, 72, 0, 8, 0, ITEM_SITRUS_BERRY, 0, 0
+	bg_event 67, 63, 0, 8, 0, ITEM_WEPEAR_BERRY, 0, 0
+	bg_event 61, 21, 0, 8, 0, ITEM_FIGY_BERRY, 0, 0
+	bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0
+
+Route127_MapEvents:: @ 852C878
+	map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents
+
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
index 070f9996f..fa3ee0200 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -1,5 +1,5 @@
 Route127: @ 8482950
-	.4byte Route127_MapAttributes
+	.4byte Route127_Layout
 	.4byte Route127_MapEvents
 	.4byte Route127_MapScripts
 	.4byte Route127_MapConnections
diff --git a/data/maps/Route127/map.bin b/data/maps/Route127/map.bin
deleted file mode 100644
index fa44f9960..000000000
--- a/data/maps/Route127/map.bin
+++ /dev/null
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
new file mode 100644
index 000000000..12e5bf127
--- /dev/null
+++ b/data/maps/Route127/scripts.inc
@@ -0,0 +1,88 @@
+Route127_MapScripts:: @ 81F69D9
+	map_script 3, Route127_MapScript1_1F69E9
+	map_script 1, Route127_MapScript1_1F6A14
+	map_script 2, Route127_MapScript2_1F6A2B
+	.byte 0
+
+Route127_MapScript1_1F69E9: @ 81F69E9
+	checkflag FLAG_SYS_WEATHER_CTRL
+	call_if 1, Route127_EventScript_27207A
+	compare VAR_0x4039, 1
+	call_if 1, Route127_EventScript_273D13
+	compare VAR_0x4037, 13
+	call_if 1, Route127_EventScript_273D17
+	compare VAR_0x4037, 14
+	call_if 1, Route127_EventScript_273D17
+	end
+
+Route127_MapScript1_1F6A14: @ 81F6A14
+	compare VAR_0x4037, 13
+	call_if 1, Route127_EventScript_273B5F
+	compare VAR_0x4037, 14
+	call_if 1, Route127_EventScript_273BCC
+	end
+
+Route127_MapScript2_1F6A2B: @ 81F6A2B
+	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	.2byte 0
+
+Route127_EventScript_1F6A35:: @ 81F6A35
+	trainerbattle 0, TRAINER_CAMDEN, 0, Route127_Text_2A225F, Route127_Text_2A2294
+	msgbox Route127_Text_2A22A1, 6
+	end
+
+Route127_EventScript_1F6A4C:: @ 81F6A4C
+	trainerbattle 0, TRAINER_DONNY, 0, Route127_Text_2A22DD, Route127_Text_2A2315
+	msgbox Route127_Text_2A232C, 6
+	end
+
+Route127_EventScript_1F6A63:: @ 81F6A63
+	trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_2A2381, Route127_Text_2A23E1
+	msgbox Route127_Text_2A240C, 6
+	end
+
+Route127_EventScript_1F6A7A:: @ 81F6A7A
+	trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_2A2450, Route127_Text_2A2483
+	msgbox Route127_Text_2A2494, 6
+	end
+
+Route127_EventScript_1F6A91:: @ 81F6A91
+	trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_2A24C6, Route127_Text_2A250B
+	msgbox Route127_Text_2A2538, 6
+	end
+
+Route127_EventScript_1F6AA8:: @ 81F6AA8
+	trainerbattle 0, TRAINER_AIDAN, 0, Route127_Text_2A257A, Route127_Text_2A25C1
+	msgbox Route127_Text_2A25D2, 6
+	end
+
+Route127_EventScript_1F6ABF:: @ 81F6ABF
+	trainerbattle 0, TRAINER_ATHENA, 0, Route127_Text_2A27D0, Route127_Text_2A27FC
+	msgbox Route127_Text_2A2832, 6
+	end
+
+Route127_EventScript_1F6AD6:: @ 81F6AD6
+	trainerbattle 2, TRAINER_KOJI_1, 0, Route127_Text_2A264D, Route127_Text_2A2685, Route127_EventScript_1F6B02
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route127_EventScript_1F6B21
+	msgbox Route127_Text_2A26AC, 4
+	release
+	end
+
+Route127_EventScript_1F6B02:: @ 81F6B02
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route127_Text_2A26EE, 4
+	setvar VAR_0x8004, 672
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 672
+	callstd 8
+	release
+	end
+
+Route127_EventScript_1F6B21:: @ 81F6B21
+	trainerbattle 5, TRAINER_KOJI_1, 0, Route127_Text_2A2734, Route127_Text_2A276B
+	msgbox Route127_Text_2A278E, 6
+	end
+