merge with battle tent update

5 files changed, 118 insertions, 2 deletions

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

\ No newline at end of file
diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc
new file mode 100644
index 000000000..b767e512d
--- /dev/null
+++ b/data/maps/Route125/events.inc
@@ -0,0 +1,24 @@
+Route125_EventObjects: @ 852C50C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, 10, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 30, 28, 1, 52, 9, 9, 1, 3, Route125_EventScript_1F67E9, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 17, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F6862, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 18, 19, 3, 8, 1, 1, 1, 1, Route125_EventScript_1F687D, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 43, 19, 3, 28, 2, 1, 1, 3, Route125_EventScript_1F6898, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 48, 19, 3, 27, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, 1, 1, 1, 0, 0, Route125_EventScript_291018, 1154
+
+Route125_MapWarps: @ 852C5FC
+	warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+
+Route125_MapBGEvents: @ 852C604
+	bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0
+	bg_event 55, 11, 0, 8, 0, ITEM_HEAL_POWDER, 0, 0
+	bg_event 7, 25, 0, 8, 0, ITEM_RETRO_MAIL, 0, 0
+	bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0
+
+Route125_MapEvents:: @ 852C634
+	map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
+
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
index 09afc815f..4e67b3cb6 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -1,5 +1,5 @@
 Route125: @ 8482918
-	.4byte Route125_MapAttributes
+	.4byte Route125_Layout
 	.4byte Route125_MapEvents
 	.4byte Route125_MapScripts
 	.4byte Route125_MapConnections
diff --git a/data/maps/Route125/map.bin b/data/maps/Route125/map.bin
deleted file mode 100644
index 078f2713d..000000000
--- a/data/maps/Route125/map.bin
+++ /dev/null
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
new file mode 100644
index 000000000..2dda3fb2d
--- /dev/null
+++ b/data/maps/Route125/scripts.inc
@@ -0,0 +1,93 @@
+Route125_MapScripts:: @ 81F6748
+	map_script 3, Route125_MapScript1_1F6758
+	map_script 1, Route125_MapScript1_1F6783
+	map_script 2, Route125_MapScript2_1F679A
+	.byte 0
+
+Route125_MapScript1_1F6758: @ 81F6758
+	checkflag FLAG_SYS_WEATHER_CTRL
+	call_if 1, Route125_EventScript_27207A
+	compare VAR_0x4039, 1
+	call_if 1, Route125_EventScript_273D13
+	compare VAR_0x4037, 11
+	call_if 1, Route125_EventScript_273D17
+	compare VAR_0x4037, 12
+	call_if 1, Route125_EventScript_273D17
+	end
+
+Route125_MapScript1_1F6783: @ 81F6783
+	compare VAR_0x4037, 11
+	call_if 1, Route125_EventScript_273A85
+	compare VAR_0x4037, 12
+	call_if 1, Route125_EventScript_273AF2
+	end
+
+Route125_MapScript2_1F679A: @ 81F679A
+	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	.2byte 0
+
+Route125_EventScript_1F67A4:: @ 81F67A4
+	trainerbattle 0, TRAINER_NOLEN, 0, Route125_Text_2A1527, Route125_Text_2A155A
+	msgbox Route125_Text_2A1567, 6
+	end
+
+Route125_EventScript_1F67BB:: @ 81F67BB
+	trainerbattle 0, TRAINER_STAN, 0, Route125_Text_2A159F, Route125_Text_2A15C7
+	msgbox Route125_Text_2A15D5, 6
+	end
+
+Route125_EventScript_1F67D2:: @ 81F67D2
+	trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_2A1615, Route125_Text_2A164D
+	msgbox Route125_Text_2A165E, 6
+	end
+
+Route125_EventScript_1F67E9:: @ 81F67E9
+	trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_2A1686, Route125_Text_2A16C5
+	msgbox Route125_Text_2A16CE, 6
+	end
+
+Route125_EventScript_1F6800:: @ 81F6800
+	trainerbattle 2, TRAINER_ERNEST_1, 0, Route125_Text_2A16FC, Route125_Text_2A173A, Route125_EventScript_1F682C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route125_EventScript_1F684B
+	msgbox Route125_Text_2A1755, 4
+	release
+	end
+
+Route125_EventScript_1F682C:: @ 81F682C
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route125_Text_2A17CF, 4
+	setvar VAR_0x8004, 492
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 492
+	callstd 8
+	release
+	end
+
+Route125_EventScript_1F684B:: @ 81F684B
+	trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_2A180E, Route125_Text_2A1851
+	msgbox Route125_Text_2A187A, 6
+	end
+
+Route125_EventScript_1F6862:: @ 81F6862
+	trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A192B, Route125_Text_2A1989, Route125_Text_2A19F8
+	msgbox Route125_Text_2A19A6, 6
+	end
+
+Route125_EventScript_1F687D:: @ 81F687D
+	trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_2A1A35, Route125_Text_2A1A71, Route125_Text_2A1AD9
+	msgbox Route125_Text_2A1A92, 6
+	end
+
+Route125_EventScript_1F6898:: @ 81F6898
+	trainerbattle 0, TRAINER_PRESLEY, 0, Route125_Text_2A1B1A, Route125_Text_2A1B4E
+	msgbox Route125_Text_2A1B70, 6
+	end
+
+Route125_EventScript_1F68AF:: @ 81F68AF
+	trainerbattle 0, TRAINER_AURON, 0, Route125_Text_2A1BCE, Route125_Text_2A1BFD
+	msgbox Route125_Text_2A1C2A, 6
+	end
+