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

Merge branch 'master' into master

Browse source
This commit is contained in:
Llinos Evans 2023-10-29 17:39:31 +00:00 • committed by GitHub
commit e150889975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 107 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/maps/maps.asm
View file

@ -71,7 +71,7 @@ MapGroup_Mahogany:
map MahoganyPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route42EcruteakGate, TILESET_GATE, GATE, LANDMARK_ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route42, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_42, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_LAKE
map Route44, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_POND
map Route44, TILESET_JOHTO, ROUTE, LANDMARK_ROUTE_44, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_REMORAID ; literally one line and it's fixed
map MahoganyTown, TILESET_JOHTO, TOWN, LANDMARK_MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_MAHOGANY_MAPS

1
data/pokemon/base_stats.asm
View file

@ -53,6 +53,7 @@ INCLUDE "data/pokemon/base_stats/ekans.asm"
INCLUDE "data/pokemon/base_stats/arbok.asm"
INCLUDE "data/pokemon/base_stats/pikachu.asm"
INCLUDE "data/pokemon/base_stats/raichu.asm"
INCLUDE "data/pokemon/base_stats/gorochu.asm"
INCLUDE "data/pokemon/base_stats/sandshrew.asm"
INCLUDE "data/pokemon/base_stats/sandslash.asm"
INCLUDE "data/pokemon/base_stats/nidoran_f.asm"

1
data/pokemon/cries.asm
View file

@ -32,6 +32,7 @@ PokemonCries::
mon_cry CRY_EKANS, 224, 144 ; ARBOK
mon_cry CRY_BULBASAUR, 238, 129 ; PIKACHU
mon_cry CRY_RAICHU, 238, 136 ; RAICHU
mon_cry CRY_EARTHTRON, 0, 256 ; GOROCHU
mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW
mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH
mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F

1
data/pokemon/dex_entries.asm
View file

@ -26,6 +26,7 @@ EkansPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ekans.asm"
ArbokPokedexEntry:: INCLUDE "data/pokemon/dex_entries/arbok.asm"
PikachuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/pikachu.asm"
RaichuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raichu.asm"
GorochuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/gorochu.asm"
SandshrewPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandshrew.asm"
SandslashPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandslash.asm"
NidoranFPokedexEntry:: INCLUDE "data/pokemon/dex_entries/nidoran_f.asm"

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

@ -0,0 +1,10 @@
db "VOLTAGE@" ; species name
dw 511, 1960 ; height, weight
db "Proud of its power,"
next "GOROCHU will seek"
next "foes and shock"
page "them with THUNDER."
next "It can easily take"
next "down a TRAMPEL.@"

1
data/pokemon/dex_entry_pointers.asm
View file

@ -27,6 +27,7 @@ PokedexDataPointerTable:
dba ArbokPokedexEntry
dba PikachuPokedexEntry
dba RaichuPokedexEntry
dba GorochuPokedexEntry
dba SandshrewPokedexEntry
dba SandslashPokedexEntry
dba NidoranFPokedexEntry

1
data/pokemon/dex_order_alpha.asm
View file

@ -78,6 +78,7 @@ AlphabeticalPokedexOrder:
dw GOLDEEN
dw GOLDUCK
dw GOLEM
dw GOROCHU
dw GRANBULL
dw GRAVELER
dw GRIMER

1
data/pokemon/dex_order_new.asm
View file

@ -25,6 +25,7 @@ NewPokedexOrder:
dw PICHU
dw PIKACHU
dw RAICHU
dw GOROCHU
dw CATERPIE
dw METAPOD
dw BUTTERFREE

1
data/pokemon/egg_moves_kanto.asm
View file

@ -27,6 +27,7 @@ EggMovePointers1:
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1
dw SandshrewEggMoves
dw NoEggMoves1
dw NidoranFEggMoves

14
data/pokemon/evos_attacks_kanto.asm
View file

@ -27,6 +27,7 @@ EvosAttacksPointers1::
dw ArbokEvosAttacks
dw PikachuEvosAttacks
dw RaichuEvosAttacks
dw GorochuEvosAttacks
dw SandshrewEvosAttacks
dw SandslashEvosAttacks
dw NidoranFEvosAttacks
@ -507,12 +508,25 @@ PikachuEvosAttacks:
db 0 ; no more level-up moves
RaichuEvosAttacks:
dbbw EVOLVE_TRADE, -1, GOROCHU
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 1, TAIL_WHIP
dbw 1, QUICK_ATTACK
dbw 1, THUNDERBOLT
db 0 ; no more level-up moves
GorochuEvosAttacks:
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 1, TAIL_WHIP
dbw 1, QUICK_ATTACK
dbw 1, THUNDERBOLT
dbw 53, SAND_ATTACK
dbw 57, FOCUS_ENERGY
dbw 60, LEER
dbw 65, HORN_DRILL
db 0 ; no more level-up moves
SandshrewEvosAttacks:
dbbw EVOLVE_LEVEL, 22, SANDSLASH

1
data/pokemon/first_stages.asm
View file

@ -27,6 +27,7 @@ FirstEvoStages::
dw EKANS ;18
dw PICHU
dw PICHU
dw PICHU
dw SANDSHREW
dw SANDSHREW
dw NIDORAN_F

1
data/pokemon/gen1_base_special.asm
View file

@ -28,6 +28,7 @@ KantoMonSpecials:
db 65 ; ARBOK
db 50 ; PIKACHU
db 90 ; RAICHU
db 100 ; GOROCHU
db 30 ; SANDSHREW
db 55 ; SANDSLASH
db 40 ; NIDORAN_F

1
data/pokemon/gen1_order.asm
View file

@ -260,4 +260,5 @@ Pokered_MonIndices:
db SHI_SHI
db MUNCHLAX
db KLEAVOR
db GOROCHU
assert_table_length NUM_POKEMON - 1

1
data/pokemon/menu_icons.asm
View file

@ -28,6 +28,7 @@ MonMenuIcons:
db ICON_SERPENT ; ARBOK
db ICON_PIKACHU ; PIKACHU
db ICON_PIKACHU ; RAICHU
db ICON_PIKACHU ; GOROCHU
db ICON_MONSTER ; SANDSHREW
db ICON_MONSTER ; SANDSLASH
db ICON_FOX ; NIDORAN_F

1
data/pokemon/names.asm
View file

@ -30,6 +30,7 @@ PokemonNames::
db "ARBOK@@@@@"
db "PIKACHU@@@"
db "RAICHU@@@@"
db "GOROCHU@@@"
db "SANDSHREW@"
db "SANDSLASH@"
db "NIDORAN♀@@"

2
data/pokemon/palettes.asm
View file

@ -85,6 +85,8 @@ INCBIN "gfx/pokemon/pikachu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/pikachu/shiny.pal"
INCBIN "gfx/pokemon/raichu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/raichu/shiny.pal"
INCBIN "gfx/pokemon/gorochu/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/gorochu/shiny.pal"
INCBIN "gfx/pokemon/sandshrew/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/sandshrew/shiny.pal"
INCBIN "gfx/pokemon/sandslash/front.gbcpal", middle_colors

2
data/pokemon/pic_pointers.asm
View file

@ -65,6 +65,8 @@ PokemonPicPointers::
dba PikachuBackpic
dba RaichuFrontpic
dba RaichuBackpic
dba GorochuFrontpic
dba GorochuBackpic
dba SandshrewFrontpic
dba SandshrewBackpic
dba SandslashFrontpic

2
data/wild/fish.asm
View file

@ -199,7 +199,7 @@ FishGroups:
.Remoraid_Good:
dbbw 35 percent, 20, MAGIKARP
dbbw 70 percent, 20, POLIWAG
dbbw 90 percent + 1, 20, POLIWAG
dbbw 90 percent + 1, 20, REMORAID
dbbw 100 percent, 6, TIME_GROUP
.Remoraid_Super:
dbbw 40 percent, 40, POLIWAG