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

Buu and Grenmar? Nowaynowaynoway!

Browse source 
This required me to scrap some unused content from `load_font.asm`. However, this is only really a temporary fix - we need to decouple footprints.asm from it and make it load from separate banks to keep going.

Look at how Pokemon sprites are loaded for reference.
This commit is contained in:
Llinos Evans 2024-07-09 20:20:51 +01:00
parent b62062a82c
commit ae81f290d2
48 changed files with 182 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

36
data/wild/johto_grass.asm
View file

@ -499,24 +499,24 @@ JohtoGrassWildMons:
dbw 24, RIBBITO
dbw 26, AZUMARILL
dbw 25, GRAVELER
dbw 26, ONIX ; GRENMAR
dbw 27, ONIX ; GRENMAR
dbw 26, GRENMAR
dbw 27, GRENMAR
; day
dbw 26, GRAVELER
dbw 25, GOLBAT
dbw 24, RIBBITO
dbw 26, AZUMARILL
dbw 25, GRAVELER
dbw 26, ONIX ; GRENMAR
dbw 27, ONIX ; GRENMAR
dbw 26, GRENMAR
dbw 27, GRENMAR
; nite
dbw 26, GRAVELER
dbw 25, GOLBAT
dbw 24, QUAGSIRE
dbw 26, AZUMARILL
dbw 25, GRAVELER
dbw 26, ONIX ; GRENMAR
dbw 27, ONIX ; GRENMAR
dbw 26, GRENMAR
dbw 27, GRENMAR
end_grass_wildmons
def_grass_wildmons SLOWPOKE_WELL_B1F
@ -620,7 +620,7 @@ JohtoGrassWildMons:
dbw 21, KOTORA
dbw 19, GEODUDE
dbw 20, RATICATE
dbw 20, RATICATE ; GRENMAR
dbw 20, GRENMAR
; day
dbw 19, RATTATA
dbw 22, KOTORA
@ -628,7 +628,7 @@ JohtoGrassWildMons:
dbw 21, KOTORA
dbw 19, GEODUDE
dbw 20, RATICATE
dbw 20, RATICATE ; GRENMAR
dbw 20, GRENMAR
; nite
dbw 18, RATTATA
dbw 22, ZUBAT
@ -636,7 +636,7 @@ JohtoGrassWildMons:
dbw 22, GOLBAT
dbw 19, GEODUDE
dbw 20, RATICATE
dbw 20, RATICATE ; GRENMAR
dbw 20, GRENMAR
end_grass_wildmons
; Also, Larvitar is available in the morning and daytime, unless it's B2F, wherein it's all-day.
@ -647,7 +647,7 @@ JohtoGrassWildMons:
dbw 18, GEODUDE
dbw 19, RATTATA
dbw 20, MACHOP
dbw 20, RATICATE ; GRENMAR?
dbw 20, GRENMAR
dbw 22, MARILL
dbw 22, LARVITAR
dbw 23, LARVITAR
@ -655,14 +655,14 @@ JohtoGrassWildMons:
dbw 18, GEODUDE
dbw 19, RATTATA
dbw 20, MACHOP
dbw 20, RATICATE ; GRENMAR?
dbw 20, GRENMAR
dbw 22, MARILL
dbw 22, LARVITAR
dbw 23, LARVITAR
; nite
dbw 18, GEODUDE
dbw 19, RATTATA
dbw 20, RATICATE ; GRENMAR?
dbw 20, GRENMAR
dbw 22, ZUBAT
dbw 21, MARILL
dbw 22, GOLBAT
@ -675,7 +675,7 @@ JohtoGrassWildMons:
dbw 41, GRAVELER
dbw 42, MACHOKE
dbw 41, GEODUDE
dbw 40, RATICATE ; GRENMAR?
dbw 40, GRENMAR
dbw 48, MARILL
dbw 40, PUPITAR
dbw 40, PUPITAR
@ -683,14 +683,14 @@ JohtoGrassWildMons:
dbw 41, GRAVELER
dbw 42, MACHOKE
dbw 41, GEODUDE
dbw 40, RATICATE ; GRENMAR?
dbw 40, GRENMAR
dbw 48, MARILL
dbw 40, PUPITAR
dbw 40, PUPITAR
; nite
dbw 41, GRAVELER
dbw 41, GEODUDE
dbw 40, RATICATE ; GRENMAR?
dbw 40, GRENMAR
dbw 40, GOLBAT
dbw 48, AZUMARILL
dbw 42, GOLBAT
@ -704,7 +704,7 @@ JohtoGrassWildMons:
dbw 20, ZUBAT
dbw 23, GOLBAT
dbw 21, MARILL
dbw 20, GEODUDE ; GRENMAR?
dbw 20, GRENMAR
dbw 24, LARVITAR
dbw 24, LARVITAR
; day
@ -712,7 +712,7 @@ JohtoGrassWildMons:
dbw 20, ZUBAT
dbw 23, GOLBAT
dbw 21, MARILL
dbw 20, GEODUDE ; GRENMAR?
dbw 20, GRENMAR
dbw 24, LARVITAR
dbw 24, LARVITAR
; nite
@ -720,7 +720,7 @@ JohtoGrassWildMons:
dbw 20, ZUBAT
dbw 23, GOLBAT
dbw 21, MARILL
dbw 20, GEODUDE ; GRENMAR?
dbw 20, GRENMAR
dbw 24, LARVITAR
dbw 24, LARVITAR
end_grass_wildmons

16
data/wild/johto_water.asm
View file

@ -53,23 +53,23 @@ JohtoWaterWildMons:
def_water_wildmons MOUNT_MORTAR_1F_OUTSIDE
db 4 percent ; encounter rate
dbw 15, GOLDEEN
dbw 20, MARILL
dbw 20, SEAKING
dbw 23, SEAKING
dbw 25, MARILL
dbw 25, GRENMAR
end_water_wildmons
def_water_wildmons MOUNT_MORTAR_2F_INSIDE
db 2 percent ; encounter rate
dbw 20, GOLDEEN
dbw 23, SEAKING
dbw 25, MARILL
dbw 25, SEAKING
dbw 25, GRENMAR
end_water_wildmons
def_water_wildmons MOUNT_MORTAR_B1F
db 2 percent ; encounter rate
dbw 15, GOLDEEN
dbw 20, MARILL
dbw 20, SEAKING
dbw 23, SEAKING
dbw 25, MARILL
dbw 25, GRENMAR
end_water_wildmons
def_water_wildmons WHIRL_ISLAND_SW