From 89d35e82a27c7328bf5987b4993b3456bb78f440 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:17 -0500 Subject: Move 'map attributes' into 'layouts' --- data/maps/Route132/border.bin | 1 - data/maps/Route132/header.inc | 2 +- data/maps/Route132/map.bin | Bin 6400 -> 0 bytes 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 data/maps/Route132/border.bin delete mode 100644 data/maps/Route132/map.bin (limited to 'data/maps/Route132') diff --git a/data/maps/Route132/border.bin b/data/maps/Route132/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route132/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp \ No newline at end of file diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index df2aadbfa..b4fe2bc0d 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,5 +1,5 @@ Route132: @ 84829DC - .4byte Route132_MapAttributes + .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections diff --git a/data/maps/Route132/map.bin b/data/maps/Route132/map.bin deleted file mode 100644 index 3250c0429..000000000 Binary files a/data/maps/Route132/map.bin and /dev/null differ -- cgit v1.2.3 From 135a11e50eba1e12108e5c2025f534e3bd0cc722 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Jun 2018 17:41:41 -0500 Subject: Move events and scripts into map dirs --- data/maps/Route132/events.inc | 15 +++++++++++++++ data/maps/Route132/scripts.inc | 43 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 data/maps/Route132/events.inc create mode 100644 data/maps/Route132/scripts.inc (limited to 'data/maps/Route132') diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc new file mode 100644 index 000000000..19ff5ccc8 --- /dev/null +++ b/data/maps/Route132/events.inc @@ -0,0 +1,15 @@ +Route132_EventObjects: @ 852CB90 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, 46, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, 45, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 33, 26, 3, 8, 1, 1, 1, 4, Route132_EventScript_1F7546, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 33, 31, 3, 25, 1, 4, 1, 4, Route132_EventScript_1F755D, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 21, 30, 3, 7, 1, 1, 1, 4, Route132_EventScript_1F758B, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 21, 25, 3, 26, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, 1, 1, 1, 0, 0, Route132_EventScript_291066, 1156 + +Route132_MapEvents:: @ 852CC80 + map_events Route132_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc new file mode 100644 index 000000000..a4ae6f716 --- /dev/null +++ b/data/maps/Route132/scripts.inc @@ -0,0 +1,43 @@ +Route132_MapScripts:: @ 81F74E9 + .byte 0 + +Route132_EventScript_1F74EA:: @ 81F74EA + trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_2A3B4C, Route132_Text_2A3BAC + msgbox Route132_Text_2A3BC0, 6 + end + +Route132_EventScript_1F7501:: @ 81F7501 + trainerbattle 0, TRAINER_DANA, 0, Route132_Text_2A3C04, Route132_Text_2A3C39 + msgbox Route132_Text_2A3C49, 6 + end + +Route132_EventScript_1F7518:: @ 81F7518 + trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_2A3C7F, Route132_Text_2A3CAD + msgbox Route132_Text_2A3CC5, 6 + end + +Route132_EventScript_1F752F:: @ 81F752F + trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_2A3D26, Route132_Text_2A3D6C + msgbox Route132_Text_2A3D8B, 6 + end + +Route132_EventScript_1F7546:: @ 81F7546 + trainerbattle 0, TRAINER_PAXTON, 0, Route132_Text_2A3F4F, Route132_Text_2A3FA8 + msgbox Route132_Text_2A3FE5, 6 + end + +Route132_EventScript_1F755D:: @ 81F755D + trainerbattle 0, TRAINER_DARCY, 0, Route132_Text_2A4026, Route132_Text_2A406E + msgbox Route132_Text_2A40A4, 6 + end + +Route132_EventScript_1F7574:: @ 81F7574 + trainerbattle 0, TRAINER_JONATHAN, 0, Route132_Text_2A3EAC, Route132_Text_2A3EDD + msgbox Route132_Text_2A3F03, 6 + end + +Route132_EventScript_1F758B:: @ 81F758B + trainerbattle 0, TRAINER_MAKAYLA, 0, Route132_Text_2A3DF0, Route132_Text_2A3E2C + msgbox Route132_Text_2A3E4E, 6 + end + -- cgit v1.2.3