diff options
Diffstat (limited to 'data/maps/Route127')
| -rw-r--r-- | data/maps/Route127/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route127/events.inc | 20 | ||||
| -rw-r--r-- | data/maps/Route127/header.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route127/map.bin | bin | 12800 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route127/scripts.inc | 42 |
5 files changed, 64 insertions, 3 deletions
diff --git a/data/maps/Route127/border.bin b/data/maps/Route127/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route127/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc new file mode 100644 index 000000000..66078b122 --- /dev/null +++ b/data/maps/Route127/events.inc @@ -0,0 +1,20 @@ +Route127_EventObjects:: @ 8384FA8 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 68, 1, 14, 0, 0, 1, 2, Route127_EventScript_15207A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 44, 1, 21, 0, 0, 1, 4, Route127_EventScript_152091, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 7, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 13, 3, 7, 1, 1, 1, 0, Route127_EventScript_1520A8, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 25, 3, 8, 1, 1, 1, 0, Route127_EventScript_1520D6, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1520BF, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 18, 3, 24, 1, 1, 1, 2, Route127_EventScript_152104, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1520ED, 0 + +Route127_MapBGEvents:: @ 8385080 + bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 + bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 + bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 + bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 + bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 + +Route127_MapEvents:: @ 83850BC + map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index a9f887a2b..abd4154cc 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,9 +1,9 @@ Route127:: @ 83058E0 - .4byte Route127_MapAttributes + .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 43 .byte 42 .byte 0 diff --git a/data/maps/Route127/map.bin b/data/maps/Route127/map.bin Binary files differdeleted file mode 100644 index 3d4690c18..000000000 --- a/data/maps/Route127/map.bin +++ /dev/null diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc new file mode 100644 index 000000000..7552f7c5d --- /dev/null +++ b/data/maps/Route127/scripts.inc @@ -0,0 +1,42 @@ +Route127_MapScripts:: @ 815206A + map_script 3, Route127_MapScript1_152070 + .byte 0 + +Route127_MapScript1_152070:: @ 8152070 + call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_1A02C1 + end + +Route127_EventScript_15207A:: @ 815207A + trainerbattle 0, OPPONENT_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD + msgbox Route127_Text_1C17EC, 6 + end + +Route127_EventScript_152091:: @ 8152091 + trainerbattle 0, OPPONENT_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 + msgbox Route127_Text_1C1877, 6 + end + +Route127_EventScript_1520A8:: @ 81520A8 + trainerbattle 0, OPPONENT_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 + msgbox Route127_Text_1C195D, 6 + end + +Route127_EventScript_1520BF:: @ 81520BF + trainerbattle 0, OPPONENT_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 + msgbox Route127_Text_1C19E7, 6 + end + +Route127_EventScript_1520D6:: @ 81520D6 + trainerbattle 0, OPPONENT_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 + msgbox Route127_Text_1C1AA0, 6 + end + +Route127_EventScript_1520ED:: @ 81520ED + trainerbattle 0, OPPONENT_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A + msgbox Route127_Text_1C1B39, 6 + end + +Route127_EventScript_152104:: @ 8152104 + trainerbattle 0, OPPONENT_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 + msgbox Route127_Text_1C1BEC, 6 + end |