thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-07 08:35:23 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix route numbers and add wild data

Browse source 
BWAAAAAH ZETAAAA
This commit is contained in:
Llinos Evans 2024-10-29 18:42:26 +00:00
parent e4a9df2a82
commit d7d348eaca
13 changed files with 59 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
data/maps/attributes.asm
View file

@ -897,12 +897,12 @@ ENDM
map_attributes CoralCity, CORAL_CITY, $04, WEST
connection west, Route52, ROUTE_52, 0
map_attributes Route52, ROUTE_52, $05, WEST | EAST
connection west, Route53, ROUTE_53, -18
map_attributes Route51, ROUTE_51, $05, WEST | EAST
connection west, Route52, ROUTE_52, -18
connection east, CoralCity, CORAL_CITY, 0
map_attributes Route53, ROUTE_53, $6C, EAST
connection east, Route52, ROUTE_52, 18
map_attributes Route52, ROUTE_52, $6C, EAST
connection east, Route51, ROUTE_51, 18
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

6
data/maps/blocks.asm
View file

@ -1317,8 +1317,8 @@ SavoyCity_Blocks:
CoralCity_Blocks:
INCBIN "maps/CoralCity.ablk"
Route51_Blocks:
INCBIN "maps/Route51.ablk"
Route52_Blocks:
INCBIN "maps/Route52.ablk"
Route53_Blocks:
INCBIN "maps/Route53.ablk"

4
data/maps/landmarks.asm
View file

@ -269,8 +269,8 @@ UnknownName: db "?????@"
Route66Name: db "ROUTE 66@"
Route49Name: db "ROUTE 49@"
Route50Name: db "ROUTE 50@"
Route52Name: db "ROUTE 52@"
Route53Name: db "ROUTE 53@"
Route52Name: db "ROUTE 51@"
Route53Name: db "ROUTE 52@"
QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "SEPIA¯CITY@"
PokemonPagodaName: db "#MON¯PAGODA@"

2
data/maps/maps.asm
View file

@ -739,8 +739,8 @@ MapGroup_SavoyCity:
MapGroup_CoralCity:
table_width MAP_LENGTH, MapGroup_CoralCity
map CoralCity, TILESET_NIHON_HIGHTECH, TOWN, LANDMARK_CORAL_CITY, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route51, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_51, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map Route53, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_53, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_CORAL_CITY_MAPS
MapGroup_BlueForest:

4
data/maps/scripts.asm
View file

@ -636,5 +636,5 @@ INCLUDE "maps/KantoSafariZoneArea3.asm"
INCLUDE "maps/SavoyCity.asm"
INCLUDE "maps/Route50SavoyCityGate.asm"
INCLUDE "maps/CoralCity.asm"
INCLUDE "maps/Route52.asm"
INCLUDE "maps/Route53.asm"
INCLUDE "maps/Route51.asm"
INCLUDE "maps/Route52.asm"

30
data/wild/nihon_grass.asm
View file

@ -200,4 +200,34 @@ NihonGrassWildMons:
dbw 35, SKARMORY
end_grass_wildmons
def_grass_wildmons ROUTE_51
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, FEAROW
dbw 31, RAPIDASH
dbw 30, FEAROW
dbw 31, COATL
dbw 32, QATU
dbw 32, TAUROS
dbw 35, WARUCHU
; day
dbw 30, FEAROW
dbw 31, RAPIDASH
dbw 30, FEAROW
dbw 31, COATL
dbw 32, QATU
dbw 32, TAUROS
dbw 35, WARUCHU
; nite
dbw 30, MURKROW
dbw 31, FOXFIRE
dbw 30, MURKROW
dbw 31, SNEASEL
dbw 32, ARBOK
dbw 32, NOCTOWL
dbw 35, WARUCHU
end_grass_wildmons
; Route 52 has no grass.
db -1 ; end

11
data/wild/nihon_water.asm
View file

@ -20,5 +20,14 @@ NihonWaterWildMons:
dbw 31, MAGIKARP
dbw 30, MAGIKARP
end_water_wildmons
; Route 52 has no grass
def_water_wildmons ROUTE_52
db 4 percent ; encounter rates: morn/day/nite
dbw 30, TENTACOOL
dbw 31, MANTINE
dbw 30, ANGORE
end_water_wildmons
db -1 ; end