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

Merge branch 'master' of https://github.com/ZetaNull/jep-hack

Browse source
This commit is contained in:
Zeta_Null 2024-07-17 20:55:46 -04:00
commit 28f2bcdcd9
19 changed files with 289 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/maps/attributes.asm
View file

@ -806,6 +806,7 @@ ENDM
map_attributes NavalRockB1F, NAVAL_ROCK_B1F, $00, 0
; Nihon
map_attributes WinnersPath, WINNERS_PATH, $00, 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

@ -1198,3 +1198,6 @@ SinjohRuinsExterior_Blocks:
SinjohRuinsInterior_Blocks:
INCBIN "maps/SinjohRuinsInterior.ablk"
WinnersPath_Blocks:
INCBIN "maps/WinnersPath.ablk"

2
data/maps/landmarks.asm
View file

@ -130,6 +130,7 @@ 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 20, 28, UnknownName ; Debug Room
landmark 91, 108, Route49Name ; probably not correct
@ -240,6 +241,7 @@ TohjoFallsName: db "TOHJO FALLS@"
UndergroundName: db "UNDERGROUND@"
BattleTowerName: db "BATTLE¯TOWER@"
SpecialMapName: db "SPECIAL@"
WinnersPathName: db "WINNER'S¯PATH@"
SilentHillsName: db "SILENT¯HILLS@"
UnknownName: db "?????@"
Route49Name: db "ROUTE 49@"

1
data/maps/maps.asm
View file

@ -673,6 +673,7 @@ 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 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

1
data/maps/scripts.asm
View file

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

BIN
data/tilesets/cave_attributes.bin
View file

Binary file not shown.

8
data/tilesets/cave_collision.asm
View file

@ -77,3 +77,11 @@
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4d
tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4e
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 50
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 51
tilecoll WALL, FLOOR, FLOOR, LADDER ; 52
tilecoll WATER, WATER, WATER, WATER ; 53
tilecoll WATER, WATER, WATER, WATER ; 54
tilecoll WATER, WALL, WATER, WALL ; 55
tilecoll WATER, WALL, WALL, WALL ; 56

BIN
data/tilesets/cave_metatiles.bin
View file

Binary file not shown.

49
data/trainers/parties.asm
View file

@ -1480,25 +1480,29 @@ CooltrainerMGroup:
dw SANDSLASH
dw SAND_ATTACK, POISON_STING, SLASH, SWIFT
db -1 ; end
; Previously unused, now Winner's Path
next_list_item ; COOLTRAINERM (13)
db "ERICK@", TRAINERTYPE_NORMAL
db 10
dw BULBASAUR
db 10
dw CHARMANDER
db 10
dw SQUIRTLE
db 56
dw VENUSAUR
db 56
dw CHARIZARD
db 56
dw TOTARTLE
db -1 ; end
; Previously unused, now Winner's Path
next_list_item ; COOLTRAINERM (14)
db "ANDY@", TRAINERTYPE_NORMAL
db 10
dw BULBASAUR
db 10
dw CHARMANDER
db 10
dw SQUIRTLE
db 53
dw CACAWPHONY
db 54
dw WARUCHU
db 53
dw SNEASEL ; WEARLYCAN
db 56
dw PILOSWINE ; BUNDRAKE
db -1 ; end
next_list_item ; COOLTRAINERM (15)
@ -1530,15 +1534,18 @@ CooltrainerMGroup:
db 35
dw WARTORTLE
db -1 ; end
; Previously unused, now Winner's Path
next_list_item ; COOLTRAINERM (18)
db "STEVE@", TRAINERTYPE_NORMAL
db 14
dw BULBASAUR
db 14
dw CHARMANDER
db 14
dw SQUIRTLE
db 53
dw TREBIR
db 54
dw GOROCHU
db 53
dw SNEASEL ; WEAVILE
db 56
dw PILOSWINE ; BUNBERG
db -1 ; end
next_list_item ; COOLTRAINERM (19)

75
data/wild/nihon_grass.asm
View file

@ -1,31 +1,30 @@
NihonGrassWildMons:
def_grass_wildmons ROUTE_49
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
def_grass_wildmons WINNERS_PATH
db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
; morn
dbw 30, PIDGEY
dbw 31, RATTATA
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, MARILL
dbw 35, SUNFLORA
dbw 50, MUNCHLAX
dbw 51, SKARMORY
dbw 50, CHANSEY
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, FORRETRESS
dbw 55, STEELIX
; day
dbw 30, PIDGEY
dbw 31, RATTATA
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, MARILL
dbw 35, GIRAFARIG
dbw 50, MUNCHLAX
dbw 51, SKARMORY
dbw 50, CHANSEY
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, FORRETRESS
dbw 55, STEELIX
; nite
dbw 30, HOOTHOOT
dbw 31, RATTATA
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, MARILL
dbw 35, SKARMORY
dbw 50, MUNCHLAX
dbw 51, SKARMORY
dbw 50, KITSEN
dbw 51, MUNCHLAX
dbw 52, HAUNTER
dbw 52, MISDREAVUS
dbw 55, STEELIX
end_grass_wildmons
def_grass_wildmons QUIET_CAVE
@ -84,4 +83,32 @@ NihonGrassWildMons:
dbw 35, SKARMORY
end_grass_wildmons
def_grass_wildmons ROUTE_49
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, PIDGEY
dbw 31, RATTATA
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, MARILL
dbw 35, SUNFLORA
; day
dbw 30, PIDGEY
dbw 31, RATTATA
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, MARILL
dbw 35, GIRAFARIG
; nite
dbw 30, HOOTHOOT
dbw 31, RATTATA
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, MARILL
dbw 35, SKARMORY
end_grass_wildmons
db -1 ; end

33
data/wild/nihon_water.asm
View file

@ -1,32 +1,17 @@
NihonWaterWildMons:
def_water_wildmons WINNERS_PATH
db 4 percent ; encounter rates: morn/day/nite
dbw 40, MAGIKARP
dbw 41, SEADRA
dbw 40, GRANBO ; SHARPOON
end_water_wildmons
; Placeholder
def_grass_wildmons ROUTE_49_2
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
def_water_wildmons ROUTE_49_2
db 4 percent ; encounter rates: morn/day/nite
dbw 30, MAGIKARP
dbw 31, MAGIKARP
dbw 30, MAGIKARP
dbw 31, MAGIKARP
dbw 32, MAGIKARP
dbw 32, MAGIKARP
dbw 35, MAGIKARP
; day
dbw 30, MAGIKARP
dbw 31, MAGIKARP
dbw 30, MAGIKARP
dbw 31, MAGIKARP
dbw 32, MAGIKARP
dbw 32, MAGIKARP
dbw 35, MAGIKARP
; nite
dbw 30, MAGIKARP
dbw 31, MAGIKARP
dbw 30, MAGIKARP
dbw 31, MAGIKARP
dbw 32, MAGIKARP
dbw 32, MAGIKARP
dbw 35, MAGIKARP
end_grass_wildmons
end_water_wildmons
db -1 ; end