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

Winner's Path outside & connected

Browse source 
This makes and connects Winner's Path Outside to Victory Road Gate. Also fixes bugs in Winner's Path that caused signs to crash the game.

Next, making the route that connects to Silent Hills, and reintegrating Mt. Silver!
This commit is contained in:
Llinos Evans 2024-07-18 16:15:40 +01:00
parent 85ed8efe18
commit 157bfdc15b
18 changed files with 253 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/maps/attributes.asm
View file

@ -807,6 +807,7 @@ ENDM
; Nihon
map_attributes WinnersPath, WINNERS_PATH, $00, 0
map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, 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

@ -1201,3 +1201,6 @@ SinjohRuinsInterior_Blocks:
WinnersPath_Blocks:
INCBIN "maps/WinnersPath.ablk"
WinnersPathOutside_Blocks:
INCBIN "maps/WinnersPathOutside.ablk"

17
data/maps/maps.asm
View file

@ -674,18 +674,19 @@ MapGroup_SevenIsland: ; 34
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 SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE
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
map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map Route49OldCityGate, TILESET_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
map Route49OldCityGate, TILESET_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_SILENT_HILLS_MAPS
MapGroup_BlueForest:

2
data/maps/outdoor_sprites.asm
View file

@ -704,7 +704,7 @@ SilentHillsGroupSprites:
db SPRITE_BIG_LAPRAS
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_BIG_SNORLAX
db SPRITE_POKEFAN_M
db SPRITE_RIVAL
db SPRITE_TEACHER
db SPRITE_FISHER

1
data/maps/scripts.asm
View file

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

BIN
data/tilesets/nihon01_attributes.bin
View file

Binary file not shown.

6
data/tilesets/nihon01_collision.asm
View file

@ -127,4 +127,8 @@
tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e
tilecoll WALL, WALL, FLOOR, FLOOR ; 7f
tilecoll FLOOR, WALL, FLOOR, WALL ; 80
tilecoll WALL, WALL, WALL, WALL ; 81
tilecoll WALL, WALL, DOOR, WALL ; 81
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 82
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 84
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 85

BIN
data/tilesets/nihon01_metatiles.bin
View file

Binary file not shown.

21
data/trainers/parties.asm
View file

@ -1796,8 +1796,12 @@ BeautyGroup:
next_list_item ; BEAUTY (4)
db "JACLYN@", TRAINERTYPE_NORMAL
db 15
dw SENTRET
db 53
dw FURRET
db 53
dw MEGANIUM
db 55
dw EUCALA
db -1 ; end
next_list_item ; BEAUTY (5)
@ -5495,8 +5499,10 @@ CueBallGroup:
EngineerGroup:
next_list_item ; ENGINEER (1)
db "DASHU@", TRAINERTYPE_NORMAL
db 23
dw MAGNEMITE
db 52
dw MAGNEZONE
db 54
dw ELECTIVIRE
db -1 ; end
end_list_items
@ -5538,6 +5544,13 @@ PainterGroup:
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:

40
data/wild/nihon_grass.asm
View file

@ -1,4 +1,6 @@
NihonGrassWildMons:
; Winner's Path is themed around Pokemon found in the PokeWalker map.
; Additionally, it features Pokemon known to be successful in Nintendo Cup 2000.
def_grass_wildmons WINNERS_PATH
db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
; morn
@ -6,7 +8,7 @@ NihonGrassWildMons:
dbw 51, SKARMORY
dbw 50, CHANSEY
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, RHYDON
dbw 52, FORRETRESS
dbw 55, STEELIX
; day
@ -14,19 +16,47 @@ NihonGrassWildMons:
dbw 51, SKARMORY
dbw 50, CHANSEY
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, RHYDON
dbw 52, FORRETRESS
dbw 55, STEELIX
; nite
dbw 50, MUNCHLAX
dbw 50, MAROWAK
dbw 51, SKARMORY
dbw 50, KITSEN
dbw 51, MUNCHLAX
dbw 51, MAROWAK
dbw 52, HAUNTER
dbw 52, MISDREAVUS
dbw 55, STEELIX
end_grass_wildmons
def_grass_wildmons WINNERS_PATH_OUTSIDE
db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
; morn
dbw 50, MUNCHLAX
dbw 51, SKARMORY
dbw 50, MILTANK
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, QUAGSIRE
dbw 55, AMPHAROS
; day
dbw 50, MUNCHLAX
dbw 51, SKARMORY
dbw 50, MILTANK
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, QUAGSIRE
dbw 55, AMPHAROS
; nite
dbw 50, KADABRA
dbw 51, SKARMORY
dbw 50, KITSEN
dbw 51, KADABRA
dbw 52, HAUNTER
dbw 52, MISDREAVUS
dbw 55, AMPHAROS
end_grass_wildmons
def_grass_wildmons QUIET_CAVE
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn