diff options
| author | Garak <thomastaps194@comcast.net> | 2018-07-04 11:11:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-04 11:11:45 -0400 |
| commit | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (patch) | |
| tree | e8d37347ae000823943ef57973dc34dd98633b40 /data/maps/Route129 | |
| parent | 9acd55ae4f9e455a92765aaee5929240097f9f8f (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
Merge pull request #1 from pret/master
synching with source repo
Diffstat (limited to 'data/maps/Route129')
| -rw-r--r-- | data/maps/Route129/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route129/events.inc | 10 | ||||
| -rw-r--r-- | data/maps/Route129/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route129/map.bin | bin | 6400 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route129/scripts.inc | 58 |
5 files changed, 69 insertions, 2 deletions
diff --git a/data/maps/Route129/border.bin b/data/maps/Route129/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route129/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc new file mode 100644 index 000000000..7c1425ebe --- /dev/null +++ b/data/maps/Route129/events.inc @@ -0,0 +1,10 @@ +Route129_EventObjects: @ 852C9B4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 50, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, 52, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, 64, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, 24, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, 65, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 + +Route129_MapEvents:: @ 852CA2C + map_events Route129_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 4e5b177df..53abdbebe 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,5 +1,5 @@ Route129: @ 8482988 - .4byte Route129_MapAttributes + .4byte Route129_Layout .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections diff --git a/data/maps/Route129/map.bin b/data/maps/Route129/map.bin Binary files differdeleted file mode 100644 index 8d09787fd..000000000 --- a/data/maps/Route129/map.bin +++ /dev/null diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc new file mode 100644 index 000000000..170d87e56 --- /dev/null +++ b/data/maps/Route129/scripts.inc @@ -0,0 +1,58 @@ +Route129_MapScripts:: @ 81F7284 + map_script 3, Route129_MapScript1_1F72AB + map_script 1, Route129_MapScript1_1F7294 + map_script 2, Route129_MapScript2_1F72E2 + .byte 0 + +Route129_MapScript1_1F7294: @ 81F7294 + compare VAR_0x4037, 15 + call_if 1, Route129_EventScript_273C39 + compare VAR_0x4037, 16 + call_if 1, Route129_EventScript_273CA6 + end + +Route129_MapScript1_1F72AB: @ 81F72AB + compare VAR_0x4039, 1 + call_if 1, Route129_EventScript_273D13 + compare VAR_0x405E, 4 + call_if 4, Route129_EventScript_1F72D8 + compare VAR_0x4037, 15 + call_if 1, Route129_EventScript_273D17 + compare VAR_0x4037, 16 + call_if 1, Route129_EventScript_273D17 + end + +Route129_EventScript_1F72D8:: @ 81F72D8 + checkflag FLAG_SYS_WEATHER_CTRL + call_if 1, Route129_EventScript_27207A + return + +Route129_MapScript2_1F72E2: @ 81F72E2 + map_script_2 VAR_0x4039, 1, gUnknown_08273D1F + .2byte 0 + +Route129_EventScript_1F72EC:: @ 81F72EC + trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_2A2F66, Route129_Text_2A2F9D + msgbox Route129_Text_2A2FB9, 6 + end + +Route129_EventScript_1F7303:: @ 81F7303 + trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_2A2FF2, Route129_Text_2A3034 + msgbox Route129_Text_2A3048, 6 + end + +Route129_EventScript_1F731A:: @ 81F731A + trainerbattle 0, TRAINER_REED, 0, Route129_Text_2A30CD, Route129_Text_2A30F1 + msgbox Route129_Text_2A3114, 6 + end + +Route129_EventScript_1F7331:: @ 81F7331 + trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_2A314E, Route129_Text_2A317D + msgbox Route129_Text_2A31A6, 6 + end + +Route129_EventScript_1F7348:: @ 81F7348 + trainerbattle 0, TRAINER_CLARENCE, 0, Route129_Text_2A3204, Route129_Text_2A3239 + msgbox Route129_Text_2A3252, 6 + end + |