diff options
Diffstat (limited to 'data/maps/Route125')
| -rw-r--r-- | data/maps/Route125/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route125/events.inc | 20 | ||||
| -rw-r--r-- | data/maps/Route125/header.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route125/map.bin | bin | 6400 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route125/scripts.inc | 50 |
5 files changed, 72 insertions, 3 deletions
diff --git a/data/maps/Route125/border.bin b/data/maps/Route125/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route125/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc new file mode 100644 index 000000000..8ad4ce22a --- /dev/null +++ b/data/maps/Route125/events.inc @@ -0,0 +1,20 @@ +Route125_EventObjects:: @ 8384E28 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 9, 1, 23, 0, 0, 1, 2, Route125_EventScript_151F2E, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 32, 1, 10, 2, 5, 1, 2, Route125_EventScript_151F45, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 33, 1, 28, 6, 0, 1, 3, Route125_EventScript_151F5C, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 20, 1, 52, 9, 9, 1, 3, Route125_EventScript_151F73, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 28, 3, 14, 0, 0, 1, 2, Route125_EventScript_151F8A, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FC8, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FE3, 0 + +Route125_MapWarps:: @ 8384ED0 + warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM + +Route125_MapBGEvents:: @ 8384ED8 + bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 + bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 + bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 + bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 + +Route125_MapEvents:: @ 8384F08 + map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index e7a43a64d..cb315cc66 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,9 +1,9 @@ Route125:: @ 83058A8 - .4byte Route125_MapAttributes + .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections - .2byte BGM_DOORO_X3 + .2byte MUS_DOORO_X3 .2byte 41 .byte 40 .byte 0 diff --git a/data/maps/Route125/map.bin b/data/maps/Route125/map.bin Binary files differdeleted file mode 100644 index 12dab2a0b..000000000 --- a/data/maps/Route125/map.bin +++ /dev/null diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc new file mode 100644 index 000000000..a1495ac83 --- /dev/null +++ b/data/maps/Route125/scripts.inc @@ -0,0 +1,50 @@ +Route125_MapScripts:: @ 8151F1E + map_script 3, Route125_MapScript1_151F24 + .byte 0 + +Route125_MapScript1_151F24:: @ 8151F24 + call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1 + end + +Route125_EventScript_151F2E:: @ 8151F2E + trainerbattle 0, OPPONENT_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + msgbox Route125_Text_1C1013, 6 + end + +Route125_EventScript_151F45:: @ 8151F45 + trainerbattle 0, OPPONENT_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 + msgbox Route125_Text_1C1083, 6 + end + +Route125_EventScript_151F5C:: @ 8151F5C + trainerbattle 0, OPPONENT_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + msgbox Route125_Text_1C110C, 6 + end + +Route125_EventScript_151F73:: @ 8151F73 + trainerbattle 0, OPPONENT_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 + msgbox Route125_Text_1C117F, 6 + end + +Route125_EventScript_151F8A:: @ 8151F8A + trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + specialvar RESULT, ShouldTryRematchBattle + compare RESULT, 1 + goto_if_eq Route125_EventScript_151FB1 + msgbox Route125_Text_1C1208, 6 + end + +Route125_EventScript_151FB1:: @ 8151FB1 + trainerbattle 5, OPPONENT_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + msgbox Route125_Text_1C12EE, 6 + end + +Route125_EventScript_151FC8:: @ 8151FC8 + trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + msgbox Route125_Text_1C141C, 6 + end + +Route125_EventScript_151FE3:: @ 8151FE3 + trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + msgbox Route125_Text_1C1508, 6 + end |