diff options
Diffstat (limited to 'data/maps/Route106')
| -rw-r--r-- | data/maps/Route106/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route106/connections.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route106/events.inc | 19 | ||||
| -rw-r--r-- | data/maps/Route106/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route106/map.bin | bin | 3200 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route106/scripts.inc | 52 |
6 files changed, 78 insertions, 8 deletions
diff --git a/data/maps/Route106/border.bin b/data/maps/Route106/border.bin deleted file mode 100644 index 281762f5b..000000000 --- a/data/maps/Route106/border.bin +++ /dev/null @@ -1 +0,0 @@ -CCCC
\ No newline at end of file diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index a3b16c452..18f181d2b 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,6 +1,6 @@ Route106_MapConnectionsList: @ 84868C4 - connection up, 0, ROUTE_105, 0 - connection down, 60, DEWFORD_TOWN, 0 + connection up, 0, MAP_ROUTE105 + connection down, 60, MAP_DEWFORD_TOWN Route106_MapConnections: @ 84868DC .4byte 0x2 diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc new file mode 100644 index 000000000..11541f2bf --- /dev/null +++ b/data/maps/Route106/events.inc @@ -0,0 +1,19 @@ +Route106_EventObjects: @ 85287E4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, 1004 + +Route106_MapWarps: @ 852885C + warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F + +Route106_MapBGEvents: @ 8528864 + bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, 63 + bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, 46 + bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, 47 + bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A + +Route106_MapEvents:: @ 8528894 + map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents + diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index 5ee6a3071..9292cae39 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,15 +1,15 @@ Route106: @ 8482704 - .4byte Route106_MapAttributes + .4byte Route106_Layout .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections .2byte MUS_NEXTROAD .2byte 22 - .byte 21 + .byte MAPSEC_ROUTE_106 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route106/map.bin b/data/maps/Route106/map.bin Binary files differdeleted file mode 100644 index b7e7d7238..000000000 --- a/data/maps/Route106/map.bin +++ /dev/null diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc new file mode 100644 index 000000000..fdfff0587 --- /dev/null +++ b/data/maps/Route106/scripts.inc @@ -0,0 +1,52 @@ +Route106_MapScripts:: @ 81EE489 + .byte 0 + +Route106_EventScript_1EE48A:: @ 81EE48A + msgbox Route106_Text_1EE53A, 3 + end + +Route106_EventScript_1EE493:: @ 81EE493 + trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_2965BB, Route106_Text_2965FD + msgbox Route106_Text_296608, 6 + end + +Route106_EventScript_1EE4AA:: @ 81EE4AA + trainerbattle 0, TRAINER_KYLA, 0, Route106_Text_296628, Route106_Text_296674 + msgbox Route106_Text_29669E, 6 + end + +Route106_EventScript_1EE4C1:: @ 81EE4C1 + trainerbattle 2, TRAINER_ELLIOT_1, 0, Route106_Text_296327, Route106_Text_29635C, Route106_EventScript_1EE4ED + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route106_EventScript_1EE50C + msgbox Route106_Text_29638C, 4 + release + end + +Route106_EventScript_1EE4ED:: @ 81EE4ED + special sub_80B4808 + waitmovement 0 + msgbox Route106_Text_2963E3, 4 + setvar VAR_0x8004, 339 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 339 + callstd 8 + release + end + +Route106_EventScript_1EE50C:: @ 81EE50C + trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_29642E, Route106_Text_296477 + msgbox Route106_Text_296493, 6 + end + +Route106_EventScript_1EE523:: @ 81EE523 + trainerbattle 0, TRAINER_NED, 0, Route106_Text_2964D4, Route106_Text_296553 + msgbox Route106_Text_296588, 6 + end + +Route106_Text_1EE53A: @ 81EE53A + .string "TRAINER TIPS\p" + .string "Advice on catching POKéMON with a ROD:\n" + .string "Press the A Button if you get a bite.$" + |