Skip to content

Commit 64eaa34

Browse files
DakoriasDakorias
committed
added new map Rugged Cliff
1 parent b7cd24d commit 64eaa34

16 files changed

+132
-41
lines changed

‎constants/landmark_constants.asm

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
const LANDMARK_SCENIC_BLUFF ; 64
1111
const LANDMARK_MT_MONEGO ; 65
1212
const LANDMARK_BERRY_FOREST ; 66
13+
const LANDMARK_RUGGED_CLIFF
1314

1415
DEF KANTO_LANDMARK EQU const_value
1516
const LANDMARK_PALLET_TOWN ; 2f

‎constants/map_constants.asm

+3-2
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,15 @@ ENDM
8484
newgroup CRAGGY_COAST ; 6
8585
map_const CRAGGY_COAST, 20, 16 ; 1
8686
map_const SCENIC_BLUFF, 14, 26 ; 2
87-
map_const MT_MONEGO, 10, 14 ; 3
88-
map_const MT_MONEGO_B1F, 10, 14 ; 4
87+
map_const MT_MONEGO, 14, 16 ; 3
88+
map_const MT_MONEGO_B1F, 12, 12 ; 4
8989
map_const CRAGGY_COAST_HOUSE1, 5, 4 ; 5
9090
map_const CRAGGY_COAST_HOUSE2, 5, 4 ; 6
9191
map_const CRAGGY_COAST_POKECENTER, 7, 4 ; 7
9292
map_const CRAGGY_COAST_FISHING, 5, 4 ; 8
9393
map_const BEACH_GROTTO, 5, 5 ; 9
9494
map_const MOUNTAIN_GYM, 5, 5 ; 10
95+
map_const RUGGED_CLIFF, 18, 22 ; 11
9596
endgroup
9697

9798
newgroup BERRY_FOREST ; 7

‎data/maps/attributes.asm

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ ENDM
138138
map_attributes MountainGym, MOUNTAIN_GYM, $00, 0
139139
map_attributes BerryForest, BERRY_FOREST, $05, 0
140140
map_attributes BerryForestHouse, BERRY_FOREST_HOUSE, $00, 0
141+
map_attributes RuggedCliff, RUGGED_CLIFF, $05, 0
141142

142143

143144
map_attributes BattleTowerOutside, BATTLE_TOWER_OUTSIDE, $05, 0

‎data/maps/blocks.asm

+3
Original file line numberDiff line numberDiff line change
@@ -135,3 +135,6 @@ BerryForest_Blocks:
135135

136136
BerryForestHouse_Blocks:
137137
INCBIN "maps/House.blk"
138+
139+
RuggedCliff_Blocks:
140+
INCBIN "maps/RuggedCliff.blk"

‎data/maps/flypoints.asm

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Flypoints:
44
; landmark, spawn point
55
db LANDMARK_HERALD_COVE, SPAWN_N_A
66
db LANDMARK_CRAGGY_COAST, SPAWN_N_A
7+
db LANDMARK_RUGGED_CLIFF, SPAWN_N_A
78
; Kanto
89
db LANDMARK_PALLET_TOWN, SPAWN_N_A
910
db LANDMARK_VIRIDIAN_CITY, SPAWN_N_A

‎data/maps/landmarks.asm

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Landmarks:
1616
landmark 12, 48, ScenicBluffName
1717
landmark 12, 36, MtMonegoName
1818
landmark 4, 68, BerryForestName
19+
landmark 4, 36, RuggedCliffName
1920

2021
assert_table_length KANTO_LANDMARK
2122
landmark 52, 108, PalletTownName
@@ -78,6 +79,7 @@ CraggyCoastName: db "CRAGGY¯COAST@"
7879
ScenicBluffName: db "SCENIC¯BLUFF@"
7980
MtMonegoName: db "MT.¯MONEGO@"
8081
BerryForestName: db "BERRY¯FOREST@"
82+
RuggedCliffName: db "RUGGED¯CLIFF@"
8183
NewBarkTownName: db "NEW BARK¯TOWN@"
8284
CherrygroveCityName: db "CHERRYGROVE¯CITY@"
8385
VioletCityName: db "VIOLET CITY@"

‎data/maps/maps.asm

+1
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ MapGroup_CraggyCoast:
8989
map CraggyCoastFishing, TILESET_HOUSE, INDOOR, LANDMARK_CRAGGY_COAST, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
9090
map BeachGrotto, TILESET_JOHTO, ROUTE, LANDMARK_CRAGGY_BEACH, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
9191
map MountainGym, TILESET_TOWER, INDOOR, LANDMARK_MT_MONEGO, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_SHORE
92+
map RuggedCliff, TILESET_JOHTO, ROUTE, LANDMARK_RUGGED_CLIFF, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
9293
assert_table_length NUM_CRAGGY_COAST_MAPS
9394

9495
MapGroup_BerryForest:

‎data/maps/scripts.asm

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ INCLUDE "maps/MountainGym.asm"
5858
SECTION "Map Scripts 6", ROMX
5959
INCLUDE "maps/BerryForest.asm"
6060
INCLUDE "maps/BerryForestHouse.asm"
61+
INCLUDE "maps/RuggedCliff.asm"
6162

6263

6364
SECTION "Map Scripts 7", ROMX

‎data/tilesets/johto_collision.asm

+3-3
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@
171171
tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; aa
172172
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; ab
173173
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ac
174-
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ad
175-
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; ae
176-
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; af
174+
tilecoll WALL, WALL, WALL, WALL ; ad
175+
tilecoll WALL, WALL, WALL, WALL ; ae
176+
tilecoll FLOOR, HOP_DOWN, FLOOR, FLOOR ; af
177177
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b0
178178
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b1
179179
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; b2

‎data/tilesets/johto_metatiles.bin

0 Bytes
Binary file not shown.

‎data/wild/johto_grass.asm

+74-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ JohtoGrassWildMons:
4343
; morn
4444
; %, Species, min, max
4545
db 30, PIDGEY, 2, 4
46-
db 25, SENTRET, 2, 4
46+
db 25, WOOPER, 2, 4
4747
db 25, CATERPIE, 2, 5
4848
db 10, FLETCHLING, 3, 5
4949
db 5, KRABBY, 3, 4
@@ -53,7 +53,7 @@ JohtoGrassWildMons:
5353

5454
; day
5555
db 30, PIDGEY, 2, 4
56-
db 25, SENTRET, 2, 4
56+
db 25, WOOPER, 2, 4
5757
db 25, CATERPIE, 2, 5
5858
db 10, FLETCHLING, 3, 5
5959
db 5, KRABBY, 3, 4
@@ -63,7 +63,7 @@ JohtoGrassWildMons:
6363

6464
; nite
6565
db 30, PIDGEY, 2, 4
66-
db 25, SENTRET, 2, 4
66+
db 25, WOOPER, 2, 4
6767
db 25, CATERPIE, 2, 5
6868
db 10, FLETCHLING, 3, 5
6969
db 5, KRABBY, 3, 4
@@ -173,11 +173,81 @@ JohtoGrassWildMons:
173173
db 15, ROCKRUFF, 10, 12
174174
db 5, ARON, 11, 13
175175
db 2, GEODUDE, 11, 12
176-
db 2, BAGON, 11, 12
176+
db 2, BAGON, 11, 12
177+
db 1, ARON, 12, 13
178+
179+
end_grass_wildmons
180+
181+
def_grass_wildmons MT_MONEGO_B1F
182+
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
183+
; morn
184+
; %, Species, min, max
185+
db 30, GEODUDE, 10, 12
186+
db 25, MACHOP, 9, 12
187+
db 20, TYROGUE, 10, 11
188+
db 15, ROCKRUFF, 10, 12
189+
db 5, ARON, 11, 13
190+
db 2, GEODUDE, 11, 12
191+
db 2, BAGON, 11, 12
192+
db 1, ARON, 12, 13
193+
194+
; day
195+
db 30, GEODUDE, 10, 12
196+
db 25, MACHOP, 9, 12
197+
db 20, TYROGUE, 10, 11
198+
db 15, ROCKRUFF, 10, 12
199+
db 5, ARON, 11, 13
200+
db 2, GEODUDE, 11, 12
201+
db 2, BAGON, 11, 12
202+
db 1, ARON, 12, 13
203+
204+
; nite
205+
db 30, GEODUDE, 10, 12
206+
db 25, MACHOP, 9, 12
207+
db 20, TYROGUE, 10, 11
208+
db 15, ROCKRUFF, 10, 12
209+
db 5, ARON, 11, 13
210+
db 2, GEODUDE, 11, 12
211+
db 2, BAGON, 11, 12
177212
db 1, ARON, 12, 13
178213

179214
end_grass_wildmons
180215

216+
def_grass_wildmons RUGGED_CLIFF
217+
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
218+
; morn
219+
; %, Species, min, max
220+
db 25, FLETCHLING, 10, 12
221+
db 25, MACHOP, 9, 12
222+
db 25, TYROGUE, 10, 11
223+
db 15, BIDOOF, 10, 12
224+
db 5, MACHOP, 11, 13
225+
db 2, FLETCHLING, 11, 12
226+
db 2, BIDOOF, 11, 12
227+
db 1, TYROGUE, 12, 13
228+
229+
; day
230+
db 25, FLETCHLING, 10, 12
231+
db 25, MACHOP, 9, 12
232+
db 25, TYROGUE, 10, 11
233+
db 15, BIDOOF, 10, 12
234+
db 5, MACHOP, 11, 13
235+
db 2, FLETCHLING, 11, 12
236+
db 2, BIDOOF, 11, 12
237+
db 1, TYROGUE, 12, 13
238+
239+
; nite
240+
db 25, FLETCHLING, 10, 12
241+
db 25, MACHOP, 9, 12
242+
db 25, TYROGUE, 10, 11
243+
db 15, BIDOOF, 10, 12
244+
db 5, MACHOP, 11, 13
245+
db 2, FLETCHLING, 11, 12
246+
db 2, BIDOOF, 11, 12
247+
db 1, TYROGUE, 12, 13
248+
249+
end_grass_wildmons
250+
181251
def_grass_wildmons BERRY_FOREST
182252
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
183253
; morn

‎gfx/pokegear/johto.bin

0 Bytes
Binary file not shown.

‎maps/MtMonego.blk

+12-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
1-

2-
999)1DEF
3-
 @AB
4-
()+1
5-
*
6-
 1*
7-
!!!1
8-
>=
9-
1
10-
&%
11-
>=
12-
&%
13-
&%
14-
 (**
15-
=!*
16-
%$*!+ #
1+
 (1(+DEF
2+
899)+)*@AB !;*+
3+
1+9"
4+
$+ #)  
5+
>=
6+
(+)
7+
&%
8+
 6&%  "&%
9+
 *1
10+
>'=+)+ &%1(
11+
1&%9
12+
)+")*(+ #

‎maps/MtMonegoB1F.blk

+11-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-

2-
999)1DEF
3-
 @AB
4-
()+1
5-
*
6-
 1*
7-
!!!1
8-
>=
9-
1
10-
&%
11-
>=
12-
&%
13-
&%
14-
 (**
15-
=!*
16-
%$*!+ #
1+

2+
" 
3+
) 
4+
1 6 
5+

6+
(* 
7+
>= ++(+
8+
&2''=*  &%
9+
1+&% *
10+
1&2'=*
11+
)>3%1" 

‎maps/RuggedCliff.asm

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
object_const_def
2+
3+
RuggedCliff_MapScripts:
4+
def_scene_scripts
5+
6+
def_callbacks
7+
8+
9+
RuggedCliff_MapEvents:
10+
db 0, 0 ; filler
11+
12+
def_warp_events
13+
14+
def_coord_events
15+
16+
def_bg_events
17+
18+
def_object_events

‎maps/RuggedCliff.blk

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
��?�{hqlrrn��f�\lrrsnh����]G=hh����hh�����f`facjqh�����<bfhqh���\jppqqh��?�aahqqqjq���<NbZVjqjppqq����RWShqhqqq���bhjqqqqq���dfhhornqq����ahlmqhqq���]<^hqqqlrr�����lsrnqqq��=��]Eahqqq��d�blrnq��=��������ln��d>^�������h��jk>=\bh�jpqi>jkh�hqqidflmal

0 commit comments

Comments
 (0)