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

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
parent 672cefbd96 dafc4aada7
commit e150889975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 107 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
audio/cries.asm
View file

@ -2108,3 +2108,39 @@ Cry_Rattata_Ch8:
noise_note 1, 10, 2, 57
noise_note 8, 9, 1, 73
sound_ret
Cry_Earthtron:
channel_count 3
channel 5, Cry_Earthtron_Ch5
channel 6, Cry_Earthtron_Ch6
channel 8, Cry_Earthtron_Ch8
Cry_Earthtron_Ch5: ; using the unused 'Earthtron' cry
duty_cycle_pattern 3, 3, 0, 0
square_note 15, 14, 0, 1920
square_note 15, 15, 0, 1924
square_note 15, 12, 3, 1504
square_note 15, 12, 4, 1536
square_note 10, 6, -4, 1920
square_note 8, 7, 1, 1924
sound_ret
Cry_Earthtron_Ch6:
duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857
square_note 15, 11, 0, 1859
square_note 15, 9, 3, 1457
square_note 15, 9, 4, 1473
square_note 10, 4, -4, 1857
square_note 8, 3, 1, 1862
sound_ret
Cry_Earthtron_Ch8:
noise_note 2, 15, 2, 76
noise_note 6, 14, 0, 58
noise_note 15, 13, 0, 58
noise_note 8, 13, 0, 44
noise_note 6, 14, 6, 76
noise_note 12, 7, -5, 76
noise_note 15, 13, 3, 76
sound_ret

1
audio/cry_pointers.asm
View file

@ -69,4 +69,5 @@ Cries:
dba Cry_Aipom
dba Cry_Dunsparce
dba Cry_Donphan
dba Cry_Earthtron
assert_table_length NUM_CRIES

1
constants/cry_constants.asm
View file

@ -72,5 +72,6 @@
const CRY_AIPOM
const CRY_DUNSPARCE
const CRY_DONPHAN
const CRY_EARTHTRON
DEF NUM_CRIES EQU const_value

1
constants/pokemon_constants.asm
View file

@ -45,6 +45,7 @@
const ARBOK ; 18
const PIKACHU ; 19
const RAICHU ; 1a
const GOROCHU
const SANDSHREW ; 1b
const SANDSLASH ; 1c
const NIDORAN_F ; 1d

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

5
gfx/footprints.asm
View file

@ -1,6 +1,6 @@
Footprints:
table_width LEN_1BPP_TILE * 4, Footprints
; don't forget to update assert_table_length
INCBIN "gfx/footprints/bulbasaur.1bpp"
INCBIN "gfx/footprints/ivysaur.1bpp"
INCBIN "gfx/footprints/venusaur.1bpp"
@ -27,6 +27,7 @@ INCBIN "gfx/footprints/ekans.1bpp"
INCBIN "gfx/footprints/arbok.1bpp"
INCBIN "gfx/footprints/pikachu.1bpp"
INCBIN "gfx/footprints/raichu.1bpp"
INCBIN "gfx/footprints/gorochu.1bpp"
INCBIN "gfx/footprints/sandshrew.1bpp"
INCBIN "gfx/footprints/sandslash.1bpp"
INCBIN "gfx/footprints/nidoran_f.1bpp"
@ -267,4 +268,4 @@ INCBIN "gfx/footprints/254.1bpp"
INCBIN "gfx/footprints/255.1bpp"
INCBIN "gfx/footprints/256.1bpp"
assert_table_length $109 ; don't forget to update this
assert_table_length $110 ; don't forget to update this

BIN
gfx/footprints/gorochu.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 87 B

5
gfx/pics.asm
View file

@ -777,3 +777,8 @@ INCBIN "gfx/pokemon/unown_y/back.2bpp.lz"
INCBIN "gfx/pokemon/unown_p/back.2bpp.lz"
INCBIN "gfx/pokemon/unown_i/back.2bpp.lz"
INCBIN "gfx/pokemon/unown_r/back.2bpp.lz"
SECTION "Pics 20", ROMX
GorochuFrontpic: INCBIN "gfx/pokemon/gorochu/front.animated.2bpp.lz"
GorochuBackpic: INCBIN "gfx/pokemon/gorochu/back.2bpp.lz"

1
gfx/pokemon/anim_pointers.asm
View file

@ -26,6 +26,7 @@ AnimationPointers:
dw ArbokAnimation
dw PikachuAnimation
dw RaichuAnimation
dw GorochuAnimation
dw SandshrewAnimation
dw SandslashAnimation
dw NidoranFAnimation

1
gfx/pokemon/anims.asm
View file

@ -24,6 +24,7 @@ EkansAnimation: INCLUDE "gfx/pokemon/ekans/anim.asm"
ArbokAnimation: INCLUDE "gfx/pokemon/arbok/anim.asm"
PikachuAnimation: INCLUDE "gfx/pokemon/pikachu/anim.asm"
RaichuAnimation: INCLUDE "gfx/pokemon/raichu/anim.asm"
GorochuAnimation: INCLUDE "gfx/pokemon/gorochu/anim.asm"
SandshrewAnimation: INCLUDE "gfx/pokemon/sandshrew/anim.asm"
SandslashAnimation: INCLUDE "gfx/pokemon/sandslash/anim.asm"
NidoranFAnimation: INCLUDE "gfx/pokemon/nidoran_f/anim.asm"

BIN
gfx/pokemon/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -26,6 +26,7 @@ BitmasksPointers:
dw ArbokBitmasks
dw PikachuBitmasks
dw RaichuBitmasks
dw GorochuBitmasks
dw SandshrewBitmasks
dw SandslashBitmasks
dw NidoranFBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -24,6 +24,7 @@ EkansBitmasks: INCLUDE "gfx/pokemon/ekans/bitmask.asm"
ArbokBitmasks: INCLUDE "gfx/pokemon/arbok/bitmask.asm"
PikachuBitmasks: INCLUDE "gfx/pokemon/pikachu/bitmask.asm"
RaichuBitmasks: INCLUDE "gfx/pokemon/raichu/bitmask.asm"
GorochuBitmasks: INCLUDE "gfx/pokemon/gorochu/bitmask.asm"
SandshrewBitmasks: INCLUDE "gfx/pokemon/sandshrew/bitmask.asm"
SandslashBitmasks: INCLUDE "gfx/pokemon/sandslash/bitmask.asm"
NidoranFBitmasks: INCLUDE "gfx/pokemon/nidoran_f/bitmask.asm"

1
gfx/pokemon/frame_pointers.asm
View file

@ -26,6 +26,7 @@ FramesPointers:
dba ArbokFrames
dba PikachuFrames
dba RaichuFrames
dba GorochuFrames
dba SandshrewFrames
dba SandslashFrames
dba NidoranFFrames

BIN
gfx/pokemon/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

1
gfx/pokemon/gorochu/anim.asm Normal file
View file

@ -0,0 +1 @@
endanim

1
gfx/pokemon/gorochu/anim_idle.asm Normal file
View file

@ -0,0 +1 @@
endanim

BIN
gfx/pokemon/gorochu/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 304 B

BIN
gfx/pokemon/gorochu/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 315 B

2
gfx/pokemon/gorochu/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 22, 22, 12
RGB 07, 15, 25

1
gfx/pokemon/idle_pointers.asm
View file

@ -26,6 +26,7 @@ AnimationIdlePointers:
dw ArbokAnimationIdle
dw PikachuAnimationIdle
dw RaichuAnimationIdle
dw GorochuAnimationIdle
dw SandshrewAnimationIdle
dw SandslashAnimationIdle
dw NidoranFAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -24,6 +24,7 @@ EkansAnimationIdle: INCLUDE "gfx/pokemon/ekans/anim_idle.asm"
ArbokAnimationIdle: INCLUDE "gfx/pokemon/arbok/anim_idle.asm"
PikachuAnimationIdle: INCLUDE "gfx/pokemon/pikachu/anim_idle.asm"
RaichuAnimationIdle: INCLUDE "gfx/pokemon/raichu/anim_idle.asm"
GorochuAnimationIdle: INCLUDE "gfx/pokemon/gorochu/anim_idle.asm"
SandshrewAnimationIdle: INCLUDE "gfx/pokemon/sandshrew/anim_idle.asm"
SandslashAnimationIdle: INCLUDE "gfx/pokemon/sandslash/anim_idle.asm"
NidoranFAnimationIdle: INCLUDE "gfx/pokemon/nidoran_f/anim_idle.asm"

1
gfx/pokemon/kanto_frames.asm
View file

@ -26,6 +26,7 @@ EkansFrames: INCLUDE "gfx/pokemon/ekans/frames.asm"
ArbokFrames: INCLUDE "gfx/pokemon/arbok/frames.asm"
PikachuFrames: INCLUDE "gfx/pokemon/pikachu/frames.asm"
RaichuFrames: INCLUDE "gfx/pokemon/raichu/frames.asm"
GorochuFrames: INCLUDE "gfx/pokemon/gorochu/frames.asm"
SandshrewFrames: INCLUDE "gfx/pokemon/sandshrew/frames.asm"
SandslashFrames: INCLUDE "gfx/pokemon/sandslash/frames.asm"
NidoranFFrames: INCLUDE "gfx/pokemon/nidoran_f/frames.asm"

3
layout.link
View file

@ -169,7 +169,6 @@ ROMX $3b
ROMX $3c
"Songs 3"
"Sound Effects"
"Cries"
ROMX $3d
"Songs 4"
ROMX $3e
@ -317,6 +316,8 @@ ROMX $7e
ROMX $7f
org $7de0
"Stadium 2 Checksums"
ROMX $80
"Cries"
WRAM0
"Stack"
"Audio RAM"

8
maps/PlayersHouse2F.asm
View file

@ -125,12 +125,12 @@ DebugPokemon1Script:
DebugPokemon2Script:
opentext
getmonname STRING_BUFFER_3, NIDORINO
getmonname STRING_BUFFER_3, GOROCHU
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke NIDORINO, 36, POISON_STONE
givepoke GOROCHU, 35, POISON_STONE
closetext
end
@ -145,11 +145,11 @@ DebugPokemon3Script:
faceplayer
opentext
writetext DebugTextA
cry WALKING_WAKE
cry GOROCHU
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_SUICUNE
loadwildmon WALKING_WAKE, 40
loadwildmon GOROCHU, 40
startbattle
reloadmapafterbattle
end