diff options
Diffstat (limited to 'data/maps/Route130')
| -rw-r--r-- | data/maps/Route130/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route130/connections.inc | 4 | ||||
| -rw-r--r-- | data/maps/Route130/events.inc | 9 | ||||
| -rw-r--r-- | data/maps/Route130/header.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route130/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route130/scripts.inc | 52 |
6 files changed, 68 insertions, 9 deletions
diff --git a/data/maps/Route130/border.bin b/data/maps/Route130/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route130/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index f4972fa38..b977d43bc 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,6 +1,6 @@ Route130_MapConnectionsList: @ 8486C84 - connection left, 0, ROUTE_131, 0 - connection right, 0, ROUTE_129, 0 + connection left, 0, MAP_ROUTE131 + connection right, 0, MAP_ROUTE129 Route130_MapConnections: @ 8486C9C .4byte 0x2 diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc new file mode 100644 index 000000000..227e359b6 --- /dev/null +++ b/data/maps/Route130/events.inc @@ -0,0 +1,9 @@ +Route130_EventObjects: @ 852CA40 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, 17 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 + +Route130_MapEvents:: @ 852CAA0 + map_events Route130_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index f4e1f3292..bff8b4e40 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,15 +1,15 @@ Route130: @ 84829A4 - .4byte Route130_MapAttributes + .4byte Route130_Layout .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections .2byte MUS_GRANROAD .2byte 263 - .byte 45 + .byte MAPSEC_ROUTE_130 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 13 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route130/map.bin b/data/maps/Route130/map.bin deleted file mode 100644 index b06fa74dc..000000000 --- a/data/maps/Route130/map.bin +++ /dev/null @@ -1 +0,0 @@ -pppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{vpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppr΄qkllmq΄vppppuvpppppppppppppppppppppppppppppppppppppppppppppppr{{{{{{{vpppppppu΄qk΄qquqq|uvpp}~pu{vppppppppppppppppppppppppppppppppppppppppu{{΄qklllmq΄vppppuvq{|||}qt}~pppppzq|ppppuvuvppppppppppppppppppppppppppppppppzqqqkΎklmΎmq΄vppp}~pyqqqtyppu{{vppyppPQ}~}~ppppppppppppppppppppppppppppppuvzqqqsq{|}quqq|ppPQppppyyyppppzqq|pPQppuvXYppppPQppppppppppppppppppppppppppuv}~qq{qqqt}qtppXYpppuvppppppuvyypXYpp}~ppppppXYpppppppppppppppppppppPQppp}~pppyq{|||}qtpuv{vppp}~pppppp}~pppPQpppppppppppppr{vpppppppppppppppppppXYu{{vpppPQpyypp}~q|ppppppppppPQppppXYppPQpppppppu{΄q΄{vpppppppppppppppuvu{΄qq|pppXYppppppppuvppppyppppppppppXYppppppppXYpppppuvqqqq΄vpppppppppppppp}~zqqqtppppppppppppp}~ppppppppppppppppppppppppuvppppppp}~pyyyyyuvppppppu{{vpuvpyyyuvppppppuvppppppppppppuvppppppppppppu{{v}~ppppppppppppppppp}~pppu{{΄km΄v}~pppppp}~pppppp}~pppppppppppp}~u{vpppppppuvyyppppppppppppppppppppuvppzqqq{}q|puvpppppppppppppppppppppppppuvppztppppppp}~pppppppppppppppppppppppp}~PQyyqqtp}~ppppppppppppppppppppppppp}~ppppppppppppppppppppppppppppppppppppppXYpppyyppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppPQpppppppuvppppppppppppppppppppppppppppppppppu{vpppppppppppppppppppppppppppppPQpXYppr{{{v}~ppu{{vppppppppppppppppppppppppppppzq|uvpppppppppppppppppppppppppppXYpppr{΄qqq΄vpuv΄qq|ppppppppppppppppppppppppppuvy}~pppppppppppppppppppppppppppppu{{΄qqqqqq΄v}~qqtpPQpppppppppppppppppppppuv}~ppppppppppppppppppppppppppuvpuvpppqqqqqqqqq΄vpyyuvXYPQu{vpuvpppppppPQpppp}~pppppppppppppppppppppppppppp}~p}~ppppyqqqqqqtypppp}~ppXYyp}~pppppppXYu{{{vpppuvppppppppppppppppppppppPQpuvpu{{{vppyyyyyyPQpppppppppppppuvpPQpppuvppzqqq΄{vp}~ppppppuvppppppppppppppXYp}~pqq΄vpppppppppXYupppppppppppp}~pXYu{v}~uvyyqq΄vpuvpppPQ}~pppppppPQppppr{{{vppptyppppppppppp}pppppPQppppppppppzq|pp}~pppyyyp}~PQpXYppu{{vpuvXYppr{΄qkm΄vppppppppppppppppppppppXYppppppppppypppppppppppppppXYuvpppq΄v}~pu{{΄klm{}q|pppppppppppppppppppppppppppppppppppppppppppppppppppppppp}~ppppyypppqq{|}qqtppppppppppppppppppppppppppppppPQpppppppppppppppppppppppppppppppppppPQpyyyypppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppppppppXYpppppppppppppppppppppppppppppp
\ No newline at end of file diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc new file mode 100644 index 000000000..26278cf50 --- /dev/null +++ b/data/maps/Route130/scripts.inc @@ -0,0 +1,52 @@ +Route130_MapScripts:: @ 81F735F + map_script 3, Route130_MapScript1_1F7365 + .byte 0 + +Route130_MapScript1_1F7365: @ 81F7365 + compare VAR_0x405E, 4 + call_if 4, Route130_EventScript_1F73B5 + specialvar VAR_RESULT, IsMirageIslandPresent + compare VAR_RESULT, 1 + goto_eq Route130_EventScript_1F73B1 + setflag FLAG_0x011 + setflag FLAG_0x012 + setflag FLAG_0x013 + setflag FLAG_0x014 + setflag FLAG_0x015 + setflag FLAG_0x016 + setflag FLAG_0x017 + setflag FLAG_0x018 + setflag FLAG_0x019 + setflag FLAG_0x01A + setflag FLAG_0x01B + setflag FLAG_0x01C + setflag FLAG_0x01D + setflag FLAG_0x01E + setflag FLAG_0x01F + setmaplayoutindex 263 + end + +Route130_EventScript_1F73B1:: @ 81F73B1 + setmaplayoutindex 46 + end + +Route130_EventScript_1F73B5:: @ 81F73B5 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route130_EventScript_27207A + return + +Route130_EventScript_1F73BF:: @ 81F73BF + trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_2A328A, Route130_Text_2A32E6 + msgbox Route130_Text_2A3300, 6 + end + +Route130_EventScript_1F73D6:: @ 81F73D6 + trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_2A3363, Route130_Text_2A33AC + msgbox Route130_Text_2A33F5, 6 + end + +Route130_EventScript_1F73ED:: @ 81F73ED + trainerbattle 0, TRAINER_SANTIAGO, 0, Route130_Text_2A343A, Route130_Text_2A346D + msgbox Route130_Text_2A3494, 6 + end + |