thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pokegear Map Fix + Minor Fixes (#13)

Browse source 
* pokegear townmap shows correct region + doest OOB

* fixed route data
This commit is contained in:
thornAvery 2023-10-31 03:01:11 +11:00 committed by GitHub
parent c37e192fda
commit b0ae5b0c6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 67 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -55,3 +55,8 @@ used_space.png
# macos files # macos files
.DS_STORE .DS_STORE
# nix files
result
.envrc
.direnv/*

84
data/wild/kanto_grass.asm
View file

@ -342,58 +342,58 @@ KantoGrassWildMons:
def_grass_wildmons ROUTE_7 def_grass_wildmons ROUTE_7
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn ; morn
db 37, RATTATA dbw 37, RATTATA
db 37, SPEAROW dbw 37, SPEAROW
db 38, GROWLITHE dbw 38, GROWLITHE
db 39, RATICATE dbw 39, RATICATE
db 39, RATTATA dbw 39, RATTATA
db 35, SNUBBULL dbw 35, SNUBBULL
db 35, SNUBBULL dbw 35, SNUBBULL
; day ; day
db 37, RATTATA dbw 37, RATTATA
db 37, SPEAROW dbw 37, SPEAROW
db 38, GROWLITHE dbw 38, GROWLITHE
db 39, RATICATE dbw 39, RATICATE
db 39, RATTATA dbw 39, RATTATA
db 35, GROWLITHE dbw 35, GROWLITHE
db 35, GROWLITHE dbw 35, GROWLITHE
; nite ; nite
db 37, RATTATA dbw 37, RATTATA
db 37, MURKROW dbw 37, MURKROW
db 38, GROWLITHE dbw 38, GROWLITHE
db 39, RATICATE dbw 39, RATICATE
db 39, MURKROW dbw 39, MURKROW
db 35, HOUNDOUR dbw 35, HOUNDOUR
db 35, HOUNDOUR dbw 35, HOUNDOUR
end_grass_wildmons end_grass_wildmons
; Silver Data, contrasting with Route 7's Gold Data. ; Silver Data, contrasting with Route 7's Gold Data.
def_grass_wildmons ROUTE_8 def_grass_wildmons ROUTE_8
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn ; morn
db 37, MEOWTH dbw 37, MEOWTH
db 39, PIDGEOTTO dbw 39, PIDGEOTTO
db 35, ABRA dbw 35, ABRA
db 38, VULPIX dbw 38, VULPIX
db 37, PIDGEOTTO dbw 37, PIDGEOTTO
db 35, KADABRA dbw 35, KADABRA
db 35, KADABRA dbw 35, KADABRA
; day ; day
db 37, MEOWTH dbw 37, MEOWTH
db 39, PIDGEOTTO dbw 39, PIDGEOTTO
db 35, ABRA dbw 35, ABRA
db 38, VULPIX dbw 38, VULPIX
db 37, PIDGEOTTO dbw 37, PIDGEOTTO
db 35, KADABRA dbw 35, KADABRA
db 35, KADABRA dbw 35, KADABRA
; nite ; nite
db 37, MEOWTH dbw 37, MEOWTH
db 30, HAUNTER dbw 30, HAUNTER
db 35, ABRA dbw 35, ABRA
db 39, NOCTOWL dbw 39, NOCTOWL
db 38, VULPIX dbw 38, VULPIX
db 35, KADABRA dbw 35, KADABRA
db 35, KADABRA dbw 35, KADABRA
end_grass_wildmons end_grass_wildmons
def_grass_wildmons ROUTE_9 def_grass_wildmons ROUTE_9

37
engine/pokegear/pokegear.asm
View file

@ -540,12 +540,12 @@ Pokegear_UpdateClock:
PokegearMap_CheckRegion: PokegearMap_CheckRegion:
ld a, [wPokegearMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
cp LANDMARK_FAST_SHIP cp LANDMARK_SILVER_CAVE+1
jr z, .johto jr c, .johto
cp KANTO_LANDMARK cp LANDMARK_FAST_SHIP+1
jr nc, .kanto jr c, .kanto
cp NIHON_LANDMARK ;cp NIHON_LANDMARK
jr c, .nihon jp .nihon
.johto .johto
ld a, POKEGEARSTATE_JOHTOMAPINIT ld a, POKEGEARSTATE_JOHTOMAPINIT
jr .done jr .done
@ -752,13 +752,13 @@ TownMap_GetKantoLandmarkLimits:
ld a, [wStatusFlags] ld a, [wStatusFlags]
bit STATUSFLAGS_HALL_OF_FAME_F, a bit STATUSFLAGS_HALL_OF_FAME_F, a
jr z, .not_hof jr z, .not_hof
ld d, LANDMARK_ROUTE_28 ld d, LANDMARK_FAST_SHIP
ld e, LANDMARK_PALLET_TOWN ld e, LANDMARK_PALLET_TOWN
ret ret
.not_hof .not_hof
ld d, LANDMARK_ROUTE_28 ld d, LANDMARK_VICTORY_ROAD
ld e, LANDMARK_VICTORY_ROAD ld e, LANDMARK_PALLET_TOWN
ret ret
TownMap_GetNihonLandmarkLimits: TownMap_GetNihonLandmarkLimits:
@ -1572,7 +1572,7 @@ RadioChannels:
ld a, [wPokegearMapPlayerIconLandmark] ld a, [wPokegearMapPlayerIconLandmark]
cp LANDMARK_FAST_SHIP cp LANDMARK_FAST_SHIP
jr z, .johto jr z, .johto
cp KANTO_LANDMARK cp LANDMARK_SILVER_CAVE+1
jr c, .johto jr c, .johto
; kanto or nihon ; kanto or nihon
and a and a
@ -1925,10 +1925,13 @@ _TownMap:
.InitTilemap: .InitTilemap:
ld a, [wTownMapPlayerIconLandmark] ld a, [wTownMapPlayerIconLandmark]
cp NIHON_LANDMARK cp LANDMARK_SILVER_CAVE + 1 ; last johto landmark + 1
jr nc, .nihon2 jr c, .johto2
cp KANTO_LANDMARK cp LANDMARK_FAST_SHIP + 1 ; last kanto landmark + 1
jr nc, .kanto2 jr c, .kanto2
jp .nihon2
.johto2
ld e, JOHTO_REGION ld e, JOHTO_REGION
jr .okay_tilemap jr .okay_tilemap
@ -2052,15 +2055,15 @@ LoadStation_PokemonChannel:
PokegearMap: PokegearMap:
ld a, e ld a, e
and a cp JOHTO_REGION
jr nz, .kanto jr nz, .kanto
call LoadTownMapGFX call LoadTownMapGFX
call FillJohtoMap call FillJohtoMap
ret ret
.kanto .kanto
cp NIHON_LANDMARK cp KANTO_REGION
jr c, .nihon jr nz, .nihon
call LoadTownMapGFX call LoadTownMapGFX
call FillKantoMap call FillKantoMap
ret ret