thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unnumbered Route

Browse source 
This route is unnumbered for now, because it's technically the last Nihon Route (numbered 23 in-prototype) and I don't know how to number it yet. It's easily find/replaced once we're sure, anyway.

Wild data uses the prototype's plus a couple edits, levels are kept low as you're actually entering here.

It's official: Nihon is connected to Johto and Kanto now!
This commit is contained in:
Llinos Evans 2024-07-18 17:51:01 +01:00
parent aa67d01582
commit 289b250e89
24 changed files with 368 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

11
data/maps/attributes.asm
View file

@ -375,8 +375,9 @@ ENDM
connection north, Route10North, ROUTE_10_NORTH, 0
connection south, LavenderTown, LAVENDER_TOWN, 0
map_attributes SilentHills, SILENT_HILLS, $05, WEST ; Add Prince and east connections later
map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later
connection west, Route49, ROUTE_49, 0
connection east, UnnumberedRoute, UNNUMBERED_ROUTE, 0
map_attributes Route49, ROUTE_49, $05, EAST | WEST
connection east, SilentHills, SILENT_HILLS, $05, 0
@ -807,7 +808,13 @@ ENDM
; Nihon
map_attributes WinnersPath, WINNERS_PATH, $00, 0
map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, 0
map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH
connection north, UnnumberedRoute, UNNUMBERED_ROUTE, 0
map_attributes UnnumberedRoute, UNNUMBERED_ROUTE, $05, WEST | SOUTH
connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0
connection west, SilentHills, SILENT_HILLS, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes QuietCave, QUIET_CAVE, $76, 0
map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0

3
data/maps/blocks.asm
View file

@ -1204,3 +1204,6 @@ WinnersPath_Blocks:
WinnersPathOutside_Blocks:
INCBIN "maps/WinnersPathOutside.ablk"
UnnumberedRoute_Blocks:
INCBIN "maps/UnnumberedRoute.ablk"

11
data/maps/landmarks.asm
View file

@ -130,11 +130,12 @@ Landmarks:
landmark 0, 0, UnknownName ; Six Island
landmark 0, 0, UnknownName ; Seven Island
assert_table_length NIHON_LANDMARK
landmark 0, 0, WinnersPathName
landmark 92, 108, SilentHillsName
landmark 108, 116, WinnersPathName
landmark 108, 108, UnknownName ; Unnumbered post-Winner's Path Route
landmark 92, 108, SilentHillsName
landmark 20, 28, UnknownName ; Debug Room
landmark 91, 108, Route49Name ; probably not correct
landmark 91, 108, QuietCaveName ; probably not correct
landmark 84, 108, Route49Name
landmark 76, 108, QuietCaveName
landmark 140, 60, BlueForestName
assert_table_length NUM_LANDMARKS
@ -164,7 +165,7 @@ WhirlIslandsName: db "WHIRL¯ISLANDS@"
MtMortarName: db "MT.MORTAR@"
DragonsDenName: db "DRAGON'S¯DEN@"
IcePathName: db "ICE PATH@"
NotApplicableName: db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
HauntedHouseName: db "HAUNTED¯HOUSE@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese
PalletTownName: db "PALLET TOWN@"
ViridianCityName: db "VIRIDIAN¯CITY@"
PewterCityName: db "PEWTER CITY@"

1
data/maps/maps.asm
View file

@ -675,6 +675,7 @@ MapGroup_SilentHills:
table_width MAP_LENGTH, MapGroup_SilentHills
map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup
map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE
map UnnumberedRoute, TILESET_NIHON_01, ROUTE, LANDMARK_UNNUMBERED_ROUTE, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE
map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND

2
data/maps/outdoor_sprites.asm
View file

@ -703,7 +703,7 @@ SilentHillsGroupSprites:
db SPRITE_OLD_LINK_RECEPTIONIST
db SPRITE_BIG_LAPRAS
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_SUPER_NERD
db SPRITE_POKEFAN_M
db SPRITE_RIVAL
db SPRITE_TEACHER

1
data/maps/scripts.asm
View file

@ -594,3 +594,4 @@ SECTION "Map Scripts 29", ROMX
INCLUDE "maps/Route49OldCityGate.asm"
INCLUDE "maps/WinnersPath.asm"
INCLUDE "maps/WinnersPathOutside.asm"
INCLUDE "maps/UnnumberedRoute.asm"

BIN
data/tilesets/nihon01_attributes.bin
View file

Binary file not shown.

9
data/tilesets/nihon01_collision.asm
View file

@ -132,3 +132,12 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 84
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 85
tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 86
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 87
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 88
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 89
tilecoll WATER, WATER, WATER, WATER ; 8a
tilecoll WALL, WALL, WALL, DOOR ; 8b
tilecoll WALL, WALL, WALL, WALL ; 8c
tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8e

BIN
data/tilesets/nihon01_metatiles.bin
View file

Binary file not shown.

135
data/trainers/parties.asm
View file

@ -1161,10 +1161,9 @@ BirdKeeperGroup:
LassGroup:
next_list_item ; LASS (1)
db "CARRIE@", TRAINERTYPE_MOVES
db "CARRIE@", TRAINERTYPE_NORMAL
db 18
dw SNUBBULL
dw SCARY_FACE, CHARM, BITE, LICK
db -1 ; end
next_list_item ; LASS (2)
@ -1353,16 +1352,13 @@ JanineGroup:
CooltrainerMGroup:
next_list_item ; COOLTRAINERM (1)
db "NICK@", TRAINERTYPE_MOVES
db "NICK@", TRAINERTYPE_NORMAL
db 26
dw CHARMANDER
dw EMBER, SMOKESCREEN, RAGE, SCARY_FACE
db 26
dw SQUIRTLE
dw WITHDRAW, WATER_GUN, BITE, CURSE
db 26
dw BULBASAUR
dw LEECH_SEED, POISONPOWDER, SLEEP_POWDER, RAZOR_LEAF
db -1 ; end
next_list_item ; COOLTRAINERM (2)
@ -2837,6 +2833,14 @@ FisherGroup:
dw ROLLOUT, SURF, PIN_MISSILE, TAKE_DOWN
db -1 ; end
next_list_item ; FISHER (25)
db "BRAN@", TRAINERTYPE_NORMAL
db 54
dw QWILFATHER
db 57
dw KAZEPPELIN
db -1 ; end
end_list_items
SwimmerMGroup:
@ -3318,13 +3322,13 @@ SuperNerdGroup:
db -1 ; end
next_list_item ; SUPER_NERD (3)
db "GREGG@", TRAINERTYPE_NORMAL ; seems to be unused - anything we can do?
db 20
dw MAGNEMITE
db 20
dw MAGNEMITE
db 20
dw MAGNEMITE
db "GREGG@", TRAINERTYPE_NORMAL
db 50
dw MAGNEZONE
db 51
dw MUK
db 50
dw BELLEDAM
db -1 ; end
next_list_item ; SUPER_NERD (4)
@ -5479,108 +5483,3 @@ MysticalmanGroup:
db -1 ; end
end_list_items
; RBY / unused trainer types. Mostly placeholders.
ChannelerGroup:
next_list_item ; CHANNELER (1)
db "SHANNA@", TRAINERTYPE_NORMAL
db 23
dw GASTLY
db -1 ; end
end_list_items
CueBallGroup:
next_list_item ; CUE_BALL (1)
db "KIRBY@", TRAINERTYPE_NORMAL
db 23
dw CLEFFA
db -1 ; end
end_list_items
EngineerGroup:
next_list_item ; ENGINEER (1)
db "DASHU@", TRAINERTYPE_NORMAL
db 52
dw MAGNEZONE
db 54
dw ELECTIVIRE
db -1 ; end
end_list_items
RockerGroup:
next_list_item ; ROCKER (1)
db "BOWIE@", TRAINERTYPE_NORMAL
db 23
dw VOLTORB
db -1 ; end
end_list_items
TamerGroup:
next_list_item ; TAMER (1)
db "MOE@", TRAINERTYPE_NORMAL
db 23
dw TAUROS
db -1 ; end
end_list_items
FirefighterGroup:
next_list_item ; FIREFIGHTER (1)
db "REMY@", TRAINERTYPE_NORMAL
db 23
dw POLIWAG
db -1 ; end
end_list_items
TeacherMGroup:
next_list_item ; TEACHERM (1)
db "DORNYEI@", TRAINERTYPE_NORMAL
db 23
dw BLISSEY
db -1 ; end
end_list_items
PainterGroup:
next_list_item ; PAINTER (1)
db "RACHEL@", TRAINERTYPE_NORMAL
db 23
dw SMEARGLE
db -1 ; end
next_list_item ; PAINTER (1)
db "DALI@", TRAINERTYPE_NORMAL
db 23
dw SMEARGLE
db -1 ; end
end_list_items
SoldierGroup:
next_list_item ; SOLDIER (1)
db "PEPPINO@", TRAINERTYPE_NORMAL
db 23
dw FORRETRESS
db -1 ; end
end_list_items
SportsmanGroup:
next_list_item ; SPORTSMAN (1)
db "JACQUES@", TRAINERTYPE_NORMAL
db 23
dw DODUO
db -1 ; end
end_list_items
AerofossilGroup:
next_list_item ; SPORTSMAN (1)
db "???@", TRAINERTYPE_NORMAL
db 99
dw AERODACTYL
db -1 ; end
end_list_items
KabufossilGroup:
next_list_item ; SPORTSMAN (1)
db "???@", TRAINERTYPE_NORMAL
db 99
dw KABUTOPS
db -1 ; end
end_list_items

108
data/trainers/parties_new_classes.asm Normal file
View file

@ -0,0 +1,108 @@
SECTION "Enemy Trainer Parties 4", ROMX
; RBY / unused trainer types. Mostly placeholders.
ChannelerGroup:
next_list_item ; CHANNELER (1)
db "SHANNA@", TRAINERTYPE_NORMAL
db 23
dw GASTLY
db -1 ; end
end_list_items
CueBallGroup:
next_list_item ; CUE_BALL (1)
db "KIRBY@", TRAINERTYPE_NORMAL
db 23
dw CLEFFA
db -1 ; end
end_list_items
EngineerGroup:
next_list_item ; ENGINEER (1)
db "DASHU@", TRAINERTYPE_NORMAL
db 52
dw MAGNEZONE
db 54
dw ELECTIVIRE
db -1 ; end
end_list_items
RockerGroup:
next_list_item ; ROCKER (1)
db "BOWIE@", TRAINERTYPE_NORMAL
db 23
dw VOLTORB
db -1 ; end
end_list_items
TamerGroup:
next_list_item ; TAMER (1)
db "MOE@", TRAINERTYPE_NORMAL
db 23
dw TAUROS
db -1 ; end
end_list_items
FirefighterGroup:
next_list_item ; FIREFIGHTER (1)
db "REMY@", TRAINERTYPE_NORMAL
db 23
dw POLIWAG
db -1 ; end
end_list_items
TeacherMGroup:
next_list_item ; TEACHERM (1)
db "DORNYEI@", TRAINERTYPE_NORMAL
db 23
dw BLISSEY
db -1 ; end
end_list_items
PainterGroup:
next_list_item ; PAINTER (1)
db "RACHEL@", TRAINERTYPE_NORMAL
db 23
dw SMEARGLE
db -1 ; end
next_list_item ; PAINTER (1)
db "DALI@", TRAINERTYPE_MOVES
db 53
dw SMEARGLE
dw EXTREMESPEED, BELLY_DRUM, NO_MOVE, NO_MOVE ; lol
db -1 ; end
end_list_items
SoldierGroup:
next_list_item ; SOLDIER (1)
db "PEPPINO@", TRAINERTYPE_NORMAL
db 23
dw FORRETRESS
db -1 ; end
end_list_items
SportsmanGroup:
next_list_item ; SPORTSMAN (1)
db "JACQUES@", TRAINERTYPE_NORMAL
db 23
dw DODUO
db -1 ; end
end_list_items
AerofossilGroup:
next_list_item ; SPORTSMAN (1)
db "???@", TRAINERTYPE_NORMAL
db 99
dw AERODACTYL
db -1 ; end
end_list_items
KabufossilGroup:
next_list_item ; SPORTSMAN (1)
db "???@", TRAINERTYPE_NORMAL
db 99
dw KABUTOPS
db -1 ; end
end_list_items

31
data/wild/nihon_grass.asm
View file

@ -57,6 +57,37 @@ NihonGrassWildMons:
dbw 55, AMPHAROS
end_grass_wildmons
; Route east of Silent Hills
; Encounter data based on what is in the SW97 demo.
; https://tcrf.net/Proto:Pok%C3%A9mon_Gold_and_Silver/Spaceworld_1997_Demo/Maps
def_grass_wildmons UNNUMBERED_ROUTE
db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
; morn
dbw 29, PICHU
dbw 29, SMEARGLE
dbw 28, PICHU
dbw 29, ODDISH
dbw 32, GLOOM
dbw 27, PIKACHU
dbw 27, SMEARGLE
; day
dbw 29, ODDISH
dbw 29, SMEARGLE
dbw 28, PICHU
dbw 29, MEOWTH
dbw 32, RATICATE
dbw 27, MEOWTH
dbw 27, SMEARGLE
; nite
dbw 29, RATICATE
dbw 29, HOOTHOOT
dbw 28, EKANS
dbw 29, HOOTHOOT
dbw 32, ARBOK
dbw 27, NOCTOWL
dbw 27, SMEARGLE
end_grass_wildmons
def_grass_wildmons QUIET_CAVE
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn

7
data/wild/nihon_water.asm
View file

@ -6,6 +6,13 @@ NihonWaterWildMons:
dbw 40, GRANBO ; SHARPOON
end_water_wildmons
def_water_wildmons UNNUMBERED_ROUTE
db 4 percent ; encounter rates: morn/day/nite
dbw 30, MAGIKARP
dbw 31, ANGORE
dbw 30, MOLAMBINO
end_water_wildmons
; Placeholder
def_water_wildmons ROUTE_49_2
db 4 percent ; encounter rates: morn/day/nite