merge with battle tent update

5 files changed, 365 insertions, 2 deletions

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

\ No newline at end of file
diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc
new file mode 100644
index 000000000..5e732890d
--- /dev/null
+++ b/data/maps/Route118/events.inc
@@ -0,0 +1,46 @@
+Route118_EventObjects: @ 852AAB4
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797
+	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797
+	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 10, 3, 2, 1, 1, 0, 0, Route118_EventScript_1F3E73, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904
+	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1F4017, 0
+	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, 966
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_290ED3, 1121
+	object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, 8, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0
+
+Route118_MapWarps: @ 852ACAC
+	warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+	warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE
+
+Route118_MapCoordEvents: @ 852ACBC
+	coord_event 43, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3E8E
+	coord_event 44, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EAE
+	coord_event 45, 11, 3, 0, VAR_0x4071, 0, 0, Route118_EventScript_1F3EC4
+
+Route118_MapBGEvents: @ 852ACEC
+	bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0
+	bg_event 13, 6, 0, 0, 0, Route118_EventScript_1F3E7C
+	bg_event 56, 8, 0, 0, 0, Route118_EventScript_1F3E85
+	bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0
+	bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0
+	bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0
+	bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0
+	bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0
+	bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0
+
+Route118_MapEvents:: @ 852AD58
+	map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents
+
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
index 5567df47f..3bf779b27 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -1,5 +1,5 @@
 Route118: @ 8482854
-	.4byte Route118_MapAttributes
+	.4byte Route118_Layout
 	.4byte Route118_MapEvents
 	.4byte Route118_MapScripts
 	.4byte Route118_MapConnections
diff --git a/data/maps/Route118/map.bin b/data/maps/Route118/map.bin
deleted file mode 100644
index dfd8a293d..000000000
--- a/data/maps/Route118/map.bin
+++ /dev/null
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
new file mode 100644
index 000000000..818111b81
--- /dev/null
+++ b/data/maps/Route118/scripts.inc
@@ -0,0 +1,318 @@
+Route118_MapScripts:: @ 81F3DBC
+	map_script 3, Route118_MapScript1_1F3DCC
+	map_script 1, Route118_MapScript1_1F3DF3
+	map_script 2, Route118_MapScript2_1F3E0A
+	.byte 0
+
+Route118_MapScript1_1F3DCC: @ 81F3DCC
+	call Route118_EventScript_28CCC7
+	compare VAR_0x4039, 1
+	call_if 1, Route118_EventScript_273D13
+	compare VAR_0x4037, 7
+	call_if 1, Route118_EventScript_273D1B
+	compare VAR_0x4037, 8
+	call_if 1, Route118_EventScript_273D1B
+	end
+
+Route118_MapScript1_1F3DF3: @ 81F3DF3
+	compare VAR_0x4037, 7
+	call_if 1, Route118_EventScript_273985
+	compare VAR_0x4037, 8
+	call_if 1, Route118_EventScript_273998
+	end
+
+Route118_MapScript2_1F3E0A: @ 81F3E0A
+	map_script_2 VAR_0x4039, 1, gUnknown_08273D1F
+	.2byte 0
+
+Route118_EventScript_1F3E14:: @ 81F3E14
+	lock
+	faceplayer
+	checkflag FLAG_0x0E3
+	goto_eq Route118_EventScript_1F3E69
+	msgbox Route118_Text_1F427B, 5
+	compare VAR_RESULT, 1
+	goto_eq Route118_EventScript_1F3E3E
+	compare VAR_RESULT, 0
+	goto_eq Route118_EventScript_1F3E5F
+	end
+
+Route118_EventScript_1F3E3E:: @ 81F3E3E
+	msgbox Route118_Text_1F42AF, 4
+	giveitem_std ITEM_GOOD_ROD
+	setflag FLAG_0x0E3
+	msgbox Route118_Text_1F42E7, 4
+	release
+	end
+
+Route118_EventScript_1F3E5F:: @ 81F3E5F
+	msgbox Route118_Text_1F4319, 4
+	release
+	end
+
+Route118_EventScript_1F3E69:: @ 81F3E69
+	msgbox Route118_Text_1F4331, 4
+	release
+	end
+
+Route118_EventScript_1F3E73:: @ 81F3E73
+	msgbox Route118_Text_1F4367, 2
+	end
+
+Route118_EventScript_1F3E7C:: @ 81F3E7C
+	msgbox Route118_Text_1F43F4, 3
+	end
+
+Route118_EventScript_1F3E85:: @ 81F3E85
+	msgbox Route118_Text_1F440E, 3
+	end
+
+Route118_EventScript_1F3E8E:: @ 81F3E8E
+	lockall
+	setvar VAR_0x8008, 0
+	applymovement 255, Route118_Movement_2725B2
+	waitmovement 0
+	applymovement 19, Route118_Movement_1F3F61
+	waitmovement 0
+	goto Route118_EventScript_1F3EE4
+	end
+
+Route118_EventScript_1F3EAE:: @ 81F3EAE
+	lockall
+	setvar VAR_0x8008, 1
+	applymovement 255, Route118_Movement_2725B2
+	waitmovement 0
+	goto Route118_EventScript_1F3EE4
+	end
+
+Route118_EventScript_1F3EC4:: @ 81F3EC4
+	lockall
+	setvar VAR_0x8008, 2
+	applymovement 255, Route118_Movement_2725B2
+	waitmovement 0
+	applymovement 19, Route118_Movement_1F3F63
+	waitmovement 0
+	goto Route118_EventScript_1F3EE4
+	end
+
+Route118_EventScript_1F3EE4:: @ 81F3EE4
+	playse SE_DANSA
+	applymovement 19, Route118_Movement_1F3F65
+	waitmovement 0
+	delay 30
+	msgbox Route118_Text_1F40BE, 4
+	closemessage
+	compare VAR_0x8008, 0
+	call_if 1, Route118_EventScript_1F3F28
+	compare VAR_0x8008, 1
+	call_if 1, Route118_EventScript_1F3F3A
+	compare VAR_0x8008, 2
+	call_if 1, Route118_EventScript_1F3F4C
+	setvar VAR_0x4071, 1
+	removeobject 19
+	releaseall
+	end
+
+Route118_EventScript_1F3F28:: @ 81F3F28
+	applymovement 255, Route118_Movement_1F3F5E
+	applymovement 19, Route118_Movement_1F3F69
+	waitmovement 0
+	return
+
+Route118_EventScript_1F3F3A:: @ 81F3F3A
+	applymovement 255, Route118_Movement_1F3F5E
+	applymovement 19, Route118_Movement_1F3F74
+	waitmovement 0
+	return
+
+Route118_EventScript_1F3F4C:: @ 81F3F4C
+	applymovement 255, Route118_Movement_1F3F5E
+	applymovement 19, Route118_Movement_1F3F7E
+	waitmovement 0
+	return
+
+Route118_Movement_1F3F5E: @ 81F3F5E
+	delay_16
+	walk_in_place_fastest_right
+	step_end
+
+Route118_Movement_1F3F61: @ 81F3F61
+	walk_left
+	step_end
+
+Route118_Movement_1F3F63: @ 81F3F63
+	walk_right
+	step_end
+
+Route118_Movement_1F3F65: @ 81F3F65
+	jump_2_down
+	delay_16
+	walk_down
+	step_end
+
+Route118_Movement_1F3F69: @ 81F3F69
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route118_Movement_1F3F74: @ 81F3F74
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route118_Movement_1F3F7E: @ 81F3F7E
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route118_EventScript_1F3F87:: @ 81F3F87
+	trainerbattle 2, TRAINER_ROSE_1, 0, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route118_EventScript_1F3FD2
+	msgbox Route118_Text_29D2FA, 4
+	release
+	end
+
+Route118_EventScript_1F3FB3:: @ 81F3FB3
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route118_Text_29D343, 4
+	setvar VAR_0x8004, 37
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 37
+	callstd 8
+	release
+	end
+
+Route118_EventScript_1F3FD2:: @ 81F3FD2
+	trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_29D382, Route118_Text_29D3AA
+	msgbox Route118_Text_29D3D9, 6
+	end
+
+Route118_EventScript_1F3FE9:: @ 81F3FE9
+	trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_29D515, Route118_Text_29D55C
+	msgbox Route118_Text_29D587, 6
+	end
+
+Route118_EventScript_1F4000:: @ 81F4000
+	trainerbattle 0, TRAINER_WADE, 0, Route118_Text_29D5DF, Route118_Text_29D64C
+	msgbox Route118_Text_29D663, 6
+	end
+
+Route118_EventScript_1F4017:: @ 81F4017
+	trainerbattle 2, TRAINER_DALTON_1, 0, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+	specialvar VAR_RESULT, ShouldTryRematchBattle
+	compare VAR_RESULT, 1
+	goto_eq Route118_EventScript_1F4062
+	msgbox Route118_Text_29D6D8, 4
+	release
+	end
+
+Route118_EventScript_1F4043:: @ 81F4043
+	special sub_80B4808
+	waitmovement 0
+	msgbox Route118_Text_29D74A, 4
+	setvar VAR_0x8004, 196
+	special SetMatchCallRegisteredFlag
+	setorcopyvar VAR_0x8000, 196
+	callstd 8
+	release
+	end
+
+Route118_EventScript_1F4062:: @ 81F4062
+	trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_29D789, Route118_Text_29D7CA
+	msgbox Route118_Text_29D7D5, 6
+	end
+
+Route118_EventScript_1F4079:: @ 81F4079
+	trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_29D41D, Route118_Text_29D45B
+	msgbox Route118_Text_29D46C, 6
+	end
+
+Route118_EventScript_1F4090:: @ 81F4090
+	trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_29D4A6, Route118_Text_29D4C4
+	msgbox Route118_Text_29D4DA, 6
+	end
+
+Route118_EventScript_1F40A7:: @ 81F40A7
+	trainerbattle 0, TRAINER_DEANDRE, 0, Route118_Text_29D81B, Route118_Text_29D83C
+	msgbox Route118_Text_29D872, 6
+	end
+
+Route118_Text_1F40BE: @ 81F40BE
+	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
+	.string "It’s me, STEVEN!\n"
+	.string "We met in the cave near DEWFORD.\p"
+	.string "Have you met many kinds of POKéMON\n"
+	.string "since I last saw you?\p"
+	.string "There are many, many kinds of POKéMON\n"
+	.string "in this wide world of ours.\p"
+	.string "If you wanted to raise only your\n"
+	.string "favorites, that’s fine.\p"
+	.string "Perhaps you find it more fun to raise\n"
+	.string "all sorts of POKéMON.\p"
+	.string "As a TRAINER of POKéMON,\n"
+	.string "what do you think?\p"
+	.string "Of course, it’s not any of my business.\p"
+	.string "It would be nice if we were to meet\n"
+	.string "again somewhere.$"
+
+Route118_Text_1F427B: @ 81F427B
+	.string "Hmm!\n"
+	.string "A GOOD ROD is really good!\p"
+	.string "Wouldn’t you agree?$"
+
+Route118_Text_1F42AF: @ 81F42AF
+	.string "Hmm!\n"
+	.string "We’re of identical minds!\p"
+	.string "Hmm!\n"
+	.string "Take this GOOD ROD!$"
+
+Route118_Text_1F42E7: @ 81F42E7
+	.string "Wherever there’s water, try your luck\n"
+	.string "at fishing.$"
+
+Route118_Text_1F4319: @ 81F4319
+	.string "Don’t you like to fish?$"
+
+Route118_Text_1F4331: @ 81F4331
+	.string "Try catching all sorts of POKéMON\n"
+	.string "with your GOOD ROD.$"
+
+Route118_Text_1F4367: @ 81F4367
+	.string "Even if there isn’t a boat, you can\n"
+	.string "cross rivers and the sea if you have\l"
+	.string "a POKéMON that knows SURF.\p"
+	.string "POKéMON can be counted on to do so\n"
+	.string "much!$"
+
+Route118_Text_1F43F4: @ 81F43F4
+	.string "ROUTE 118\n"
+	.string "{0x7B} MAUVILLE CITY$"
+
+Route118_Text_1F440E: @ 81F440E
+	.string "ROUTE 118\n"
+	.string "{0x79} ROUTE 119$"
+