diff options
Diffstat (limited to 'data/maps/Route102')
-rw-r--r-- | data/maps/Route102/border.bin | 1 | ||||
-rw-r--r-- | data/maps/Route102/connections.inc | 4 | ||||
-rw-r--r-- | data/maps/Route102/events.inc | 18 | ||||
-rw-r--r-- | data/maps/Route102/header.inc | 10 | ||||
-rw-r--r-- | data/maps/Route102/map.bin | 1 | ||||
-rw-r--r-- | data/maps/Route102/scripts.inc | 119 |
6 files changed, 144 insertions, 9 deletions
diff --git a/data/maps/Route102/border.bin b/data/maps/Route102/border.bin deleted file mode 100644 index 03bcafef1..000000000 --- a/data/maps/Route102/border.bin +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index 7fa2d516f..419cfeec9 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,6 +1,6 @@ Route102_MapConnectionsList: @ 848682C - connection left, -10, PETALBURG_CITY, 0 - connection right, 0, OLDALE_TOWN, 0 + connection left, -10, MAP_PETALBURG_CITY + connection right, 0, MAP_OLDALE_TOWN Route102_MapConnections: @ 8486844 .4byte 0x2 diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc new file mode 100644 index 000000000..58a0bf64b --- /dev/null +++ b/data/maps/Route102/events.inc @@ -0,0 +1,18 @@ +Route102_EventObjects: @ 8527FD8 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_1EC0FC, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, BerryTreeScript, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 + +Route102_MapBGEvents: @ 85280B0 + bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA + +Route102_MapEvents:: @ 85280C8 + map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents + diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 2c06344b0..dc2b3240a 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,15 +1,15 @@ Route102: @ 8482694 - .4byte Route102_MapAttributes + .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections .2byte MUS_DOORO1 .2byte 18 - .byte 17 + .byte MAPSEC_ROUTE_102 .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/Route102/map.bin b/data/maps/Route102/map.bin deleted file mode 100644 index 7378bb44b..000000000 --- a/data/maps/Route102/map.bin +++ /dev/null @@ -1 +0,0 @@ -
0
0
00000000000026620
0
0
0
0
0
0
000011110000011110
0
0
0
0
0
0
0
0
0
0
0
0
0011111111000000000000000
0
0
0
0
0
0
0
0
0
0
0
00111q2y211110000000000110000
0
0
0000
0
0
0
0
0
0
0011100111100000
0
00000
0
0
0
00001r210000
0
0
0
0
00110000000000000000000000000
0
0
0
0
0
0
00{00000000000001111111100000
0
0
0
0
0
0
00011000000000000011
0
0
0
0
0
000000000011110000000
0
0
0
000000000111111100011
0
000
0
0
00011000
0
0111111111000
0
01100011000
0
0
0
0111111101111
0
0
0000000000
0
0
0
0
000111111000
0
0
001100
0
0
00000
0
0
0000111001111
0
0
0
00
0
0
0
0
0
0
0000000000000001111111111
0
0
00000011111111
0
0
0
0000011111111
\ No newline at end of file diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc new file mode 100644 index 000000000..d25794242 --- /dev/null +++ b/data/maps/Route102/scripts.inc @@ -0,0 +1,119 @@ +Route102_MapScripts:: @ 81EC0E0 + .byte 0 + +Route102_EventScript_1EC0E1:: @ 81EC0E1 + msgbox Route102_Text_1EC2C0, 2 + end + +Route102_EventScript_1EC0EA:: @ 81EC0EA + msgbox Route102_Text_1EC35B, 3 + end + +Route102_EventScript_1EC0F3:: @ 81EC0F3 + msgbox Route102_Text_1EC373, 3 + end + +Route102_EventScript_1EC0FC:: @ 81EC0FC + msgbox Route102_Text_1EC32E, 2 + end + +Route102_EventScript_1EC105:: @ 81EC105 + trainerbattle 2, TRAINER_CALVIN_1, 0, Route102_Text_294513, Route102_Text_29457C, Route102_EventScript_1EC146 + specialvar VAR_RESULT, ShouldTryRematchBattle + compare VAR_RESULT, 1 + goto_eq Route102_EventScript_1EC19C + setvar VAR_0x8004, 318 + specialvar VAR_RESULT, sub_813B4E0 + compare VAR_RESULT, 0 + goto_eq Route102_EventScript_1EC170 + msgbox Route102_Text_2945AC, 4 + release + end + +Route102_EventScript_1EC146:: @ 81EC146 + special sub_80B4808 + waitmovement 0 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route102_EventScript_1EC157 + release + end + +Route102_EventScript_1EC157:: @ 81EC157 + msgbox Route102_Text_294668, 4 + setvar VAR_0x8004, 318 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 318 + callstd 8 + release + end + +Route102_EventScript_1EC170:: @ 81EC170 + checkflag FLAG_HAS_MATCH_CALL + goto_eq Route102_EventScript_1EC183 + msgbox Route102_Text_2945AC, 4 + release + end + +Route102_EventScript_1EC183:: @ 81EC183 + msgbox Route102_Text_2945EB, 4 + setvar VAR_0x8004, 318 + special SetMatchCallRegisteredFlag + setorcopyvar VAR_0x8000, 318 + callstd 8 + release + end + +Route102_EventScript_1EC19C:: @ 81EC19C + trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_2946AE, Route102_Text_29470C + msgbox Route102_Text_29473C, 6 + end + +Route102_EventScript_1EC1B3:: @ 81EC1B3 + trainerbattle 0, TRAINER_RICK, 0, Route102_Text_29480C, Route102_Text_294847 + msgbox Route102_Text_294859, 6 + end + +Route102_EventScript_1EC1CA:: @ 81EC1CA + trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_29489E, Route102_Text_2948F3 + msgbox Route102_Text_294916, 6 + end + +Route102_EventScript_1EC1E1:: @ 81EC1E1 + trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_294775, Route102_Text_2947AA + msgbox Route102_Text_2947DB, 6 + end + +PetalburgCity_Text_1EC1F8: @ 81EC1F8 + .string "WALLY: {PLAYER}…\n" + .string "POKéMON hide in tall grass like this,\l" + .string "don’t they?\p" + .string "Please watch me and see if I can\n" + .string "catch one properly.\p" + .string "…Whoa!$" + +PetalburgCity_Text_1EC271: @ 81EC271 + .string "WALLY: I did it… It’s my…\n" + .string "My POKéMON!$" + +PetalburgCity_Text_1EC297: @ 81EC297 + .string "{PLAYER}, thank you!\n" + .string "Let’s go back to the GYM!$" + +Route102_Text_1EC2C0: @ 81EC2C0 + .string "I’m…not very tall, so I sink right\n" + .string "into tall grass.\p" + .string "The grass goes up my nose and…\n" + .string "Fwafwafwafwafwa…\p" + .string "Fwatchoo!$" + +Route102_Text_1EC32E: @ 81EC32E + .string "I’m going to catch a whole bunch of\n" + .string "POKéMON!$" + +Route102_Text_1EC35B: @ 81EC35B + .string "ROUTE 102\n" + .string "{RIGHT_ARROW} OLDALE TOWN$" + +Route102_Text_1EC373: @ 81EC373 + .string "ROUTE 102\n" + .string "{LEFT_ARROW} PETALBURG CITY$" |