diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-01 12:16:52 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-01 12:16:52 +0200 |
| commit | f35c0abe80ce9ec91618b2237d68463100fa4afa (patch) | |
| tree | 4edd09c2823f967967011d26b39564e4d0f601d8 /data/maps/Route133 | |
| parent | d2e47323fe988e430af782c2c10b8e41e7a131b3 (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
merge with battle tent update
Diffstat (limited to 'data/maps/Route133')
| -rw-r--r-- | data/maps/Route133/border.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route133/events.inc | 15 | ||||
| -rw-r--r-- | data/maps/Route133/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route133/map.bin | 1 | ||||
| -rw-r--r-- | data/maps/Route133/scripts.inc | 38 |
5 files changed, 54 insertions, 3 deletions
diff --git a/data/maps/Route133/border.bin b/data/maps/Route133/border.bin deleted file mode 100644 index c3fe51511..000000000 --- a/data/maps/Route133/border.bin +++ /dev/null @@ -1 +0,0 @@ -pppp
\ No newline at end of file diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc new file mode 100644 index 000000000..6adfce330 --- /dev/null +++ b/data/maps/Route133/events.inc @@ -0,0 +1,15 @@ +Route133_EventObjects: @ 852CC94 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, 25, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, 26, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 7, 14, 3, 18, 1, 1, 1, 2, Route133_EventScript_1F75FF, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 56, 11, 3, 8, 1, 1, 1, 3, Route133_EventScript_1F7616, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 56, 15, 3, 16, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, 1, 1, 1, 0, 0, Route133_EventScript_29108D, 1157 + +Route133_MapEvents:: @ 852CD84 + map_events Route133_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 30a69f94d..e8bc66e6f 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,5 +1,5 @@ Route133: @ 84829F8 - .4byte Route133_MapAttributes + .4byte Route133_Layout .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections diff --git a/data/maps/Route133/map.bin b/data/maps/Route133/map.bin deleted file mode 100644 index 1d4e74f73..000000000 --- a/data/maps/Route133/map.bin +++ /dev/null @@ -1 +0,0 @@ -ppppuvuvPQppppPQppppppuvppppPQPQppppuvPQPQPQpppPQppPQppuvPQuvppppPQPQuvPQuvpppPQPQpp}~}~XYppuvXYPQuvPQ}~PQuvXYXYppPQ}~XYXYXYpuvXYPQXYPQ}~XY}~PQuvXYXY}~XY}~PQpXYXYuvppppppuv}~ppXY}~XYccXY}~ppppPQXYpppppppPQ}~ppXYppXYccppppXY}~cccccpppppXYPQppp}~pppppp}~ppppppppcccccpppppppXYcppppppppXYpppppppcccccccpppcccccccccccppppXYpccppppppppppppppccccccccccccccccccccPQcccccpppppcccccccccccccccccccccccccccccccccppppuvppuvpppuvccccVF2F2F2WcccccXYcccpppppcccccccccccccccccVF2F2F2F2F2F2F2F2F2F2F2F2Wccccccpuv}~pp}~ppp}~VF2F2F2>2111_ccccPQccccccccccccccccccccccccccccc^111111111111_ccccccc}~ญฎ1ฎ1ฎ1ฎ1ฎ1ฎ1ฎ1ฎ1ฎ1ฎ11^WWWW_OgccccXYccccccccccccccccccccfGGN111111111_ccccVF2F2F2F21111^WWWWWWWด฿฿tyo_cccccccccccccccccccccccccccccfGGN111111_cccc^^W_11111f฿฿฿฿฿฿฿tyyo11_cccccccccccccccccccVF2F2F2WccccccccccfGN1111_cccV>2f฿พ_11^Wพ฿tyyyyyo111OGgcccccccccccccccccccc^111?2F2F2WccccccccfGGGGgccc^^พ฿฿ฟWWพtyyo1111111OGgccccccccccccccccccfN11111?2F2F2WcccccccccccccV>2f฿฿฿฿฿฿฿1111111OGGgcccccu{{{{{{{{{{{{tccfN1111111?2F2F2Wccccccccccc^1f฿฿tyyyyo1OGGGGGgcccu{{ด฿฿฿฿฿฿฿฿฿฿฿฿ด{{tccfN111111111?2F2F2Wccccccccc^1nyyo111111_ccccccccuด฿฿฿tyyyyyyyyyy฿฿฿ด{tccfN11111111111?2F2F2Wccccccccccc^1111111OGGGgcccccu{{ด฿tyy$1$1$1$1$1$1$1$1$1$1yyy฿|ccfN1111111111111_cccccccccccfGN1111Ogccccccccccccu{ดtyyy$11ฆ1ฆ1ฆ1ฆ11$1$11ฆ1ฆ1ฆ11$1$1$1฿ดtccccfGGGGGGGGGGGGGgccccccccccfGGGGgcccccccccccccztyoฆ1ฆ1ฆ1ฆ1ฆ1ง1คพพฃฅ1ฆ1ฆ1ง1คพฃฅ1ฆ1ฆ1ฆ1nyดtcccccccccccccccccccPQcccccccccccccccccccccccccc}~ฝพพพพพพพฟppฝพพพพฟpฝพพพพพฟ}y~cccccccccccccccccccXYcccccccccccccccccccccccccccppppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppppppcccccccccccccccccccccccccccccccccccccccccccccccccccccccccpppppppppppppppppppppccccccccccccccccccccccccccccccccccccccccccccccccccccccccccPQppPQppppPQppppppppu{{{{{{{{{{tcccPQccPQcccccPQcccccPQPQccccccccccccccccccccPQcXYPQXYPQPQXYppppu{{{ด฿฿฿฿฿฿฿฿฿฿ดtPQXYccXYcPQPQXYPQcPQXYXYcccccccccccccccccuvcXYcccXYppXYXYpppppuด฿tyyyyy฿tyyyyy~XYcccccccXYXYppXYcXYO1O1O1O1cccccccccccccccuv}~lllcccpppppppppppu{ด฿to1111n1111?2WcccccpppppppppppPQO1O1O1O1O1F2Wcccccccccccuv}~llllcccccccpppppu{{ดtyyo111111no111111?2WccpppppppppppPQXYO1O1O1O1O11_cccccccccuv}~llllcccccccccccppuด฿฿to11111^_111111^_111_cppppppppppppXYO1O1O1O1O1O1O11_ccccccccc}~llllccccccccccccccc}yyyo11111no1111111fg^_1_ccpppppppppppPQO1O1O1O1O1O1O11_cccccccccclllccccccccccccccccccccc^1111^_111111111nofg1_cccppppppppppXYO1O1O1O1O1O1O11_ccccccccccccccccccccccccccccccccccfGN11fg1111111111no1_cccccppppppccPQO1O1O1O1O1O11_cccccccccccccccccccccccccccccccccccc^11no1111OGGGN1111OgcccccccppPQccXYPQO1O1O1O11_cccccccccc\\\cccccccccccccccccccccccfN11111OGgcccfGGGGgccccccccccXYccXYPQPQOgccccccccccPQ\\\\cccccccccccccccccccccfN111OgccccccccccccccccccccccccccXYXYgcccccccccccXYPQ\\\\\cccccccccccccccccccfGGGgccccccccccccccccccccccccpPQccccccccccccccccccXYuvPQ\\\ccccccccccpppppppccccccccccccccccccccccccuvccppXYppccuvccccccccccuvpp}~XYccccccPQccccPQpppppPQuvccccccccccpppuvppPQuv}~ppppppppppPQPQ}~ccccccuvPQ}~ppppuvccccccXYuvPQXYpppppXY}~PQccccppPQuvp}~PQXY}~PQppuvppppPQXYXYppPQPQuv}~XYpppppp}~uvuvPQuv}~XYpPQuvPQuvppXYPQuvuvXY}~PQpXYppppXYuv}~PQuvXYppppppXYXY}~pppppppppppp}~}~XY}~pppppXY}~XY}~ppppXY}~}~ppppXYppppppppp}~ppXY}~pppppp
\ No newline at end of file diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc new file mode 100644 index 000000000..dc15a5d40 --- /dev/null +++ b/data/maps/Route133/scripts.inc @@ -0,0 +1,38 @@ +Route133_MapScripts:: @ 81F75A2 + .byte 0 + +Route133_EventScript_1F75A3:: @ 81F75A3 + trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_2A40F0, Route133_Text_2A413F + msgbox Route133_Text_2A4154, 6 + end + +Route133_EventScript_1F75BA:: @ 81F75BA + trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_2A41A8, Route133_Text_2A4200 + msgbox Route133_Text_2A420E, 6 + end + +Route133_EventScript_1F75D1:: @ 81F75D1 + trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_2A4236, Route133_Text_2A4258 + msgbox Route133_Text_2A4264, 6 + end + +Route133_EventScript_1F75E8:: @ 81F75E8 + trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_2A4290, Route133_Text_2A42E0 + msgbox Route133_Text_2A4304, 6 + end + +Route133_EventScript_1F75FF:: @ 81F75FF + trainerbattle 0, TRAINER_BECK, 0, Route133_Text_2A436A, Route133_Text_2A439C + msgbox Route133_Text_2A43B9, 6 + end + +Route133_EventScript_1F7616:: @ 81F7616 + trainerbattle 0, TRAINER_MOLLIE, 0, Route133_Text_2A4401, Route133_Text_2A443A + msgbox Route133_Text_2A4477, 6 + end + +Route133_EventScript_1F762D:: @ 81F762D + trainerbattle 0, TRAINER_CONOR, 0, Route133_Text_2A44BA, Route133_Text_2A4505 + msgbox Route133_Text_2A4527, 6 + end + |