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

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

7
data/events/engine_flags.asm
View file

@ -108,6 +108,13 @@ EngineFlags:
engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE
engine_flag wVisitedSpawns, SPAWN_BLACKTHORN
engine_flag wVisitedSpawns, SPAWN_MT_SILVER
engine_flag wVisitedSpawns, SPAWN_ONE_ISLAND
engine_flag wVisitedSpawns, SPAWN_TWO_ISLAND
engine_flag wVisitedSpawns, SPAWN_THREE_ISLAND
engine_flag wVisitedSpawns, SPAWN_FOUR_ISLAND
engine_flag wVisitedSpawns, SPAWN_FIVE_ISLAND
engine_flag wVisitedSpawns, SPAWN_SIX_ISLAND
engine_flag wVisitedSpawns, SPAWN_SEVEN_ISLAND
engine_flag wVisitedSpawns, SPAWN_SILENT_HILLS
engine_flag wVisitedSpawns, SPAWN_OLD_CITY
engine_flag wVisitedSpawns, NUM_SPAWNS ; unused

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

92
data/pokemon/ezchat_order.asm
View file

@ -2,94 +2,4 @@
; Notably, Rhydon is missing (it should be before Rhyhorn).
EZChat_SortedPokemon:
dw .a
dw .i
dw .u
dw .e
dw .o
dw .ka_ga
dw .ki_gi
dw .ku_gu
dw .ke_ge
dw .ko_go
dw .sa_za
dw .shi_ji
dw .su_zu
dw .se_ze
dw .so_zo
dw .ta_da
dw .chi_dhi
dw .tsu_du
dw .te_de
dw .to_do
dw .na
dw .ni
dw .nu
dw .ne
dw .no
dw .ha_ba_pa
dw .hi_bi_pi
dw .fu_bu_pu
dw .he_be_pe
dw .ho_bo_po
dw .ma
dw .mi
dw .mu
dw .me
dw .mo
dw .ya
dw .yu
dw .yo
dw .ra
dw .ri
dw .ru
dw .re
dw .ro
dw .wa
dw .end
.a: db EKANS, ARBOK, SEAKING, ARIADOS, CROCONAW, UNOWN, -1
.i: db EEVEE, GEODUDE, SPINARAK, PILOSWINE, ONIX, -1
.u: db ARCANINE, SUDOWOODO, WEEPINBELL, VICTREEBEL, WOOPER, SWINUB, -1
.e: db SKARMORY, AIPOM, ESPEON, HITMONCHAN, ELEKID, ELECTABUZZ, ENTEI, -1
.o: db FERALIGATR, FURRET, OCTILLERY, PRIMEAPE, SENTRET, STANTLER, SPEAROW, FEAROW, OMASTAR, OMANYTE, -1
.ka_ga: db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN, -1
.ki_gi: db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER, -1
.ku_gu: db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT, -1
.ke_ge: db ABRA, GENGAR, TAUROS, -1
.ko_go: db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT, -1
.sa_za: db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH, -1 ; RHYDON should lead this list
.shi_ji: db SEADRA, SHELLDER, VAPOREON, DEWGONG, -1
.su_zu: db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE, -1
.se_ze: db SQUIRTLE, CELEBI, -1
.so_zo: db WOBBUFFET, -1
.ta_da: db DUGTRIO, HORSEA, EXEGGCUTE, -1
.chi_dhi: db CHIKORITA, CHINCHOU, -1
.tsu_du: db SHUCKLE, -1
.te_de: db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS, -1
.to_do: db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN, -1
.na: db ODDISH, EXEGGUTOR, -1
.ni: db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG, -1
.nu: db QUAGSIRE, -1
.ne: db NATU, XATU, -1
.no: db DUNSPARCE, -1
.ha_ba_pa: db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR, -1
.hi_bi_pi: db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB, -1
.fu_bu_pu: db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL, -1
.he_be_pe: db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG, -1
.ho_bo_po: db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2, -1
.ma: db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE, -1
.mi: db DRATINI, MEW, MEWTWO, MILTANK, -1
.mu: db MISDREAVUS, SMOOCHUM, -1
.me: db MEGANIUM, DITTO, TENTACOOL, MAREEP, -1
.mo: db FLAAFFY, VENOMOTH, TANGELA, -1
.ya: db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA, -1
.yu: db KADABRA, -1
.yo: db LARVITAR, NOCTOWL, -1
.ra: db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN, -1
.ri: db CHARMELEON, CHARIZARD, URSARING, -1
.ru: db JYNX, LUGIA, -1
.re: db MAGNETON, LEDIAN, LEDYBA, -1
.ro: db VULPIX, -1
.wa: db JUMPLUFF, TOTODILE, MACHOP ;, -1
.end: db -1
ret ; removed for space among other things

401
data/pokemon/gen1_order.asm
View file

@ -1,399 +1,4 @@
Pokered_MonIndices:
table_width 1, Pokered_MonIndices
db RHYDON
db KANGASKHAN
db NIDORAN_M
db CLEFAIRY
db SPEAROW
db VOLTORB
db NIDOKING
db SLOWBRO
db IVYSAUR
db EXEGGUTOR
db LICKITUNG
db EXEGGCUTE
db GRIMER
db GENGAR
db NIDORAN_F
db NIDOQUEEN
db CUBONE
db RHYHORN
db LAPRAS
db ARCANINE
db MEW
db GYARADOS
db SHELLDER
db TENTACOOL
db GASTLY
db SCYTHER
db STARYU
db BLASTOISE
db PINSIR
db TANGELA
db SCIZOR ; MISSINGNO.
db SHUCKLE ; MISSINGNO.
db NIDOREIGN
db GROWLITHE
db ONIX
db FEAROW
db PIDGEY
db SLOWPOKE
db KADABRA
db GRAVELER
db CHANSEY
db MACHOKE
db MR__MIME
db HITMONLEE
db HITMONCHAN
db ARBOK
db PARASECT
db PSYDUCK
db DROWZEE
db GOLEM
db HERACROSS ; MISSINGNO.
db MAGMAR
db HO_OH ; MISSINGNO.
db ELECTABUZZ
db MAGNETON
db KOFFING
db SNEASEL ; MISSINGNO.
db MANKEY
db SEEL
db DIGLETT
db TAUROS
db TEDDIURSA ; MISSINGNO.
db URSARING ; MISSINGNO.
db SLUGMA ; MISSINGNO.
db FARFETCH_D
db VENONAT
db DRAGONITE
db MAGCARGO ; MISSINGNO.
db SWINUB ; MISSINGNO.
db PILOSWINE ; MISSINGNO.
db DODUO
db POLIWAG
db JYNX
db MOLTRES
db ARTICUNO
db ZAPDOS
db DITTO
db MEOWTH
db KRABBY
db CORSOLA ; MISSINGNO.
db REMORAID ; MISSINGNO.
db OCTILLERY ; MISSINGNO.
db VULPIX
db NINETALES
db PIKACHU
db RAICHU
db DELIBIRD ; MISSINGNO.
db MANTINE ; MISSINGNO.
db DRATINI
db DRAGONAIR
db KABUTO
db KABUTOPS
db HORSEA
db SEADRA
db SKARMORY ; MISSINGNO.
db HOUNDOUR ; MISSINGNO.
db SANDSHREW
db SANDSLASH
db OMANYTE
db OMASTAR
db JIGGLYPUFF
db WIGGLYTUFF
db EEVEE
db FLAREON
db JOLTEON
db VAPOREON
db MACHOP
db ZUBAT
db EKANS
db PARAS
db POLIWHIRL
db POLIWRATH
db WEEDLE
db KAKUNA
db BEEDRILL
db HOUNDOOM ; MISSINGNO.
db DODRIO
db PRIMEAPE
db DUGTRIO
db VENOMOTH
db DEWGONG
db TRICULES
db KINGDRA ; MISSINGNO.
db PHANPY ; MISSINGNO.
db CATERPIE
db METAPOD
db BUTTERFREE
db MACHAMP
db DONPHAN ; MISSINGNO.
db GOLDUCK
db HYPNO
db GOLBAT
db MEWTWO
db SNORLAX
db MAGIKARP
db PORYGON2 ; MISSINGNO.
db STANTLER ; MISSINGNO.
db MUK
db SMEARGLE ; MISSINGNO.
db KINGLER
db CLOYSTER
db TYROGUE ; MISSINGNO.
db ELECTRODE
db CLEFABLE
db WEEZING
db PERSIAN
db MAROWAK
db HITMONTOP ; MISSINGNO.
db HAUNTER
db ABRA
db ALAKAZAM
db PIDGEOTTO
db PIDGEOT
db STARMIE
db BULBASAUR
db VENUSAUR
db TENTACRUEL
db SMOOCHUM ; MISSINGNO.
db GOLDEEN
db SEAKING
db ELEKID ; MISSINGNO.
db MAGBY ; MISSINGNO.
db MILTANK ; MISSINGNO.
db BLISSEY ; MISSINGNO.
db PONYTA
db RAPIDASH
db RATTATA
db RATICATE
db NIDORINO
db NIDORINA
db GEODUDE
db PORYGON
db AERODACTYL
db BLASTYKE
db RAIKOU ; MISSINGNO.
db MAGNEMITE
db ENTEI ; MISSINGNO.
db SUICUNE ; MISSINGNO.
db CHARMANDER
db SQUIRTLE
db CHARMELEON
db WARTORTLE
db CHARIZARD
db TOTARTLE
db LARVITAR ; MISSINGNO.
db PUPITAR ; MISSINGNO. KABUTOPS FOSSIL
db TYRANITAR ; MISSINGNO. AERODACTYL FOSSIL
db LUGIA ; MISSINGNO. GHOST
db ODDISH
db GLOOM
db VILEPLUME
db BELLSPROUT
db WEEPINBELL
db VICTREEBEL
assert_table_length 194 ; gen 1 mon indexes
db CHIKORITA
db BAYLEEF
db MEGANIUM
db CYNDAQUIL
db QUILAVA
db TYPHLOSION
db TOTODILE
db CROCONAW
db FERALIGATR
db CUBBURN
db FLAMBEAR
db BRUINOUS
db PALSSIO
db PRESSIO
db DONMARIN
db SENTRET
db FURRET
db HOOTHOOT
db NOCTOWL
db LEDYBA
db LEDIAN
db SPINARAK
db ARIADOS
db CROBAT
db CHINCHOU
db LANTURN
db PICHU
db CLEFFA
db IGGLYBUFF
db TOGEPI
db TOGETIC
db TOGEKISS
db NATU
db XATU
db MOIBELLE
db BELLEDAM
db MAREEP
db FLAAFFY
db AMPHAROS
db BELLOSSOM
db MARILL
db AZUMARILL
db SUDOWOODO
db POLITOED
db HOPPIP
db SKIPLOOM
db JUMPLUFF
db AIPOM
db SUNKERN
db SUNFLORA
db AERCROW
db YANMA
db PENDING03
db WOOPER
db QUAGSIRE
db ESPEON
db UMBREON
db MURKROW
db SLOWKING
db MISDREAVUS
db MISMAGIUS
db STROMEN
db PHANDARIN
db UNOWN
db WYNAUT
db WOBBUFFET
db BIPULLA
db GIRAFARIG
db FARIGIRAF
db EMORDROME
db PINECO
db FORRETRESS
db DUNSPARCE
db DUDUNSPARCE
db GLIGAR
db STEELIX
db SNUBBULL
db GRANBULL
db QWILFISH
db BELLIGNAN
db WALKING_WAKE
db SHI_SHI
db MUNCHLAX
db KLEAVOR
db URSALUNA
db GOROCHU
db GENTLARVA
db PUPAL
db CARAPTHOR
db KOTORA
db GAOTORA
db GOROTORA
db RAITORA
db BITTYBAT
db VULPIII
db PARASPOR
db ANNIHILAPE
db PUPPERON
db COINPUR
db PERRSERKER
db LEAFEON
db GLACEON
db SYLVEON
db LICKILICKY
db LICKILORD
db BURGELA
db TANGROWTH
db JUNGELA
db FOLAGE
db BARREAU
db RAGING_BOLT
db GOUGING_FIRE
db POCKLE
db WARUCHU
db SONEGG
db CACAWPHONY
db TREBIR
db SAKURAZE
db AMANOBI
db TRUSTAN
db KUWAGUARD
db TONQUITO
db MOLAMBINO
db LUANBO
db GRANBO
db ANGORE
db EUCALA
db KIWOOKED
db CYCLORP
db KITSEN
db WISPIRIT
db COATL
db MIMEAR
db INOSHIKA
db RUDDERNAUT
db XYLODON
db XYLOFIN
db DOKUROAR
db SCREAM_TAIL
db SANDY_SHOCKS
db GREAT_TUSK
db FLUTTER_MANE
db IRON_TREADS
db IRON_BUNDLE
db IRON_THORNS
db ORFRY
db CHEEP
db JABETTA
db RIBBITO
db CROAKOZUNA
db DISTURBAN
db REROAD
db QATU
db AZURILL
db AMBIPOM
db SUNBUD
db HIPPUNK
db FOXFIRE
db YANMEGA
db KAZAPPELIN
db QWILFATHER
db STRICHEEL
db LURREEL
db MANTYKE
db WEIRDUCK
db LUXWAN
db CHARMADA
db MAGIPREY
db TERRADOS
db TOEDSCOOL
db TOEDSCRUEL
db BLOTTLE
db PENDRAKEN
db KOLTA
db BALUMBA
db MAGNETITE
db MAGNEZONE
db GAVILLAIN
db BUU
db GRENMAR
db SMUJJ
db GUARDIA
db HAPPINY
db MIME_JR_
db ELECTIVIRE
db MAGMORTAR
db MIMMEO
db SQUEAMATA
db MINISTARE
db IGUANARCH
db BONSLY
db HONCHKROW
db CARETORKER
db PORYGON_Z
db WYRDEER
db ELEBEBI
db FERADACTYL
db DECILLA
db GAWARHED
db MAMOSWINE
db HIRSUSWINE
assert_table_length NUM_POKEMON - 1
ret ; this has been removed as it's unnecessary and makes debugging extremely difficult - we're removing the compatibility with KEP anyway
; if you want to make a new list, then go ahead, just make sure to let us know and all that

2
data/trainers/parties.asm
View file

@ -485,7 +485,7 @@ PKMNTrainerGroup:
dw PIDGEOT
dw DOUBLE_EDGE, WING_ATTACK, MIRROR_MOVE, PURSUIT
db 60
db PILOSWINE ; MAMOSWINE
dw PILOSWINE ; MAMOSWINE
dw EARTHQUAKE, BODY_SLAM, ROAR, ANCIENTPOWER
db 60
dw SLOWKING

38
data/wild/sevii_grass.asm Normal file
View file

@ -0,0 +1,38 @@
; Sevii Pokémon in grass
; General philosophies:
; - Alolan Pokemon will be encounterable, as the Sevii Islands are a tropical area.
; - It's still Kanto, so we will feature more Kanto than Johto Pokemon. Basically, this will use the "classic Johto" philosophy of hiding them in the back.
; - Minimal, if any, Nihon Pokemon.
SeviiGrassWildMons:
def_grass_wildmons KINDLE_ROAD
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, FEAROW
dbw 31, PERSIAN ; PERSIANA
dbw 30, GOLDUCK
dbw 31, GRAVELER ; GRAVELERA
dbw 32, RAPIDASH
dbw 32, SLOWBRO ; Could be Galarian Slowbro considering the Isle of Armor but I'm not sure, given this would mix regional variant origins...
dbw 35, SLOWKING
; day
dbw 30, FEAROW
dbw 31, PERSIAN ; PERSIANA
dbw 30, GOLDUCK
dbw 31, GRAVELER ; GRAVELERA
dbw 32, RAPIDASH
dbw 32, SLOWBRO
dbw 35, SLOWKING
; nite
dbw 30, NOCTOWL
dbw 31, PERSIAN
dbw 30, MURKROW
dbw 31, GRAVELER
dbw 32, RAPIDASH
dbw 32, SLOWBRO
dbw 35, SLOWKING
end_grass_wildmons
db -1 ; end

17
data/wild/sevii_water.asm Normal file
View file

@ -0,0 +1,17 @@
; Sevii Pokémon in grass
; General philosophies:
; - Alolan Pokemon will be encounterable, as the Sevii Islands are a tropical area.
; - It's still Kanto, so we will feature more Kanto than Johto Pokemon. Basically, this will use the "classic Johto" philosophy of hiding them in the back.
; - Minimal, if any, Nihon Pokemon.
SeviiWaterWildMons:
def_water_wildmons KINDLE_ROAD
db 4 percent ; encounter rates: morn/day/nite
dbw 30, GRENMAR ; Water/Fire, y'know, it's kinda cute
dbw 31, SEADRA
dbw 30, GYARADOS
end_water_wildmons
db -1 ; end