merge with battle tent update

5 files changed, 62 insertions, 3 deletions

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

\ No newline at end of file
diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc
new file mode 100644
index 000000000..ad1429553
--- /dev/null
+++ b/data/maps/Route130/events.inc
@@ -0,0 +1,9 @@
+Route130_EventObjects: @ 852CA40
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, 51, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, 26, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, 25, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0
+
+Route130_MapEvents:: @ 852CAA0
+	map_events Route130_EventObjects, 0x0, 0x0, 0x0
+
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
index f4e1f3292..47b4b613c 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -1,5 +1,5 @@
 Route130: @ 84829A4
-	.4byte Route130_MapAttributes
+	.4byte Route130_Layout
 	.4byte Route130_MapEvents
 	.4byte Route130_MapScripts
 	.4byte Route130_MapConnections
diff --git a/data/maps/Route130/map.bin b/data/maps/Route130/map.bin
deleted file mode 100644
index b06fa74dc..000000000
--- a/data/maps/Route130/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{vpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr΄qkllmq΄vppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppu΄qk΄qquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{΄qklllmq΄vppppuv‚‰q{|||}qt„}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqkΎklmΎmq΄vppp}~p‚y‰qqqty„ppu{{vpp‚y„ppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQpppp‚yyy„ppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~‚‰qq{‰qqqt}qt„ppXYpppuvppppppuv‚yy„pXYpp}~ppppppXYpppppppppppppppppppppPQppp}~ppp‚y‰q{|||}qt„puv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQp‚y‘‘‘‘‘y„pp}~q|ppppppppppPQppppXYppPQpppppppu{΄q΄{vpppppppppppppppuvu{΄qq|pppXYppppppppuvppppy„ppppppppppXYppppppppXYpppppuv‚‰qqqq΄vpppppppppppppp}~zqqqt„ppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~p‚yyyyy„uvppppppu{{vpuvp‚yyy„uvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{΄km΄v}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuv‚yy„ppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppzt„ppppppp}~pppppppppppppppppppppppp}~PQ‚yy‰qqt„p}~ppppppppppppppppppppppppp}~pp‚„ppppppppppppppppppppppppppppppppppppXYppp‚yy„ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{΄qqq΄vpuv΄qq|ppppppppppppppppppppppppppuv‚y„}~pppppppppppppppppppppppppppppu{{΄qqqqqq΄v}~qqt„pPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvppp‚‰qqqqqqqqq΄vpyy„uvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~pppp‚y‰qqqqqqty„pppp}~ppXY‚y„p}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vpp‚yyyyyy„PQpppppppppppppuvpPQpppuvppzqqq΄{vp}~ppppppuvppppppppppppppXYp}~p‚‰qq΄vpppppppppXYupppppppppppp}~pXYu{v}~uv‚yy‰qq΄vpuvpppPQ}~pppppppPQppppr{{{vppp‚‰ty„ppppppppppp}pppppPQppppppppppzq|pp}~ppp‚yyy„p}~PQpXYppu{{vpuvXYppr{΄qkm΄vppp‚„pppppppppppppppppppXYpppppppppp‚y„pppppppppppppppXYuvppp‚‰q΄v}~pu{{΄klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~pppp‚yy„ppp‚‰qq{|}qqt„ppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQp‚yy‘‘‘yy„pppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp
\ No newline at end of file
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
new file mode 100644
index 000000000..26278cf50
--- /dev/null
+++ b/data/maps/Route130/scripts.inc
@@ -0,0 +1,52 @@
+Route130_MapScripts:: @ 81F735F
+	map_script 3, Route130_MapScript1_1F7365
+	.byte 0
+
+Route130_MapScript1_1F7365: @ 81F7365
+	compare VAR_0x405E, 4
+	call_if 4, Route130_EventScript_1F73B5
+	specialvar VAR_RESULT, IsMirageIslandPresent
+	compare VAR_RESULT, 1
+	goto_eq Route130_EventScript_1F73B1
+	setflag FLAG_0x011
+	setflag FLAG_0x012
+	setflag FLAG_0x013
+	setflag FLAG_0x014
+	setflag FLAG_0x015
+	setflag FLAG_0x016
+	setflag FLAG_0x017
+	setflag FLAG_0x018
+	setflag FLAG_0x019
+	setflag FLAG_0x01A
+	setflag FLAG_0x01B
+	setflag FLAG_0x01C
+	setflag FLAG_0x01D
+	setflag FLAG_0x01E
+	setflag FLAG_0x01F
+	setmaplayoutindex 263
+	end
+
+Route130_EventScript_1F73B1:: @ 81F73B1
+	setmaplayoutindex 46
+	end
+
+Route130_EventScript_1F73B5:: @ 81F73B5
+	checkflag FLAG_SYS_WEATHER_CTRL
+	call_if 1, Route130_EventScript_27207A
+	return
+
+Route130_EventScript_1F73BF:: @ 81F73BF
+	trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6
+	msgbox Route130_Text_2A3300, 6
+	end
+
+Route130_EventScript_1F73D6:: @ 81F73D6
+	trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC
+	msgbox Route130_Text_2A33F5, 6
+	end
+
+Route130_EventScript_1F73ED:: @ 81F73ED
+	trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D
+	msgbox Route130_Text_2A3494, 6
+	end
+