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"

20
data/text/std_text.asm
View file

@ -260,10 +260,9 @@ TeamRocketOathText:
done
IncenseBurnerText:
text "What is this?"
text "What is this? Ah!"
para "Oh, it's an"
line "incense burner!"
para "It's a butsudan!" ; restored detail, see RG JP script, etc.
done
MerchandiseShelfText:
@ -498,3 +497,18 @@ RegisteredNumber2Text:
text_ram wStringBuffer3
text "'s number."
done
OldMagazinesText:
text "It's full of old"
line "magazines…"
done
OldBooksText:
text "Stuffed full of"
line "old #MON books!"
para "The techniques"
line "described…" ; This is softly alluding to the trainers with whips and how Pokemon swiftly steered away with this after RG. Tamers should keep this sort of thing going, as should Rockets.
para "Never mind!"
done

BIN
data/tilesets/lavendercrypt_attributes.bin
View file

Binary file not shown.

41
data/tilesets/lavendercrypt_collision.asm
View file

@ -15,7 +15,7 @@
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
tilecoll WALL, WALL, DOOR, DOOR ; 11
tilecoll WALL, WALL, WALL, DOOR ; 11
tilecoll WALL, WALL, WALL, WALL ; 12
tilecoll WALL, WALL, WALL, WALL ; 13
tilecoll WALL, WALL, WALL, FLOOR ; 14
@ -109,10 +109,10 @@
tilecoll WALL, WALL, WALL, WALL ; 6c
tilecoll WALL, WALL, WALL, WALL ; 6d
tilecoll WALL, WALL, WALL, WALL ; 6e
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72
tilecoll WALL, WALL, WALL, WALL ; 6f
tilecoll WALL, WALL, WALL, WALL ; 70
tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 71
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 72
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73
tilecoll WALL, WALL, WALL, DOOR ; 74
tilecoll WALL, WALL, WALL, WALL ; 75
@ -126,3 +126,34 @@
tilecoll WALL, DOOR, WALL, FLOOR ; 7d
tilecoll DOOR, WALL, FLOOR, WALL ; 7e
tilecoll FLOOR, WALL, FLOOR, WALL ; 7f
tilecoll WALL, WALL, FLOOR, FLOOR ; 80
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 81
tilecoll WALL, WALL, FLOOR, FLOOR ; 82
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83
tilecoll FLOOR, FLOOR, WALL, WALL ; 84
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 85
tilecoll WALL, WALL, WALL, WALL ; 86
tilecoll INCENSE_BURNER, WALL, FLOOR, FLOOR ; 87
tilecoll WALL, WALL, FLOOR, FLOOR ; 88
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 89
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8a
tilecoll WALL, WALL, WALL, DOOR ; 8b
tilecoll WALL, WALL, WALL, DOOR ; 8c
tilecoll WALL, WALL, FLOOR, FLOOR ; 8d
tilecoll WALL, FLOOR, WALL, FLOOR ; 8e
tilecoll WALL, WALL, FLOOR, FLOOR ; 8f
tilecoll WALL, WALL, WALL, WALL ; 90
tilecoll WALL, WALL, DOOR, WALL ; 91
tilecoll WALL, WALL, DOOR, WALL ; 92
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 93
tilecoll WALL, FLOOR, WALL, FLOOR ; 94
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 95
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 96
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 97
tilecoll WALL, WALL, WALL, WALL ; 98
tilecoll WALL, WALL, WALL, WALL ; 99
tilecoll WALL, WALL, WALL, WALL ; 9a
tilecoll WALL, WALL, WALL, WALL ; 9b
tilecoll WALL, WALL, FLOOR, FLOOR ; 9c
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 9d
tilecoll WALL, WALL, FLOOR, FLOOR ; 9e

BIN
data/tilesets/lavendercrypt_metatiles.bin
View file

Binary file not shown.

4
data/tilesets/tower_collision.asm
View file

@ -81,8 +81,8 @@
tilecoll FLOOR, FLOOR, WALL, WALL ; 50
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 51
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 52
tilecoll WALL, WALL, FLOOR, FLOOR ; 53
tilecoll WALL, WALL, FLOOR, FLOOR ; 54
tilecoll INCENSE_BURNER, WALL, FLOOR, FLOOR ; 53
tilecoll WALL, INCENSE_BURNER, FLOOR, FLOOR ; 54
tilecoll WALL, WALL, FLOOR, FLOOR ; 55
tilecoll WALL, WALL, FLOOR, FLOOR ; 56
tilecoll WALL, WALL, FLOOR, FLOOR ; 57

86
data/wild/johto_grass.asm
View file

@ -1808,5 +1808,89 @@ JohtoGrassWildMons:
dbw 23, NOCTOWL
dbw 25, MURKROW
end_grass_wildmons
def_grass_wildmons HAUNTED_HOUSE_FOYER
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
dbw 36, MISDREAVUS
dbw 37, MISDREAVUS
dbw 36, GASTLY
dbw 35, VULPIX
dbw 37, WISPIRIT
dbw 37, HAUNTER
dbw 38, HAUNTER
; day
dbw 36, MISDREAVUS
dbw 37, MISDREAVUS
dbw 36, GASTLY
dbw 35, VULPIX
dbw 37, WISPIRIT
dbw 37, HAUNTER
dbw 38, HAUNTER
; nite
dbw 36, MISDREAVUS
dbw 35, MISDREAVUS
dbw 36, GASTLY
dbw 37, BELLEDAM
dbw 37, WISPIRIT
dbw 38, HAUNTER
dbw 40, GENGAR
end_grass_wildmons
def_grass_wildmons HAUNTED_HOUSE_1F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
dbw 36, MISDREAVUS
dbw 37, MISDREAVUS
dbw 36, GASTLY
dbw 35, VULPIX
dbw 37, WISPIRIT
dbw 37, HAUNTER
dbw 38, HAUNTER
; day
dbw 36, MISDREAVUS
dbw 37, MISDREAVUS
dbw 36, GASTLY
dbw 35, VULPIX
dbw 37, WISPIRIT
dbw 37, HAUNTER
dbw 38, HAUNTER
; nite
dbw 36, MISDREAVUS
dbw 35, MISDREAVUS
dbw 36, GASTLY
dbw 37, BELLEDAM
dbw 37, WISPIRIT
dbw 38, HAUNTER
dbw 40, GENGAR
end_grass_wildmons
def_grass_wildmons HAUNTED_HOUSE_2F
db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite
; morn
dbw 36, MISDREAVUS
dbw 37, MISDREAVUS
dbw 36, GASTLY
dbw 35, VULPIX
dbw 37, WISPIRIT
dbw 37, HAUNTER
dbw 38, HAUNTER
; day
dbw 36, MISDREAVUS
dbw 37, MISDREAVUS
dbw 36, GASTLY
dbw 35, VULPIX
dbw 37, WISPIRIT
dbw 37, HAUNTER
dbw 38, HAUNTER
; nite
dbw 36, MISDREAVUS
dbw 35, MISDREAVUS
dbw 36, GASTLY
dbw 37, BELLEDAM
dbw 37, WISPIRIT
dbw 38, HAUNTER
dbw 40, GENGAR
end_grass_wildmons
db -1 ; end