Merge pull request #636 from huderlem/assets

Map organization

6 files changed, 94 insertions, 3 deletions

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

\ No newline at end of file
diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc
new file mode 100644
index 000000000..694718fb6
--- /dev/null
+++ b/data/maps/Route124/events.inc
@@ -0,0 +1,20 @@
+Route124_EventObjects:: @ 8384D10
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 59, 1, 1, 5, 0, 1, 3, Route124_EventScript_151DF8, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 25, 1, 52, 5, 3, 1, 3, Route124_EventScript_151E0F, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 27, 1, 24, 0, 0, 1, 3, Route124_EventScript_151E26, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 6, 8, 1, 3, Route124_EventScript_151E64, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 74, 1, 28, 7, 0, 1, 2, Route124_EventScript_151E7B, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151E92, 0
+	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151ED8, 0
+
+Route124_MapWarps:: @ 8384E00
+	warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE
+
+Route124_MapBGEvents:: @ 8384E08
+	bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF
+
+Route124_MapEvents:: @ 8384E14
+	map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
index 6e4466225..c2c5cd41d 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -1,9 +1,9 @@
 Route124:: @ 830588C
-	.4byte Route124_MapAttributes
+	.4byte Route124_Layout
 	.4byte Route124_MapEvents
 	.4byte Route124_MapScripts
 	.4byte Route124_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 40
 	.byte 39
 	.byte 0
diff --git a/data/maps/Route124/map.bin b/data/maps/Route124/map.bin
deleted file mode 100644
index 212135178..000000000
--- a/data/maps/Route124/map.bin
+++ /dev/null
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
new file mode 100644
index 000000000..3f02fc6e3
--- /dev/null
+++ b/data/maps/Route124/scripts.inc
@@ -0,0 +1,70 @@
+Route124_MapScripts:: @ 8151DDF
+	map_script 3, Route124_MapScript1_151DE5
+	.byte 0
+
+Route124_MapScript1_151DE5:: @ 8151DE5
+	call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_1A02C1
+	end
+
+Route124_EventScript_151DEF:: @ 8151DEF
+	msgbox Route124_Text_171ED1, 3
+	end
+
+Route124_EventScript_151DF8:: @ 8151DF8
+	trainerbattle 0, OPPONENT_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675
+	msgbox Route124_Text_1C0693, 6
+	end
+
+Route124_EventScript_151E0F:: @ 8151E0F
+	trainerbattle 0, OPPONENT_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741
+	msgbox Route124_Text_1C0750, 6
+	end
+
+Route124_EventScript_151E26:: @ 8151E26
+	trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route124_EventScript_151E4D
+	msgbox Route124_Text_1C080E, 6
+	end
+
+Route124_EventScript_151E4D:: @ 8151E4D
+	trainerbattle 5, OPPONENT_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8
+	msgbox Route124_Text_1C08EA, 6
+	end
+
+Route124_EventScript_151E64:: @ 8151E64
+	trainerbattle 0, OPPONENT_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B
+	msgbox Route124_Text_1C0994, 6
+	end
+
+Route124_EventScript_151E7B:: @ 8151E7B
+	trainerbattle 0, OPPONENT_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F
+	msgbox Route124_Text_1C0A52, 6
+	end
+
+Route124_EventScript_151E92:: @ 8151E92
+	trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route124_EventScript_151EBD
+	msgbox Route124_Text_1C0B72, 6
+	end
+
+Route124_EventScript_151EBD:: @ 8151EBD
+	trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C
+	msgbox Route124_Text_1C0E06, 6
+	end
+
+Route124_EventScript_151ED8:: @ 8151ED8
+	trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route124_EventScript_151F03
+	msgbox Route124_Text_1C0C7F, 6
+	end
+
+Route124_EventScript_151F03:: @ 8151F03
+	trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90
+	msgbox Route124_Text_1C0F19, 6
+	end
diff --git a/data/maps/Route124/text.inc b/data/maps/Route124/text.inc
new file mode 100644
index 000000000..6f33d40b7
--- /dev/null
+++ b/data/maps/Route124/text.inc
@@ -0,0 +1,2 @@
+Route124_Text_171ED1:: @ 8171ED1
+	.string "HUNTER’S HOUSE$"