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

Sevii Region groundwork

Browse source 
This adds the baseline infrastructure to account for the Sevii Islands, while also fixing a couple of bugs. Zeta, please read the commit carefully!

Only real issue I noticed was that scrolling on the town map is infinite in all three new regions, implying there's something in `pokegear.asm` I haven't accounted for.

I've also ret'd the ezchat order and gen1 orders out of existence to reduce the sheer amount of 8-bit warnings. This abolishes gen1 compatibility (though this was already a bit fucked) in exchange for actually being able to debug things in a reasonable timeframe.
This commit is contained in:
Llinos Evans 2024-08-06 15:30:37 +01:00
parent 08cea5888f
commit 4432dd4d2f
27 changed files with 425 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

9
data/maps/flypoints.asm
View file

@ -27,6 +27,15 @@ Flypoints:
db LANDMARK_FUCHSIA_CITY, SPAWN_FUCHSIA
db LANDMARK_CINNABAR_ISLAND, SPAWN_CINNABAR
db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO
; Sevii 1
db LANDMARK_ONE_ISLAND, SPAWN_ONE_ISLAND
db LANDMARK_TWO_ISLAND, SPAWN_TWO_ISLAND
db LANDMARK_THREE_ISLAND, SPAWN_THREE_ISLAND
db LANDMARK_FOUR_ISLAND, SPAWN_FOUR_ISLAND
db LANDMARK_FIVE_ISLAND, SPAWN_FIVE_ISLAND
db LANDMARK_SIX_ISLAND, SPAWN_SIX_ISLAND
db LANDMARK_SEVEN_ISLAND, SPAWN_SEVEN_ISLAND
; Sevii 2
; Nihon
db LANDMARK_SILENT_HILLS, SPAWN_SILENT_HILLS
db LANDMARK_OLD_CITY, SPAWN_OLD_CITY

26
data/maps/landmarks.asm
View file

@ -122,13 +122,15 @@ Landmarks:
landmark 20, 68, Route28Name
landmark 140, 116, FastShipName
; Sevii stuff
landmark 0, 0, UnknownName ; One Island
landmark 0, 0, UnknownName ; Two Island
landmark 0, 0, UnknownName ; Three Island
landmark 0, 0, UnknownName ; Four Island
landmark 0, 0, UnknownName ; Five Island
landmark 0, 0, UnknownName ; Six Island
landmark 0, 0, UnknownName ; Seven Island
assert_table_length SEVII_LANDMARK_1
landmark 28, 52, OneIslandName ; One Island
landmark 60, 44, TwoIslandName ; Two Island
landmark 132, 52, ThreeIslandName ; Three Island
landmark 28, 108, FourIslandName ; Four Island
landmark 116, 100, FiveIslandName ; Five Island
assert_table_length SEVII_LANDMARK_2
landmark 44, 76, SixIslandName ; Six Island
landmark 116, 76, SevenIslandName ; Seven Island
assert_table_length NIHON_LANDMARK
landmark 108, 116, WinnersPathName
landmark 92, 108, SilentHillsName
@ -246,6 +248,16 @@ TohjoFallsName: db "TOHJO FALLS@"
UndergroundName: db "UNDERGROUND@"
BattleTowerName: db "BATTLE¯TOWER@"
SpecialMapName: db "SPECIAL@"
; Sevii
OneIslandName: db "ONE¯ISLAND@"
TwoIslandName: db "TWO¯ISLAND@"
ThreeIslandName: db "THREE¯ISLAND@"
FourIslandName: db "FOUR¯ISLAND@"
FiveIslandName: db "FIVE¯ISLAND@"
; these would be in cat 2
SixIslandName: db "SIX¯ISLAND@"
SevenIslandName: db "SEVEN¯ISLAND@"
; Nihon
WinnersPathName: db "WINNER'S¯PATH@"
SilentHillsName: db "SILENT¯HILLS@"
UnknownName: db "?????@"

8
data/maps/spawn_points.asm
View file

@ -39,6 +39,14 @@ SpawnPoints:
spawn SILVER_CAVE_OUTSIDE, 23, 20
spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
spawn ONE_ISLAND, 17, 7
spawn TWO_ISLAND, 17, 7 ; these are placeholders and hopefully zeta will make them all good and proper them before testing
spawn THREE_ISLAND, 17, 7
spawn FOUR_ISLAND, 17, 7
spawn FIVE_ISLAND, 17, 7
spawn SIX_ISLAND, 17, 7
spawn SEVEN_ISLAND, 17, 7
spawn SILENT_HILLS, 13, 5
spawn OLD_CITY, 27, 29