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

2
engine/overworld/landmarks.asm
View file

@ -68,7 +68,7 @@ RegionCheck:
.checkagain
cp NIHON_LANDMARK
jr z, .nihon
jr nc, .nihon
cp KANTO_LANDMARK
jr c, .johto

40
engine/overworld/wildmons.asm
View file

@ -38,8 +38,12 @@ FindNest:
ld b, h
ld c, l
ld a, e
cp 2
cp NIHON_REGION
jr z, .nihon
cp SEVII_REGION_2
jr z, .sevii ; these areas are small enough to that we shouldn't need two separate tables for these regions.
cp SEVII_REGION_1
jr z, .sevii
and a
jr nz, .kanto
decoord 0, 0
@ -58,6 +62,13 @@ FindNest:
ld hl, KantoWaterWildMons
jp .FindWater
.sevii
decoord 0, 0
ld hl, SeviiGrassWildMons
call .FindGrass
ld hl, SeviiWaterWildMons
jp .FindWater
.nihon
decoord 0, 0
ld hl, NihonGrassWildMons
@ -439,7 +450,7 @@ _GrassWildmonLookup:
ld hl, JohtoGrassWildMons
; Old Nihon Check from 2023.
; Testing new method.
; it's painfully broken and bad, don't use it unless you have brighter ideas for the below
; Nihon Check
; Basically, conditionally load Nihon or Kanto into de, depending on region check.
; IsInJohto returns 1 if Kanto, 2 if Nihon.
@ -463,9 +474,16 @@ _GrassWildmonLookup:
ld c, a
call GetWorldMapLocation
cp NIHON_LANDMARK
jr nc, .skip2
jr nc, .johto
; account for sevii
ld de, SeviiGrassWildMons
cp SEVII_LANDMARK_2 ; I am 90% sure this check is unnecessary when in tandem with landmark 1.
jr nc, .johto
cp SEVII_LANDMARK_1
jr nc, .johto
ld de, KantoGrassWildMons
.skip2
.johto
call _JohtoWildmonCheck ; So run this check. More commentary there.
ld bc, GRASS_WILDDATA_LENGTH
@ -486,9 +504,17 @@ _WaterWildmonLookup:
ld c, a
call GetWorldMapLocation
cp NIHON_LANDMARK
jr nc, .skip2
jr nc, .johto
; account for sevii
ld de, SeviiWaterWildMons
cp SEVII_LANDMARK_2
jr nc, .johto
cp SEVII_LANDMARK_1
jr nc, .johto
ld de, KantoWaterWildMons
.skip2
.johto
call _JohtoWildmonCheck
ld bc, WATER_WILDDATA_LENGTH
@ -1074,6 +1100,8 @@ INCLUDE "data/wild/johto_grass.asm"
INCLUDE "data/wild/johto_water.asm"
INCLUDE "data/wild/kanto_grass.asm"
INCLUDE "data/wild/kanto_water.asm"
INCLUDE "data/wild/sevii_grass.asm"
INCLUDE "data/wild/sevii_water.asm"
INCLUDE "data/wild/nihon_grass.asm"
INCLUDE "data/wild/nihon_water.asm"
INCLUDE "data/wild/swarm_grass.asm"

194
engine/pokegear/pokegear.asm
View file

@ -19,12 +19,16 @@ DEF PHONE_DISPLAY_HEIGHT EQU 4
const POKEGEARSTATE_KANTOMAPJOYPAD ; 6
const POKEGEARSTATE_NIHONMAPINIT ; 5
const POKEGEARSTATE_NIHONMAPJOYPAD ; 6
const POKEGEARSTATE_PHONEINIT ; 7
const POKEGEARSTATE_PHONEJOYPAD ; 8
const POKEGEARSTATE_MAKEPHONECALL ; 9
const POKEGEARSTATE_FINISHPHONECALL ; a
const POKEGEARSTATE_RADIOINIT ; b
const POKEGEARSTATE_RADIOJOYPAD ; c
const POKEGEARSTATE_SEVII1MAPINIT ; 7
const POKEGEARSTATE_SEVII1MAPJOYPAD ; 8
const POKEGEARSTATE_SEVII2MAPINIT ; 9
const POKEGEARSTATE_SEVII2MAPJOYPAD ; 0A
const POKEGEARSTATE_PHONEINIT ; 0B
const POKEGEARSTATE_PHONEJOYPAD ; 0C
const POKEGEARSTATE_MAKEPHONECALL ; 0D
const POKEGEARSTATE_FINISHPHONECALL ; 0E
const POKEGEARSTATE_RADIOINIT ; 0F
const POKEGEARSTATE_RADIOJOYPAD ; 10
PokeGear:
ld hl, wOptions
@ -330,6 +334,10 @@ InitPokegearTilemap:
jr z, .johto
cp NIHON_LANDMARK
jr nc, .nihon
cp SEVII_LANDMARK_1
jr nc, .sevii1
cp SEVII_LANDMARK_2
jr nc, .sevii2
cp KANTO_LANDMARK
jr nc, .kanto
.johto
@ -339,9 +347,14 @@ InitPokegearTilemap:
.kanto
ld e, 1
jr .ok
.nihon
.sevii1
ld e, 2
jr .ok
.sevii2
ld e, 3
jr .ok
.nihon
ld e, 4
.ok
farcall PokegearMap
ld a, $07
@ -452,6 +465,10 @@ PokegearJumptable:
dw PokegearMap_Init
dw PokegearMap_KantoMap
dw PokegearMap_Init
dw PokegearMap_Sevii1Map
dw PokegearMap_Init
dw PokegearMap_Sevii2Map
dw PokegearMap_Init
dw PokegearMap_NihonMap
dw PokegearPhone_Init
dw PokegearPhone_Joypad
@ -540,12 +557,18 @@ Pokegear_UpdateClock:
PokegearMap_CheckRegion:
ld a, [wPokegearMapPlayerIconLandmark]
; let's check sevii first - checking the highest ones first simplifies architecture a bit.
cp LANDMARK_SEVEN_ISLAND+1
jr c, .nihon
cp LANDMARK_FAST_SHIP+1
jr c, .sevii1
cp LANDMARK_FIVE_ISLAND+1
jr c, .sevii2
cp LANDMARK_SILVER_CAVE+1
jr c, .johto
cp LANDMARK_FAST_SHIP+1
jr c, .kanto
;cp NIHON_LANDMARK
jp .nihon
jp .nihon ; if all else fails
.johto
ld a, POKEGEARSTATE_JOHTOMAPINIT
jr .done
@ -555,7 +578,14 @@ PokegearMap_CheckRegion:
ld a, POKEGEARSTATE_KANTOMAPINIT
jr .done
ret
.sevii1
ld a, POKEGEARSTATE_SEVII1MAPINIT
jr .done
ret
.sevii2
ld a, POKEGEARSTATE_SEVII2MAPINIT
jr .done
ret
.nihon
ld a, POKEGEARSTATE_NIHONMAPINIT
.done
@ -581,6 +611,14 @@ PokegearMap_KantoMap:
call TownMap_GetKantoLandmarkLimits
jr PokegearMap_ContinueMap
PokegearMap_Sevii1Map:
call TownMap_GetSevii1LandmarkLimits
jr PokegearMap_ContinueMap
PokegearMap_Sevii2Map:
call TownMap_GetSevii2LandmarkLimits
jr PokegearMap_ContinueMap
PokegearMap_NihonMap:
call TownMap_GetNihonLandmarkLimits
jr PokegearMap_ContinueMap
@ -761,10 +799,24 @@ TownMap_GetKantoLandmarkLimits:
ld e, LANDMARK_PALLET_TOWN
ret
; BUG: For some reason, backward scrolling on the new regions is infinite!
; You end up having Red call the player's name with 9999s and stuff it's really cool actually
TownMap_GetSevii1LandmarkLimits:
ld a, [wStatusFlags]
ld d, LANDMARK_ONE_ISLAND
ld e, LANDMARK_FIVE_ISLAND ; This will need to be changed as Five Island's stuff is added.
ret
TownMap_GetSevii2LandmarkLimits:
ld a, [wStatusFlags]
ld d, LANDMARK_SIX_ISLAND
ld e, LANDMARK_SEVEN_ISLAND ; Likewise. Veeery likewise.
ret
TownMap_GetNihonLandmarkLimits:
ld a, [wStatusFlags]
ld d, LANDMARK_SILENT_HILLS
ld e, LANDMARK_WHITE_CITY ; Gonna need another map.
ld e, LANDMARK_WHITE_CITY
ret
PokegearRadio_Init:
@ -1574,7 +1626,7 @@ RadioChannels:
jr z, .johto
cp LANDMARK_SILVER_CAVE+1
jr c, .johto
; kanto or nihon
; kanto or nihon (and sevii too i take it)
and a
ret
@ -1838,6 +1890,10 @@ _TownMap:
ld a, [wTownMapPlayerIconLandmark]
cp NIHON_LANDMARK
jr nc, .nihon
cp SEVII_LANDMARK_1
jr nc, .sevii1
cp SEVII_LANDMARK_2
jr nc, .sevii2
cp KANTO_LANDMARK
jr nc, .kanto
ld d, KANTO_LANDMARK - 1
@ -1849,6 +1905,14 @@ _TownMap:
call TownMap_GetKantoLandmarkLimits
call .loop
.sevii1
call TownMap_GetSevii1LandmarkLimits
call .loop
.sevii2
call TownMap_GetSevii2LandmarkLimits
call .loop
.nihon
call TownMap_GetNihonLandmarkLimits
call .loop
@ -1925,19 +1989,29 @@ _TownMap:
.InitTilemap:
ld a, [wTownMapPlayerIconLandmark]
cp LANDMARK_FAST_SHIP+1
jr c, .sevii1
cp LANDMARK_FIVE_ISLAND+1
jr c, .sevii2
cp LANDMARK_SEVEN_ISLAND+1
jr c, .nihon
cp LANDMARK_SILVER_CAVE + 1 ; last johto landmark + 1
jr c, .johto2
cp LANDMARK_FAST_SHIP + 1 ; last kanto landmark + 1
jr c, .kanto2
jp .nihon2
jp .nihon2 ; error handler
.johto2
ld e, JOHTO_REGION
jr .okay_tilemap
.kanto2
ld e, KANTO_REGION
jr .okay_tilemap
.sevii12
ld e, SEVII_REGION_1
jr .okay_tilemap
.sevii22
ld e, SEVII_REGION_2
jr .okay_tilemap
.nihon2
ld e, NIHON_REGION
.okay_tilemap
@ -2063,11 +2137,25 @@ PokegearMap:
.kanto
cp KANTO_REGION
jr nz, .nihon
jr nz, .sevii1
call LoadTownMapGFX
call FillKantoMap
ret
.sevii1
cp SEVII_REGION_1
jr nz, .sevii2
call LoadTownMapGFX
call FillSevii1Map
ret
.sevii2
cp SEVII_REGION_2
jr nz, .nihon
call LoadTownMapGFX
call FillSevii2Map
ret
.nihon
call LoadTownMapGFX
call FillNihonMap
@ -2317,8 +2405,12 @@ FlyMap:
; The first 46 locations are part of Johto. The rest are in Kanto.
cp NIHON_LANDMARK
jr nc, .NihonFlyMap
cp SEVII_LANDMARK_1
jr nc, .Sevii1FlyMap
cp SEVII_LANDMARK_2
jp nc, .Sevii2FlyMap
cp KANTO_LANDMARK
jr nc, .KantoFlyMap
jp nc, .KantoFlyMap
; Johto fly map
; Note that .NoKanto should be modified in tandem with this branch
push af
@ -2343,6 +2435,7 @@ FlyMap:
; To prevent both of these things from happening when the player
; enters Kanto, fly access is restricted until Indigo Plateau is
; visited and its flypoint enabled.
; the nihon and sevii areas inherit this which is probably quite iffy given winner's path exists but hey
push af
ld c, SPAWN_INDIGO
call HasVisitedSpawn
@ -2362,14 +2455,6 @@ FlyMap:
ret
.NihonFlyMap:
; The event that there are no flypoints enabled in a map is not
; accounted for. As a result, if you attempt to select a flypoint
; when there are none enabled, the game will crash. Additionally,
; the flypoint selection has a default starting point that
; can be flown to even if none are enabled.
; To prevent both of these things from happening when the player
; enters Kanto, fly access is restricted until Indigo Plateau is
; visited and its flypoint enabled.
push af
ld c, SPAWN_SILENT_HILLS
call HasVisitedSpawn
@ -2388,6 +2473,44 @@ FlyMap:
call TownMapPlayerIcon
ret
.Sevii1FlyMap:
push af
ld c, SPAWN_ONE_ISLAND
call HasVisitedSpawn
and a
jr z, .NoKanto
; Nihon's map is only loaded if we've visited Silent Hills
ld a, SEVII_FLYPOINT_1 ; first sevii1 flypoint
ld [wStartFlypoint], a
ld a, SEVII_FLYPOINT_2 - 1 ; last sevii1 flypoint
ld [wEndFlypoint], a
ld [wTownMapPlayerIconLandmark], a ; last one is default (Silent Hills)
; Fill out the map
call FillSevii1Map
call .MapHud
pop af
call TownMapPlayerIcon
ret
.Sevii2FlyMap:
push af
ld c, SPAWN_FIVE_ISLAND
call HasVisitedSpawn
and a
jr z, .NoKanto
; Nihon's map is only loaded if we've visited Silent Hills
ld a, SEVII_FLYPOINT_2 ; first sevii1 flypoint
ld [wStartFlypoint], a
ld a, NIHON_FLYPOINT - 1 ; last sevii1 flypoint
ld [wEndFlypoint], a
ld [wTownMapPlayerIconLandmark], a ; last one is default (Silent Hills)
; Fill out the map
call FillSevii2Map
call .MapHud
pop af
call TownMapPlayerIcon
ret
.NoKanto:
; If Indigo Plateau hasn't been visited, we use Johto's map instead
ld a, JOHTO_FLYPOINT ; first Johto flypoint
@ -2409,6 +2532,8 @@ FlyMap:
ld [wTownMapCursorCoordinates + 1], a
ret
; If you have trouble seeing areas for wildmons it's probably because of this
; it doesn't account for nihon or the sevii isles right now
Pokedex_GetArea:
; e: Current landmark
ld a, [wTownMapPlayerIconLandmark]
@ -2644,6 +2769,9 @@ Pokedex_GetArea:
db 0 * 8, 0 * 8, 3 ; bottom right
db $80 ; terminator
; does not account for nihon or the two seviis
; it shouldn't come up given the fast ship isn't being used for anything like this
; if an error comes up you'll need to sort it out
.CheckPlayerLocation:
; Don't show the player's sprite if you're
; not in the same region as what's currently
@ -2723,6 +2851,14 @@ FillKantoMap:
ld de, KantoMap
jr FillTownMap
FillSevii1Map:
ld de, Sevii1Map
jr FillTownMap
FillSevii2Map:
ld de, Sevii2Map
jr FillTownMap
FillNihonMap:
ld de, NihonMap
FillTownMap:
@ -2875,6 +3011,12 @@ INCBIN "gfx/pokegear/johto.bin"
KantoMap:
INCBIN "gfx/pokegear/kanto.bin"
Sevii1Map:
INCBIN "gfx/pokegear/sevii1.bin"
Sevii2Map:
INCBIN "gfx/pokegear/sevii2.bin"
NihonMap:
INCBIN "gfx/pokegear/nihon.bin"