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

Quiet Cave

Browse source 
This adds Quiet Cave, with all the relevant details. Wild Pokemon still don't appear, though.

I defined it as a route, as if it were a cave, the Pokemon would jump out anywhere, regardless of grass.
This commit is contained in:
Llinos Evans 2023-11-04 01:47:45 +00:00
parent 8de60fe1a8
commit e7fb81e28e
19 changed files with 359 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

1
data/maps/attributes.asm
View file

@ -715,3 +715,4 @@ ENDM
map_attributes CliffCave, CLIFF_CAVE, $00, 0
map_attributes Route49, ROUTE_49, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes QuietCave, QUIET_CAVE, $00, 0

3
data/maps/blocks.asm
View file

@ -1089,3 +1089,6 @@ BlueForest_Blocks:
Route49_Blocks:
INCBIN "maps/Route49.ablk"
QuietCave_Blocks:
INCBIN "maps/QuietCave.ablk"

2
data/maps/landmarks.asm
View file

@ -110,6 +110,7 @@ Landmarks:
assert_table_length NIHON_LANDMARK
landmark 92, 108, SilentHillsName
landmark 91, 108, Route49Name ; probably not correct
landmark 91, 108, QuietCaveName ; probably not correct
landmark 140, 60, BlueForestName
assert_table_length NUM_LANDMARKS
@ -218,4 +219,5 @@ BattleTowerName: db "BATTLE¯TOWER@"
SpecialMapName: db "SPECIAL@"
SilentHillsName: db "SILENT¯HILLS@"
Route49Name: db "ROUTE 49@"
QuietCaveName: db "QUIET¯CAVE@"
BlueForestName: db "BLUE¯FOREST@"

1
data/maps/maps.asm
View file

@ -558,6 +558,7 @@ MapGroup_SilentHills:
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_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_MORN, 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
assert_table_length NUM_SILENT_HILLS_MAPS
MapGroup_BlueForest:

28
data/maps/outdoor_sprites.asm
View file

@ -673,3 +673,31 @@ CableClubGroupSprites:
db SPRITE_FISHING_GURU
db SPRITE_POKE_BALL
db SPRITE_POKEDEX
SilentHillsGroupSprites:
; 12 non-walking filler sprites
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
db SPRITE_POKEDEX
db SPRITE_WILL
db SPRITE_KAREN
db SPRITE_NURSE
db SPRITE_OLD_LINK_RECEPTIONIST
db SPRITE_BIG_LAPRAS
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_BIG_SNORLAX
db SPRITE_RIVAL
db SPRITE_TEACHER
db SPRITE_FISHER
; 9 walking sprites
db SPRITE_COOLTRAINER_M
db SPRITE_YOUNGSTER
db SPRITE_MONSTER
db SPRITE_BEAUTY
db SPRITE_BUG_CATCHER
db SPRITE_ROCKER
; 2 non-walking sprites
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE

1
data/maps/scripts.asm
View file

@ -502,3 +502,4 @@ INCLUDE "maps/DebugRoom.asm"
INCLUDE "maps/CliffCave.asm"
INCLUDE "maps/Route49.asm"
INCLUDE "maps/BlueForest.asm"
INCLUDE "maps/QuietCave.asm"

6
data/pokemon/menu_icons.asm
View file

@ -192,9 +192,9 @@ MonMenuIcons:
db ICON_FOX ; CUBBURN
db ICON_FOX ; FLAMBEAR
db ICON_FOX ; BRUINOUS
db ICON_SERPENT ; PALSSIO
db ICON_SERPENT ; PRESSIO
db ICON_SERPENT ; DONMARIN
db ICON_LAPRAS ; PALSSIO
db ICON_LAPRAS ; PRESSIO
db ICON_LAPRAS ; DONMARIN
db ICON_FOX ; SENTRET
db ICON_FOX ; FURRET
db ICON_BIRD ; HOOTHOOT

BIN
data/tilesets/nihon01_attributes.bin
View file

Binary file not shown.

42
data/tilesets/nihon01_collision.asm
View file

@ -47,25 +47,25 @@
tilecoll FLOOR, FLOOR, WALL, WALL ; 2e
tilecoll FLOOR, FLOOR, WALL, WALL ; 2f
tilecoll WALL, WALL, FLOOR, WALL ; 30
tilecoll WALL, WALL, FLOOR, WALL ; 31
tilecoll BUOY, BUOY, WATER, BUOY ; 32
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32
tilecoll FLOOR, FLOOR, WALL, WALL ; 33
tilecoll BUOY, WATER, BUOY, WATER ; 34
tilecoll WALL, HEADBUTT_TREE, FLOOR, WALL ; 34
tilecoll WATER, WATER, WATER, WATER ; 35
tilecoll WATER, BUOY, WATER, BUOY ; 36
tilecoll WALL, WALL, WALL, DOOR ; 37
tilecoll BUOY, WATER, BUOY, BUOY ; 38
tilecoll WATER, WATER, BUOY, BUOY ; 39
tilecoll WATER, BUOY, BUOY, BUOY ; 3a
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e
tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f
tilecoll FLOOR, WALL, FLOOR, WALL ; 36
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 37
tilecoll WALL, FLOOR, WALL, FLOOR ; 38
tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 39
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a
tilecoll WALL, HEADBUTT_TREE, WALL, FLOOR ; 3b
tilecoll WALL, WALL, FLOOR, WALL ; 3c
tilecoll WALL, WALL, FLOOR, FLOOR ; 3d
tilecoll FLOOR, FLOOR, WARP_CARPET_RIGHT, FLOOR ; 3e
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 3f
tilecoll WALL, WALL, WALL, FLOOR ; 40
tilecoll WALL, WALL, FLOOR, FLOOR ; 41
tilecoll WALL, WALL, FLOOR, WALL ; 42
tilecoll WATER, WATER, WATER, WATER ; 43
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 43
tilecoll WALL, FLOOR, WALL, FLOOR ; 44
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45
tilecoll FLOOR, WALL, FLOOR, WALL ; 46
@ -88,22 +88,22 @@
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
tilecoll WATER, WATER, WATER, WATER ; 58
tilecoll WATER, WATER, WATER, WATER ; 59
tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 5a
tilecoll WALL, WALL, WALL, FLOOR ; 5b
tilecoll WALL, WALL, WALL, FLOOR ; 5c
tilecoll WALL, WALL, FLOOR, FLOOR ; 5d
tilecoll WALL, WALL, FLOOR, WALL ; 5e
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f
tilecoll WALL, FLOOR, WALL, FLOOR ; 60
tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61
tilecoll FLOOR, WALL, FLOOR, WALL ; 62
tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 63
tilecoll WALL, FLOOR, WALL, WALL ; 64
tilecoll FLOOR, FLOOR, WALL, WALL ; 65
tilecoll FLOOR, WALL, WALL, WALL ; 66
tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67
tilecoll WALL, FLOOR, WALL, FLOOR ; 68
tilecoll FLOOR, WALL, FLOOR, WALL ; 69
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 67
tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, FLOOR ; 68
tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 69
tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
tilecoll WALL, FLOOR, WALL, WALL ; 6c

BIN
data/tilesets/nihon01_metatiles.bin
View file

Binary file not shown.

32
data/trainers/parties.asm
View file

@ -962,6 +962,14 @@ SchoolboyGroup:
dw ZAP_CANNON, THUNDER_WAVE, LOCK_ON, SWIFT
db -1 ; end
next_list_item ; SCHOOLBOY (23)
db "PERO@", TRAINERTYPE_NORMAL
db 49
dw SLOWKING ; How did bro have a L9 slowking in the spaceworld demo bro
db 49
dw CLOYSTER ; DISTURBAN
db -1 ; end
end_list_items
BirdKeeperGroup:
@ -1730,8 +1738,10 @@ BeautyGroup:
next_list_item ; BEAUTY (3)
db "JULIE@", TRAINERTYPE_NORMAL
db 15
dw SENTRET
db 45
dw FURRET
db 48
dw PERSIAN ; Uses L10 Meowth in SW97 demo
db -1 ; end
next_list_item ; BEAUTY (4)
@ -2466,12 +2476,24 @@ BugCatcherGroup:
next_list_item ; BUG_CATCHER (20)
db "SIONED@", TRAINERTYPE_NORMAL
db 40
dw PARASECT ; Uses L7 Paras in SW97 demo
db 42
dw BARREAU
db 42
dw CARAPTHOR
db -1 ; end
next_list_item ; BUG_CATCHER (21)
db "ELWYN@", TRAINERTYPE_NORMAL
db 40
dw LEDIAN ; Uses L9 Ledian in SW97 demo
db 42
dw TRICULES
db 42
dw BUTTERFREE
db -1 ; end
end_list_items
FisherGroup:
@ -3804,8 +3826,10 @@ FirebreatherGroup:
next_list_item ; FIREBREATHER (2)
db "DICK@", TRAINERTYPE_NORMAL
db 17
dw CHARMELEON
db 43
dw MAGMAR ; MAGMORTAR
db 48
dw CHARIZARD
db -1 ; end
next_list_item ; FIREBREATHER (3)

36
data/wild/nihon_grass.asm
View file

@ -8,7 +8,7 @@ NihonGrassWildMons:
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, METAPOD
dbw 32, MARILL
dbw 35, SUNFLORA
; day
dbw 30, PIDGEY
@ -16,15 +16,43 @@ NihonGrassWildMons:
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, METAPOD
dbw 32, MARILL
dbw 35, GIRAFARIG
; nite
dbw 30, PIDGEY
dbw 30, HOOTHOOT
dbw 31, RATTATA
dbw 30, PIKACHU
dbw 31, MAREEP
dbw 32, HOPPIP
dbw 32, METAPOD
dbw 32, MARILL
dbw 35, SKARMORY
end_grass_wildmons
def_grass_wildmons QUIET_CAVE
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, LEDYBA
dbw 31, LEDYBA
dbw 30, METAPOD
dbw 31, PIKACHU
dbw 32, MARILL
dbw 32, PIDGEY
dbw 35, SUNFLORA
; day
dbw 30, LEDYBA
dbw 31, LEDYBA
dbw 30, METAPOD
dbw 31, PIKACHU
dbw 32, MARILL
dbw 32, PIDGEY
dbw 35, GIRAFARIG
; nite
dbw 30, LEDYBA
dbw 31, LEDYBA
dbw 30, METAPOD
dbw 31, PIKACHU
dbw 32, MARILL
dbw 32, HOOTHOOT
dbw 35, SKARMORY
end_grass_wildmons