thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15: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

2
data/pokemon/base_stats.asm
View file

@ -194,6 +194,7 @@ INCLUDE "data/pokemon/base_stats/mr__mime.asm"
INCLUDE "data/pokemon/base_stats/scyther.asm"
INCLUDE "data/pokemon/base_stats/kleavor.asm"
INCLUDE "data/pokemon/base_stats/jynx.asm"
INCLUDE "data/pokemon/base_stats/buu.asm"
INCLUDE "data/pokemon/base_stats/electabuzz.asm"
INCLUDE "data/pokemon/base_stats/magmar.asm"
INCLUDE "data/pokemon/base_stats/pinsir.asm"
@ -347,6 +348,7 @@ INCLUDE "data/pokemon/base_stats/donphan.asm"
INCLUDE "data/pokemon/base_stats/porygon2.asm"
INCLUDE "data/pokemon/base_stats/stantler.asm"
INCLUDE "data/pokemon/base_stats/smeargle.asm"
INCLUDE "data/pokemon/base_stats/grenmar.asm"
INCLUDE "data/pokemon/base_stats/tyrogue.asm"
INCLUDE "data/pokemon/base_stats/hitmontop.asm"
INCLUDE "data/pokemon/base_stats/smoochum.asm"

21
data/pokemon/base_stats/grenmar.asm Normal file
View file

@ -0,0 +1,21 @@
db GRENMAR ; species ID placeholder
db 80, 80, 70, 55, 105, 80
; hp atk def spd sat sdf
db FIRE, WATER ; type
db 75 ; catch rate
db 160 ; base exp
db NO_ITEM, NO_ITEM ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch
db 5 ; unknown 2
INCBIN "gfx/pokemon/grenmar/front.dimensions"
dw NULL, NULL ; unused (beta front/back pics)
db GROWTH_MEDIUM_FAST ; growth rate
dn EGG_WATER_1, EGG_GROUND ; egg groups
; tm/hm learnset
tmhm HEADBUTT, CURSE, ROLLOUT, TOXIC, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, FIRE_BLAST, SWIFT, DETECT, REST, ATTRACT, THIEF, SURF, STRENGTH, FLASH, FLAMETHROWER
; end

2
data/pokemon/cries.asm
View file

@ -173,6 +173,7 @@ PokemonCries::
mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER
mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR
mon_cry CRY_DROWZEE, 255, 383 ; JYNX
mon_cry CRY_NIDORAN_M, 0, 0 ; BUU
mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ
mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR
mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR
@ -326,6 +327,7 @@ PokemonCries::
mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2
mon_cry CRY_AIPOM, -352, 384 ; STANTLER
mon_cry CRY_PICHU, -538, 496 ; SMEARGLE
mon_cry CRY_NIDORAN_M, 0, 0 ; GRENMAR
mon_cry CRY_AIPOM, 44, 264 ; TYROGUE
mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP
mon_cry CRY_MARILL, 104, 256 ; SMOOCHUM

2
data/pokemon/dex_entries.asm
View file

@ -384,3 +384,5 @@ BalumbaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/balumba.asm"
MagnetitePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnetite.asm"
MagnezonePokedexEntry:: INCLUDE "data/pokemon/dex_entries/magnezone.asm"
GavillainPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gavillain.asm"
BuuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/buu.asm"
GrenmarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/grenmar.asm"

10
data/pokemon/dex_entries/buu.asm Normal file
View file

@ -0,0 +1,10 @@
db "ICE BEAST@" ; species name
dw 311, 191 ; height, weight - temp
db "If it finds people"
next "stranded in the"
next "mountains, BUU will"
page "keep them warm us-"
next "ing its heat-resis-"
next "tant fur.@"

10
data/pokemon/dex_entries/grenmar.asm Normal file
View file

@ -0,0 +1,10 @@
db "BOMB SEEL@" ; species name
dw 311, 191 ; height, weight - temp
db "Popular amongst"
next "ringmaster for its"
next "skillful juggling."
page "Training one is"
next "risky, as its"
next "rock may explode.@"

2
data/pokemon/dex_entry_pointers.asm
View file

@ -168,6 +168,7 @@ PokedexDataPointerTable:
dba ScytherPokedexEntry
dba KleavorPokedexEntry
dba JynxPokedexEntry
dba BuuPokedexEntry
dba ElectabuzzPokedexEntry
dba MagmarPokedexEntry
dba PinsirPokedexEntry
@ -321,6 +322,7 @@ PokedexDataPointerTable:
dba Porygon2PokedexEntry
dba StantlerPokedexEntry
dba SmearglePokedexEntry
dba GrenmarPokedexEntry
dba TyroguePokedexEntry
dba HitmontopPokedexEntry
dba SmoochumPokedexEntry

2
data/pokemon/dex_order_alpha.asm
View file

@ -36,6 +36,7 @@ AlphabeticalPokedexOrder:
dw BULBASAUR
dw BURGELA
dw BUTTERFREE
dw BUU
dw CACAWPHONY
dw CALFLAC
dw CARAPTHOR
@ -123,6 +124,7 @@ AlphabeticalPokedexOrder:
dw GRANBULL
dw GRAVELER
dw GREAT_TUSK
dw GRENMAR
dw GRIMER
dw GROWLITHE
dw GYARADOS

2
data/pokemon/dex_order_new.asm
View file

@ -203,10 +203,12 @@ NewPokedexOrder:
dw MAGMAR
dw SMOOCHUM
dw JYNX
dw BUU
dw ELEKID
dw ELECTABUZZ
dw MR__MIME
dw SMEARGLE
dw GRENMAR
dw FARFETCH_D
dw LUXWAN
dw NATU

10
data/pokemon/egg_moves_johto.asm
View file

@ -124,6 +124,7 @@ EggMovePointers2::
dw NoEggMoves2
dw StantlerEggMoves
dw NoEggMoves2
dw GrenmarEggMoves
dw TyrogueEggMoves
dw NoEggMoves2
dw SmoochumEggMoves
@ -569,6 +570,15 @@ StantlerEggMoves:
dw BITE
dw -1 ; end
GrenmarEggMoves:
dw DISABLE
dw ENCORE
dw PERISH_SONG
dw RAPID_SPIN
dw SING
dw SLAM
dw -1
TyrogueEggMoves:
dw RAPID_SPIN
dw HI_JUMP_KICK

9
data/pokemon/egg_moves_kanto.asm
View file

@ -168,6 +168,7 @@ EggMovePointers1:
dw ScytherEggMoves
dw NoEggMoves1 ; Kleavor
dw NoEggMoves1
dw BuuEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw PinsirEggMoves
@ -645,6 +646,14 @@ ScytherEggMoves:
dw LIGHT_SCREEN
dw -1 ; end
BuuEggMoves:
dw BARRIER
dw CROSS_CHOP
dw KARATE_CHOP
dw SCREECH
dw ROLLING_KICK
dw -1
PinsirEggMoves:
dw FURY_ATTACK
dw FLAIL

14
data/pokemon/evos_attacks_johto.asm
View file

@ -123,6 +123,7 @@ EvosAttacksPointers2::
dw Porygon2EvosAttacks
dw StantlerEvosAttacks
dw SmeargleEvosAttacks
dw GrenmarEvosAttacks
dw TyrogueEvosAttacks
dw HitmontopEvosAttacks
dw SmoochumEvosAttacks
@ -1772,6 +1773,19 @@ SmeargleEvosAttacks:
dbw 91, SKETCH
db 0 ; no more level-up moves
GrenmarEvosAttacks:
db 0
dbw 1, TACKLE
dbw 1, DEFENSE_CURL
dbw 9, TAIL_WHIP
dbw 17, WATER_GUN
dbw 25, BARRAGE
dbw 33, FLAME_WHEEL
dbw 41, SMOG
dbw 49, TAKE_DOWN
dbw 57, HYDRO_PUMP
db 0
TyrogueEvosAttacks:
dbbbw EVOLVE_STAT, 20, ATK_LT_DEF, HITMONCHAN
dbbbw EVOLVE_STAT, 20, ATK_GT_DEF, HITMONLEE

16
data/pokemon/evos_attacks_kanto.asm
View file

@ -168,6 +168,7 @@ EvosAttacksPointers1::
dw ScytherEvosAttacks
dw KleavorEvosAttacks
dw JynxEvosAttacks
dw BuuEvosAttacks
dw ElectabuzzEvosAttacks
dw MagmarEvosAttacks
dw PinsirEvosAttacks
@ -2507,6 +2508,21 @@ JynxEvosAttacks:
dbw 57, BLIZZARD
db 0 ; no more level-up moves
BuuEvosAttacks:
db 0
dbw 1, AURORA_BEAM
dbw 6, LEER
dbw 11, ICE_PUNCH
dbw 16, MIST
dbw 21, DIZZY_PUNCH
dbw 27, FAINT_ATTACK
dbw 32, DISABLE
dbw 39, PURSUIT
dbw 45, HAZE
dbw 51, ICE_BEAM
dbw 58, BLIZZARD
db 0
ElectabuzzEvosAttacks:
db 0 ; no more evolutions
dbw 1, QUICK_ATTACK

2
data/pokemon/first_stages.asm
View file

@ -168,6 +168,7 @@ FirstEvoStages::
dw SCYTHER
dw SCYTHER
dw SMOOCHUM
dw BUU
dw ELEKID
dw MAGBY
dw PINSIR
@ -321,6 +322,7 @@ FirstEvoStages::
dw PORYGON
dw STANTLER
dw SMEARGLE
dw GRENMAR
dw TYROGUE
dw TYROGUE
dw SMOOCHUM

1
data/pokemon/gen1_base_special.asm
View file

@ -169,6 +169,7 @@ KantoMonSpecials:
db 55 ; SCYTHER
db 45 ; KLEAVOR
db 95 ; JYNX
db 85 ; BUU
db 85 ; ELECTABUZZ
db 85 ; MAGMAR
db 55 ; PINSIR

2
data/pokemon/gen1_order.asm
View file

@ -372,4 +372,6 @@ Pokered_MonIndices:
db MAGNETITE
db MAGNEZONE
db GAVILLAIN
db BUU
db GRENMAR
assert_table_length NUM_POKEMON - 1

2
data/pokemon/menu_icons.asm
View file

@ -169,6 +169,7 @@ MonMenuIcons:
db ICON_BUG ; SCYTHER
db ICON_BUG ; KLEAVOR
db ICON_HUMANSHAPE ; JYNX
db ICON_HUMANSHAPE ; BUU
db ICON_HUMANSHAPE ; ELECTABUZZ
db ICON_HUMANSHAPE ; MAGMAR
db ICON_BUG ; PINSIR
@ -322,6 +323,7 @@ MonMenuIcons:
db ICON_VOLTORB ; PORYGON2
db ICON_EQUINE ; STANTLER
db ICON_MONSTER ; SMEARGLE
db ICON_LAPRAS ; GRENMAR
db ICON_FIGHTER ; TYROGUE
db ICON_FIGHTER ; HITMONTOP
db ICON_HUMANSHAPE ; SMOOCHUM

2
data/pokemon/names.asm
View file

@ -171,6 +171,7 @@ PokemonNames::
db "SCYTHER@@@"
db "KLEAVOR@@@"
db "JYNX@@@@@@"
db "BUU@@@@@@@"
db "ELECTABUZZ"
db "MAGMAR@@@@"
db "PINSIR@@@@"
@ -324,6 +325,7 @@ PokemonNames::
db "PORYGON2@@"
db "STANTLER@@"
db "SMEARGLE@@"
db "GRENMAR@@@"
db "TYROGUE@@@"
db "HITMONTOP@"
db "SMOOCHUM@@"

4
data/pokemon/palettes.asm
View file

@ -367,6 +367,8 @@ INCBIN "gfx/pokemon/kleavor/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/kleavor/shiny.pal"
INCBIN "gfx/pokemon/jynx/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/jynx/shiny.pal"
INCBIN "gfx/pokemon/buu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/buu/shiny.pal"
INCBIN "gfx/pokemon/electabuzz/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/electabuzz/shiny.pal"
INCBIN "gfx/pokemon/magmar/front.gbcpal", middle_colors
@ -673,6 +675,8 @@ INCBIN "gfx/pokemon/stantler/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/stantler/shiny.pal"
INCBIN "gfx/pokemon/smeargle/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/smeargle/shiny.pal"
INCBIN "gfx/pokemon/grenmar/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/grenmar/shiny.pal"
INCBIN "gfx/pokemon/tyrogue/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/tyrogue/shiny.pal"
INCBIN "gfx/pokemon/hitmontop/front.gbcpal", middle_colors

4
data/pokemon/pic_pointers.asm
View file

@ -347,6 +347,8 @@ PokemonPicPointers::
dba KleavorBackpic
dba JynxFrontpic
dba JynxBackpic
dba BuuFrontpic
dba BuuBackpic
dba ElectabuzzFrontpic
dba ElectabuzzBackpic
dba MagmarFrontpic
@ -656,6 +658,8 @@ PokemonPicPointers::
dba StantlerBackpic
dba SmeargleFrontpic
dba SmeargleBackpic
dba GrenmarFrontpic
dba GrenmarBackpic
dba TyrogueFrontpic
dba TyrogueBackpic
dba HitmontopFrontpic

8
data/trainers/parties.asm
View file

@ -82,7 +82,7 @@ PryceGroup:
dw DELIBIRD
dw PRESENT, ICY_WIND, RAPID_SPIN, RAIN_DANCE ; Rain Dance can make Fire moves worse ig? Spikes is cool but it's an event move - do we want that?
db 33
dw SEEL ; BUU
dw BUU
dw HEADBUTT, ICY_WIND, AURORA_BEAM, REST
db 35
dw DEWGONG
@ -3000,6 +3000,8 @@ SwimmerFGroup:
db "DENISE@", TRAINERTYPE_NORMAL
db 22
dw SEEL
db 23
dw GRENMAR
db -1 ; end
next_list_item ; SWIMMERF (6)
@ -3087,7 +3089,7 @@ SwimmerFGroup:
db 28
dw SEEL
db 28
dw SEEL
dw GRENMAR
db 28
dw DEWGONG
db -1 ; end
@ -4912,7 +4914,7 @@ BoarderGroup: ; All in Pryce's Gym. Could expand to Ice Path and Seafoam.
db 30
dw CLOYSTER
db 26
dw SHELLDER ; BUU
dw BUU
db -1 ; end
end_list_items

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