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/Route117 | |
| parent | d2e47323fe988e430af782c2c10b8e41e7a131b3 (diff) | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
merge with battle tent update
Diffstat (limited to 'data/maps/Route117')
| -rw-r--r-- | data/maps/Route117/border.bin | bin | 8 -> 0 bytes | |||
| -rw-r--r-- | data/maps/Route117/events.inc | 38 | ||||
| -rw-r--r-- | data/maps/Route117/header.inc | 2 | ||||
| -rw-r--r-- | data/maps/Route117/map.bin | 10 | ||||
| -rw-r--r-- | data/maps/Route117/scripts.inc | 232 |
5 files changed, 271 insertions, 11 deletions
diff --git a/data/maps/Route117/border.bin b/data/maps/Route117/border.bin Binary files differdeleted file mode 100644 index addb5d6ce..000000000 --- a/data/maps/Route117/border.bin +++ /dev/null diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc new file mode 100644 index 000000000..f84ef6212 --- /dev/null +++ b/data/maps/Route117/events.inc @@ -0,0 +1,38 @@ +Route117_EventObjects: @ 852A828 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 25, 5, 3, 40, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 26, 13, 3, 33, 2, 2, 1, 5, Route117_EventScript_1F3AF6, 0 + object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_1F3B58, 0 + object_event 19, EVENT_OBJ_GFX_LASS, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0 + object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_1F39AC, 0 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 15, 4, 3, 10, 1, 1, 1, 4, Route117_EventScript_1F3C4E, 0 + object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, 9, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 + object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, 28, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 + +Route117_MapWarps: @ 852AA68 + warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE + +Route117_MapBGEvents: @ 852AA70 + bg_event 16, 6, 0, 0, 0, Route117_EventScript_1F39B5 + bg_event 49, 12, 0, 0, 0, Route117_EventScript_1F39BE + bg_event 49, 5, 0, 0, 0, Route117_EventScript_1F39C7 + bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0 + +Route117_MapEvents:: @ 852AAA0 + map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents + diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index d92b96e30..897d37afb 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,5 +1,5 @@ Route117: @ 8482838 - .4byte Route117_MapAttributes + .4byte Route117_Layout .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections diff --git a/data/maps/Route117/map.bin b/data/maps/Route117/map.bin deleted file mode 100644 index bdeda9cd4..000000000 --- a/data/maps/Route117/map.bin +++ /dev/null @@ -1,10 +0,0 @@ -5670
2
000000000
0
0 -20000000000
0
00000h4s4q0u4i0j4000
2
0000040
0
0
0
00000000
0
0
0
0
0
0
00000000p4{4|4}4q0r440
0
000000
0000 0 0 -00000008IIIIII:0000000p4q0q0t4y4z40
0
00000
0 200 2004000@2 22 -222B000000 -2x4y4y4z400
00
04000000 20 000000@222 22 -2B000000000000 !"20@2222 22B000000000 -202000000000000000000000000000IIIIIIIHI0000IJ0111111100000200011111111111111100000000002202020200000000 1!1)1)1)1)1*1000000000011!1!1!1)1x2y2x2y2x2y2x2y2!1!1!111000000002200202011111111!1"1000000000011111!1!1!1!1*10(1)1!1!1!11110000022020202 !!!!!!!!1"100 20000(1)1!1!1!1!1!1!1*10110(1!1!1!1)1*10000022200000(1)1)1)1)1)1)1)1)1*100200000(1)1!1!1!1"10000 1!1*1000000020202000000000000000000000(1!1!1"1000 1"100000000II@@@@II8II000II:0
0
00200000 1!1!110K1L5L5L5M1001!1"10000000000@22 22 -222B
0
0
00
0
0
00(1!1!1"101111100 1!1*10000@222 22 -22B
0
0
0
0
0
0
0
00 1!1!1100000000001!1"100@2222 22 -2B
0
0
0
0
0
0
0
0
0(1!1!1!11111111111!1!1*100H0IIIIIIJ@@@------%0%0
0
0
0
0
0(1)1)1)1)1)1)1)1)1)1)1)1)1)1*10000000000000000 0 0%0%0
0
0
00000000000000000000%0%0%00000
\ No newline at end of file diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc new file mode 100644 index 000000000..55a7b910e --- /dev/null +++ b/data/maps/Route117/scripts.inc @@ -0,0 +1,232 @@ +Route117_MapScripts:: @ 81F397D + map_script 3, Route117_MapScript1_1F3983 + .byte 0 + +Route117_MapScript1_1F3983: @ 81F3983 + call Route117_EventScript_1F3989 + end + +Route117_EventScript_1F3989:: @ 81F3989 + checkflag FLAG_PENDING_DAYCARE_EGG + goto_if 0, Route117_EventScript_1F3999 + setobjectxyperm 3, 47, 6 + +Route117_EventScript_1F3999:: @ 81F3999 + return + +Route117_EventScript_1F399A:: @ 81F399A + msgbox Route117_Text_1F3CFD, 2 + end + +Route117_EventScript_1F39A3:: @ 81F39A3 + msgbox Route117_Text_1F3D41, 2 + end + +Route117_EventScript_1F39AC:: @ 81F39AC + msgbox Route117_Text_1F3C7C, 2 + end + +Route117_EventScript_1F39B5:: @ 81F39B5 + msgbox Route117_Text_1F3D58, 3 + end + +Route117_EventScript_1F39BE:: @ 81F39BE + msgbox Route117_Text_1F3D74, 3 + end + +Route117_EventScript_1F39C7:: @ 81F39C7 + msgbox Route117_Text_1F3D8E, 3 + end + +Route117_EventScript_1F39D0:: @ 81F39D0 + trainerbattle 2, TRAINER_ISAAC_1, 0, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3A1B + msgbox Route117_Text_29C498, 4 + release + end + +Route117_EventScript_1F39FC:: @ 81F39FC + special sub_80B4808 + waitmovement 0 + msgbox Route117_Text_29C508, 4 + setvar VAR_0x8004, 538 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 538 + callstd 8 + release + end + +Route117_EventScript_1F3A1B:: @ 81F3A1B + trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_29C549, Route117_Text_29C58B + msgbox Route117_Text_29C5D0, 6 + end + +Route117_EventScript_1F3A32:: @ 81F3A32 + trainerbattle 2, TRAINER_LYDIA_1, 0, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3A7D + msgbox Route117_Text_29C679, 4 + release + end + +Route117_EventScript_1F3A5E:: @ 81F3A5E + special sub_80B4808 + waitmovement 0 + msgbox Route117_Text_29C6BC, 4 + setvar VAR_0x8004, 545 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 545 + callstd 8 + release + end + +Route117_EventScript_1F3A7D:: @ 81F3A7D + trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_29C6FD, Route117_Text_29C73E + msgbox Route117_Text_29C75A, 6 + end + +Route117_EventScript_1F3A94:: @ 81F3A94 + trainerbattle 2, TRAINER_DYLAN_1, 0, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3ADF + msgbox Route117_Text_29C800, 4 + release + end + +Route117_EventScript_1F3AC0:: @ 81F3AC0 + special sub_80B4808 + waitmovement 0 + msgbox Route117_Text_29C846, 4 + setvar VAR_0x8004, 364 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 364 + callstd 8 + release + end + +Route117_EventScript_1F3ADF:: @ 81F3ADF + trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_29C880, Route117_Text_29C8E3 + msgbox Route117_Text_29C8FE, 6 + end + +Route117_EventScript_1F3AF6:: @ 81F3AF6 + trainerbattle 2, TRAINER_MARIA_1, 0, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3B41 + msgbox Route117_Text_29C9D0, 4 + release + end + +Route117_EventScript_1F3B22:: @ 81F3B22 + special sub_80B4808 + waitmovement 0 + msgbox Route117_Text_29CA32, 4 + setvar VAR_0x8004, 369 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 369 + callstd 8 + release + end + +Route117_EventScript_1F3B41:: @ 81F3B41 + trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_29CA7C, Route117_Text_29CACC + msgbox Route117_Text_29CAF6, 6 + end + +Route117_EventScript_1F3B58:: @ 81F3B58 + trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_29CB32, Route117_Text_29CB87 + msgbox Route117_Text_29CBAD, 6 + end + +Route117_EventScript_1F3B6F:: @ 81F3B6F + trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3BB8 + msgbox Route117_Text_29CCCB, 4 + release + end + +Route117_EventScript_1F3B9F:: @ 81F3B9F + msgbox Route117_Text_29CD1D, 4 + setvar VAR_0x8004, 287 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 287 + callstd 8 + release + end + +Route117_EventScript_1F3BB8:: @ 81F3BB8 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E + msgbox Route117_Text_29CF1C, 6 + end + +Route117_EventScript_1F3BD3:: @ 81F3BD3 + trainerbattle 6, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route117_EventScript_1F3C1C + msgbox Route117_Text_29CE17, 4 + release + end + +Route117_EventScript_1F3C03:: @ 81F3C03 + msgbox Route117_Text_29CD1D, 4 + setvar VAR_0x8004, 287 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 287 + callstd 8 + release + end + +Route117_EventScript_1F3C1C:: @ 81F3C1C + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053 + msgbox Route117_Text_29CFFE, 6 + end + +Route117_EventScript_1F3C37:: @ 81F3C37 + trainerbattle 0, TRAINER_MELINA, 0, Route117_Text_29D0B7, Route117_Text_29D0F1 + msgbox Route117_Text_29D10E, 6 + end + +Route117_EventScript_1F3C4E:: @ 81F3C4E + trainerbattle 0, TRAINER_BRANDI, 0, Route117_Text_29D14B, Route117_Text_29D189 + msgbox Route117_Text_29D196, 6 + end + +Route117_EventScript_1F3C65:: @ 81F3C65 + trainerbattle 0, TRAINER_AISHA, 0, Route117_Text_29D1D1, Route117_Text_29D206 + msgbox Route117_Text_29D24C, 6 + end + +Route117_Text_1F3C7C: @ 81F3C7C + .string "I left my POKéMON at the DAY CARE.\p" + .string "When I got it back, it had a new move\n" + .string "that I didn’t teach it.\l" + .string "I was really, really surprised.$" + +Route117_Text_1F3CFD: @ 81F3CFD + .string "What do you think?\n" + .string "Aren’t these flowers pretty?\p" + .string "I planted them all!$" + +Route117_Text_1F3D41: @ 81F3D41 + .string "The air is tasty here!$" + +Route117_Text_1F3D58: @ 81F3D58 + .string "ROUTE 117\n" + .string "{0x7B} VERDANTURF TOWN$" + +Route117_Text_1F3D74: @ 81F3D74 + .string "ROUTE 117\n" + .string "{0x7C} MAUVILLE CITY$" + +Route117_Text_1F3D8E: @ 81F3D8E + .string "POKéMON DAY CARE\n" + .string "“Let us raise your POKéMON.”$" + |