merge with battle tent update

5 files changed, 356 insertions, 3 deletions

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




\ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
new file mode 100644
index 000000000..4196be41b
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
@@ -0,0 +1,16 @@
+Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4
+	object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890
+	object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890
+	object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893
+	object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, 9, 1, 1, 0, 0, 0x0, 992
+	object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, 9, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890
+
+Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4
+	warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
+
+Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC
+	map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
+
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
index 048ccbf77..69a351082 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -1,5 +1,5 @@
 Route119_WeatherInstitute_2F: @ 8485D0C
-	.4byte Route119_WeatherInstitute_2F_MapAttributes
+	.4byte Route119_WeatherInstitute_2F_Layout
 	.4byte Route119_WeatherInstitute_2F_MapEvents
 	.4byte Route119_WeatherInstitute_2F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/maps/Route119_WeatherInstitute_2F/map.bin
deleted file mode 100644
index 97953f463..000000000
--- a/data/maps/Route119_WeatherInstitute_2F/map.bin
+++ /dev/null
@@ -1 +0,0 @@
-_��_k___________|6}6~6_g��gk,-,-,-,-,-g�6��6gj2�2�2z2k4545454545j2�2z2�2z2r2`i2i2sj2z2z2dez2z2z2dew2i2i2i2i2W2Ti2i2pr2i2^2STV2i2^2STV2i2i2i2i2r2\i2i2xr2i2i2��i2i2i2��i2i2i2i2i2r2i2i2i2�2w2i2i2i2i2i2i2i2i2i2i2i2i2i2i2r2i2i2i2�r2i2i2`ai2i2i2`ai2i2i2i2i2r2`i2i2kr2i2^2STi2i2^2STV2i2i2i2i2W2Ti2i2kr2i2i2��i2i2i2��i2i2i2i2i2r2\i2i2kr2i2i2i2i2i2i2i2i2i2i2i2i2i2i2
\ No newline at end of file
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
new file mode 100644
index 000000000..b2341bf3d
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -0,0 +1,339 @@
+Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E
+	map_script 3, Route119_WeatherInstitute_2F_MapScript1_26FF24
+	.byte 0
+
+Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF44
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF50
+	checkflag FLAG_SYS_GAME_CLEAR
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_26FF5C
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44
+	setobjectxyperm 5, 1, 6
+	setobjectmovementtype 5, 10
+	return
+
+Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50
+	setobjectxyperm 5, 4, 6
+	setobjectmovementtype 5, 10
+	return
+
+Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C
+	setobjectxyperm 5, 2, 2
+	setobjectmovementtype 5, 7
+	return
+
+Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68
+	trainerbattle 0, TRAINER_GRUNT_37, 0, Route119_WeatherInstitute_2F_Text_270335, Route119_WeatherInstitute_2F_Text_27039F
+	msgbox Route119_WeatherInstitute_2F_Text_2703C0, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FF7F:: @ 826FF7F
+	trainerbattle 0, TRAINER_GRUNT_12, 0, Route119_WeatherInstitute_2F_Text_27019C, Route119_WeatherInstitute_2F_Text_270208
+	msgbox Route119_WeatherInstitute_2F_Text_27022B, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FF96:: @ 826FF96
+	trainerbattle 0, TRAINER_GRUNT_13, 0, Route119_WeatherInstitute_2F_Text_270292, Route119_WeatherInstitute_2F_Text_2702CE
+	msgbox Route119_WeatherInstitute_2F_Text_2702DA, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FFAD:: @ 826FFAD
+	trainerbattle 2, TRAINER_SHELLY_1, 0, Route119_WeatherInstitute_2F_Text_270409, Route119_WeatherInstitute_2F_Text_2704BD, Route119_WeatherInstitute_2F_EventScript_26FFC8
+	msgbox Route119_WeatherInstitute_2F_Text_2704E4, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_26FFC8:: @ 826FFC8
+	msgbox Route119_WeatherInstitute_2F_Text_2704E4, 4
+	closemessage
+	addobject 7
+	applymovement 7, Route119_WeatherInstitute_2F_Movement_270170
+	applymovement 255, Route119_WeatherInstitute_2F_Movement_27017C
+	waitmovement 0
+	msgbox Route119_WeatherInstitute_2F_Text_270568, 4
+	closemessage
+	playse SE_PIN
+	applymovement 3, Route119_WeatherInstitute_2F_Movement_272598
+	waitmovement 0
+	applymovement 3, Route119_WeatherInstitute_2F_Movement_27259A
+	waitmovement 0
+	msgbox Route119_WeatherInstitute_2F_Text_2705DD, 4
+	closemessage
+	setvar VAR_WEATHER_INSTITUTE_STATE, 1
+	clearflag FLAG_0x37D
+	fadedefaultbgm
+	fadescreen 1
+	setflag FLAG_0x37A
+	setflag FLAG_0x3E0
+	removeobject 1
+	removeobject 2
+	removeobject 3
+	removeobject 8
+	removeobject 7
+	applymovement 255, Route119_WeatherInstitute_2F_Movement_270184
+	waitmovement 0
+	fadescreen 0
+	applymovement 5, Route119_WeatherInstitute_2F_Movement_270187
+	waitmovement 0
+	moveobjectoffscreen 5
+	goto Route119_WeatherInstitute_2F_EventScript_27004D
+	end
+
+Route119_WeatherInstitute_2F_EventScript_27004D:: @ 827004D
+	msgbox Route119_WeatherInstitute_2F_Text_270650, 4
+	setvar VAR_TEMP_1, 385
+	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	compare VAR_RESULT, 0
+	goto_eq Route119_WeatherInstitute_2F_EventScript_270085
+	compare VAR_RESULT, 1
+	goto_eq Route119_WeatherInstitute_2F_EventScript_2700AD
+	goto Route119_WeatherInstitute_2F_EventScript_273811
+	end
+
+Route119_WeatherInstitute_2F_EventScript_270085:: @ 8270085
+	call Route119_WeatherInstitute_2F_EventScript_2700DB
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq Route119_WeatherInstitute_2F_EventScript_2700EA
+	call Route119_WeatherInstitute_2F_EventScript_27378B
+	call Route119_WeatherInstitute_2F_EventScript_2723DD
+	goto Route119_WeatherInstitute_2F_EventScript_2700EA
+	end
+
+Route119_WeatherInstitute_2F_EventScript_2700AD:: @ 82700AD
+	call Route119_WeatherInstitute_2F_EventScript_2700DB
+	msgbox gUnknown_08273374, 5
+	compare VAR_RESULT, 0
+	goto_eq Route119_WeatherInstitute_2F_EventScript_2700D0
+	call Route119_WeatherInstitute_2F_EventScript_273797
+	goto Route119_WeatherInstitute_2F_EventScript_2700D0
+	end
+
+Route119_WeatherInstitute_2F_EventScript_2700D0:: @ 82700D0
+	call Route119_WeatherInstitute_2F_EventScript_2737A0
+	goto Route119_WeatherInstitute_2F_EventScript_2700EA
+	end
+
+Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB
+	playfanfare MUS_FANFA4
+	message Route119_WeatherInstitute_2F_Text_2706E8
+	waitmessage
+	waitfanfare
+	bufferspeciesname 0, SPECIES_CASTFORM
+	return
+
+Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA
+	msgbox Route119_WeatherInstitute_2F_Text_2706FE, 4
+	setflag FLAG_0x097
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7
+	checkflag FLAG_SYS_GAME_CLEAR
+	goto_eq Route119_WeatherInstitute_2F_EventScript_27010A
+	msgbox Route119_WeatherInstitute_2F_Text_27077E, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A
+	setvar VAR_0x8004, 0
+	checkflag FLAG_0x1BE
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_270160
+	checkflag FLAG_0x1BF
+	call_if 1, Route119_WeatherInstitute_2F_EventScript_270160
+	compare VAR_0x8004, 2
+	goto_eq Route119_WeatherInstitute_2F_EventScript_270166
+	checkflag FLAG_0x002
+	call_if 0, Route119_WeatherInstitute_2F_EventScript_270159
+	specialvar VAR_RESULT, sub_813B374
+	compare VAR_RESULT, 1
+	goto_eq Route119_WeatherInstitute_2F_EventScript_27014F
+	msgbox Route119_WeatherInstitute_2F_Text_2707F1, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_27014F:: @ 827014F
+	msgbox Route119_WeatherInstitute_2F_Text_270873, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_270159:: @ 8270159
+	special sub_813B2E4
+	setflag FLAG_0x002
+	return
+
+Route119_WeatherInstitute_2F_EventScript_270160:: @ 8270160
+	addvar VAR_0x8004, 1
+	return
+
+Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166
+	msgbox Route119_WeatherInstitute_2F_Text_2708FC, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_Movement_270170: @ 8270170
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	step_end
+
+Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	ride_water_current_up
+	walk_in_place_fastest_down
+	step_end
+
+Route119_WeatherInstitute_2F_Movement_270184: @ 8270184
+	slide_down
+	walk_in_place_fastest_left
+	step_end
+
+Route119_WeatherInstitute_2F_Movement_270187: @ 8270187
+	walk_right
+	walk_right
+	walk_right
+	step_end
+
+Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B
+	lock
+	faceplayer
+	checkflag FLAG_0x097
+	goto_eq Route119_WeatherInstitute_2F_EventScript_2700F7
+	goto Route119_WeatherInstitute_2F_EventScript_27004D
+	end
+
+Route119_WeatherInstitute_2F_Text_27019C: @ 827019C
+	.string "The INSTITUTE created a type of\n"
+	.string "POKéMON that has something to do with\l"
+	.string "the weather. We’re here to take them!$"
+
+Route119_WeatherInstitute_2F_Text_270208: @ 8270208
+	.string "Our plan’s being spoiled by a kid?$"
+
+Route119_WeatherInstitute_2F_Text_27022B: @ 827022B
+	.string "If the POKéMON they made here can\n"
+	.string "control the weather freely, then we of\l"
+	.string "TEAM AQUA definitely need it!$"
+
+Route119_WeatherInstitute_2F_Text_270292: @ 8270292
+	.string "We’re TEAM AQUA!\n"
+	.string "We appear wherever anything rare is\l"
+	.string "found!$"
+
+Route119_WeatherInstitute_2F_Text_2702CE: @ 82702CE
+	.string "You got me!$"
+
+Route119_WeatherInstitute_2F_Text_2702DA: @ 82702DA
+	.string "You don’t have any idea what we of\n"
+	.string "TEAM AQUA are working towards!\l"
+	.string "You stay out of our way!$"
+
+Route119_WeatherInstitute_2F_Text_270335: @ 8270335
+	.string "Don’t tell me you’re looking for that\n"
+	.string "weather POKéMON, too?\p"
+	.string "That’s a no-no!\n"
+	.string "We were here to get it first!$"
+
+Route119_WeatherInstitute_2F_Text_27039F: @ 827039F
+	.string "Oh, will you look at my POKéMON?$"
+
+Route119_WeatherInstitute_2F_Text_2703C0: @ 82703C0
+	.string "Humph, so what?\n"
+	.string "What we want…\p"
+	.string "What we really want isn’t here…\n"
+	.string "Ihihihihi…$"
+
+Route119_WeatherInstitute_2F_Text_270409: @ 8270409
+	.string "Ahahahaha!\p"
+	.string "You’re going to meddle in TEAM AQUA’s\n"
+	.string "affairs?\p"
+	.string "You’re either absolutely fearless,\n"
+	.string "simply ignorant, or both!\p"
+	.string "You’re so cute, you’re disgusting!\n"
+	.string "I’ll put you down, kiddy!$"
+
+Route119_WeatherInstitute_2F_Text_2704BD: @ 82704BD
+	.string "Ahahahaha!\n"
+	.string "You’re disgustingly strong!$"
+
+Route119_WeatherInstitute_2F_Text_2704E4: @ 82704E4
+	.string "It’s bad enough to have TEAM MAGMA\n"
+	.string "blunder about, but now there’s you!\p"
+	.string "What makes you want to sniff around\n"
+	.string "in our business, anyway?$"
+
+Route119_WeatherInstitute_2F_Text_270568: @ 8270568
+	.string "We have a situation here!\p"
+	.string "A TEAM MAGMA mob just passed\n"
+	.string "the WEATHER INSTITUTE.\p"
+	.string "They appear to be headed for\n"
+	.string "MT. PYRE!$"
+
+Route119_WeatherInstitute_2F_Text_2705DD: @ 82705DD
+	.string "What?!\p"
+	.string "We can’t waste any more time here!\n"
+	.string "We have to hurry to MT. PYRE, too!\p"
+	.string "Ahahahaha!\n"
+	.string "TEAM MAGMA, just you wait!$"
+
+Route119_WeatherInstitute_2F_Text_270650: @ 8270650
+	.string "Thanks!\n"
+	.string "Thanks to you, we’re safe!\p"
+	.string "It might be an odd way of thanking you,\n"
+	.string "but take this POKéMON.$"
+
+Route119_WeatherInstitute_2F_Text_2706B2: @ 82706B2
+	.string "Hm? You don’t seem to have any room\n"
+	.string "for this POKéMON.$"
+
+Route119_WeatherInstitute_2F_Text_2706E8: @ 82706E8
+	.string "{PLAYER} received CASTFORM!$"
+
+Route119_WeatherInstitute_2F_Text_2706FE: @ 82706FE
+	.string "That POKéMON changes shape according\n"
+	.string "to the weather conditions.\p"
+	.string "There’re plenty of them in the\n"
+	.string "INSTITUTE--go ahead and take it.$"
+
+Route119_WeatherInstitute_2F_Text_27077E: @ 827077E
+	.string "I’ve been researching rain for many\n"
+	.string "years, but it’s ridiculous to think that\l"
+	.string "humans can freely change the weather.$"
+
+Route119_WeatherInstitute_2F_Text_2707F1: @ 82707F1
+	.string "I track weather patterns over\n"
+	.string "the HOENN region.\p"
+	.string "Presently, a drought has been recorded\n"
+	.string "in {STR_VAR_1}.\p"
+	.string "Could that mean, somewhere near\n"
+	.string "{STR_VAR_1}…$"
+
+Route119_WeatherInstitute_2F_Text_270873: @ 8270873
+	.string "I track weather patterns over\n"
+	.string "the HOENN region.\p"
+	.string "Presently, heavy rainfall has been\n"
+	.string "recorded over {STR_VAR_1}.\p"
+	.string "Could that mean, somewhere near\n"
+	.string "{STR_VAR_1}…$"
+
+Route119_WeatherInstitute_2F_Text_2708FC: @ 82708FC
+	.string "Abnormal weather conditions are\n"
+	.string "no longer being reported.\p"
+	.string "The occasional rainfall is a blessing,\n"
+	.string "really.$"
+