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

Haunted House groundwork

Browse source 
Adds the Haunted House with wild data, warps, and most of the house itself done.

Gengar Doll is set to be a boss fight, needs walking sprites among other things.

BG events need a bit more fleshing out.

Needs integration for the loose board mechanic.

Otherwise extremely fleshed-out.
This commit is contained in:
Llinos Evans 2024-08-15 20:49:25 +01:00
parent 4905e4246f
commit 6e832f06d8
25 changed files with 587 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/maps/attributes.asm
View file

@ -736,6 +736,9 @@ ENDM
map_attributes SeafoamIslandsB2F, SEAFOAM_ISLANDS_B2F, $00, 0 ; Bank 1
map_attributes SeafoamIslandsB3F, SEAFOAM_ISLANDS_B3F, $00, 0 ; Bank 1
map_attributes SeafoamIslandsB4F, SEAFOAM_ISLANDS_B4F, $00, 0 ; Bank 1
map_attributes HauntedHouseFoyer, HAUNTED_HOUSE_FOYER, $00, 0
map_attributes HauntedHouse1F, HAUNTED_HOUSE_1F, $00, 0
map_attributes HauntedHouse2F, HAUNTED_HOUSE_2F, $00, 0
; Citrine City Maps
map_attributes CitrineCity, CITRINE_CITY, $00, 0 ; Bank 2

9
data/maps/blocks.asm
View file

@ -1282,4 +1282,13 @@ CapeBrink_Blocks:
SummerBeachHouse_Blocks:
INCBIN "maps/SummerBeachHouse.ablk"
HauntedHouseFoyer_Blocks:
INCBIN "maps/HauntedHouseFoyer.ablk"
HauntedHouse1F_Blocks:
INCBIN "maps/HauntedHouse1F.ablk"
HauntedHouse2F_Blocks:
INCBIN "maps/HauntedHouse2F.ablk"

1
data/maps/landmarks.asm
View file

@ -55,6 +55,7 @@ Landmarks:
landmark 132, 44, BlackthornCityName
landmark 132, 36, DragonsDenName
landmark 132, 64, Route45Name
landmark 124, 68, HauntedHouseName
landmark 112, 72, DarkCaveName
landmark 124, 88, Route46Name
landmark 148, 68, SilverCaveName

3
data/maps/maps.asm
View file

@ -436,6 +436,9 @@ MapGroup_Lavender:
map LavenderCryptSet2, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
map LavenderCryptSet3, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
map LavenderCryptDokuroarsRoom, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_LAVENDER_TOWN, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
map HauntedHouseFoyer, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
map HauntedHouse1F, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
map HauntedHouse2F, TILESET_LAVENDER_CRYPT, CAVE, LANDMARK_HAUNTED_HOUSE, MUSIC_LAVENDER_TOWN, TRUE, PALETTE_NITE, FISHGROUP_NONE
assert_table_length NUM_LAVENDER_MAPS
MapGroup_Silver:

3
data/maps/scripts.asm
View file

@ -603,6 +603,9 @@ INCLUDE "maps/LavenderCryptDokuroarsRoom.asm"
INCLUDE "maps/Route50.asm"
INCLUDE "maps/JackysHouse.asm"
INCLUDE "maps/SummerBeachHouse.asm"
INCLUDE "maps/HauntedHouseFoyer.asm"
INCLUDE "maps/HauntedHouse1F.asm"
INCLUDE "maps/HauntedHouse2F.asm"
SECTION "Map Scripts 31", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"