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' of https://github.com/ZetaNull/jep-hack

Browse source
This commit is contained in:
Zeta_Null 2023-10-26 15:26:09 -04:00
commit a8a942cefb
57 changed files with 501 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/events/special_pointers.asm
View file

@ -183,3 +183,6 @@ SpecialsPointers::
add_special InitialSetDSTFlag
add_special InitialClearDSTFlag
add_special UnusedDummySpecial ; unused
; Tradeback NPC tutorial
add_special TradebackNPC

16
data/items/marts.asm
View file

@ -35,6 +35,7 @@ Marts:
dw MartMtMoon
dw MartIndigoPlateau
dw MartUnderground
dw MartLakeOfRage
assert_table_length NUM_MARTS
MartCherrygrove:
@ -405,3 +406,18 @@ DefaultMart:
db POKE_BALL
db POTION
db -1 ; end
; Excludes the Moon and Sun Stones, which are "treasure" items.
; Designed to solve the "stone problem" faced by Pokemon like Bellsprout in the early-game.
MartLakeOfRage:
db 9
db FIRE_STONE
db THUNDERSTONE
db WATER_STONE
db LEAF_STONE
db HEART_STONE
db POISON_STONE
db ICE_STONE
db DUSK_STONE
db SHINY_STONE
db -1 ; end

3
data/maps/attributes.asm
View file

@ -568,6 +568,7 @@ ENDM
map_attributes RedsHouse1F, REDS_HOUSE_1F, $00, 0
map_attributes RedsHouse2F, REDS_HOUSE_2F, $00, 0
map_attributes BluesHouse, BLUES_HOUSE, $00, 0
map_attributes LakeOfRageTraderHouse, LAKE_OF_RAGE_TRADER_HOUSE, $00, 0
map_attributes OaksLab, OAKS_LAB, $00, 0
map_attributes PewterNidoranSpeechHouse, PEWTER_NIDORAN_SPEECH_HOUSE, $00, 0
map_attributes PewterGym, PEWTER_GYM, $00, 0
@ -603,11 +604,13 @@ ENDM
map_attributes SafariZoneWardensHome, SAFARI_ZONE_WARDENS_HOME, $00, 0
map_attributes Route15FuchsiaGate, ROUTE_15_FUCHSIA_GATE, $00, 0
map_attributes LavenderPokecenter1F, LAVENDER_POKECENTER_1F, $00, 0
map_attributes LakeOfRagePokecenter1F, LAKE_OF_RAGE_POKECENTER_1F, $00, 0
map_attributes LavenderPokecenter2FBeta, LAVENDER_POKECENTER_2F_BETA, $00, 0
map_attributes MrFujisHouse, MR_FUJIS_HOUSE, $00, 0
map_attributes LavenderSpeechHouse, LAVENDER_SPEECH_HOUSE, $00, 0
map_attributes LavenderNameRater, LAVENDER_NAME_RATER, $00, 0
map_attributes LavenderMart, LAVENDER_MART, $00, 0
map_attributes LakeOfRageMart, LAKE_OF_RAGE_MART, $00, 0
map_attributes SoulHouse, SOUL_HOUSE, $00, 0
map_attributes LavRadioTower1F, LAV_RADIO_TOWER_1F, $00, 0
map_attributes Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0

3
data/maps/blocks.asm
View file

@ -198,6 +198,7 @@ CherrygroveGymSpeechHouse_Blocks:
GuideGentsHouse_Blocks:
CherrygroveEvolutionSpeechHouse_Blocks:
Route30BerryHouse_Blocks:
LakeOfRageTraderHouse_Blocks:
INCBIN "maps/House1.ablk"
SafariZoneFuchsiaGateBeta_Blocks:
@ -334,6 +335,7 @@ LavenderMart_Blocks:
ViridianMart_Blocks:
SaffronMart_Blocks:
CherrygroveMart_Blocks:
LakeOfRageMart_Blocks:
INCBIN "maps/Mart.ablk"
Route10North_Blocks:
@ -363,6 +365,7 @@ CianwoodPokecenter1F_Blocks:
ViridianPokecenter1F_Blocks:
SaffronPokecenter1F_Blocks:
CherrygrovePokecenter1F_Blocks:
LakeOfRagePokecenter1F_Blocks:
INCBIN "maps/Pokecenter1F.ablk"
BetaPewterMuseumOfScience1F_Blocks: ; unreferenced

3
data/maps/maps.asm
View file

@ -73,6 +73,9 @@ MapGroup_Mahogany:
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 MahoganyTown, TILESET_JOHTO, TOWN, LANDMARK_MAHOGANY_TOWN, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map LakeOfRageTraderHouse, TILESET_HOUSE, INDOOR, LANDMARK_OLIVINE_CITY, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRagePokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map LakeOfRageMart, TILESET_MART, INDOOR, LANDMARK_MAHOGANY_TOWN, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_MAHOGANY_MAPS
MapGroup_Dungeons:

3
data/maps/scripts.asm
View file

@ -494,3 +494,6 @@ INCLUDE "maps/CeruleanCave1F.asm"
INCLUDE "maps/CeruleanCave2F.asm"
INCLUDE "maps/CeruleanCaveB1F.asm"
INCLUDE "maps/SilentHills.asm"
INCLUDE "maps/LakeOfRageTraderHouse.asm"
INCLUDE "maps/LakeOfRagePokecenter1F.asm"
INCLUDE "maps/LakeOfRageMart.asm"

1
data/pokemon/base_stats.asm
View file

@ -98,6 +98,7 @@ INCLUDE "data/pokemon/base_stats/machamp.asm"
INCLUDE "data/pokemon/base_stats/bellsprout.asm"
INCLUDE "data/pokemon/base_stats/weepinbell.asm"
INCLUDE "data/pokemon/base_stats/victreebel.asm"
INCLUDE "data/pokemon/base_stats/bellignan.asm"
INCLUDE "data/pokemon/base_stats/tentacool.asm"
INCLUDE "data/pokemon/base_stats/tentacruel.asm"
INCLUDE "data/pokemon/base_stats/geodude.asm"

1
data/pokemon/cries.asm
View file

@ -77,6 +77,7 @@ PokemonCries::
mon_cry CRY_PSYDUCK, 85, 129 ; BELLSPROUT
mon_cry CRY_WEEPINBELL, 68, 160 ; WEEPINBELL
mon_cry CRY_WEEPINBELL, 102, 332 ; VICTREEBEL
mon_cry CRY_SLOWKING, 573, 320 ; BELLIGNAN
mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL
mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL
mon_cry CRY_VULPIX, 240, 144 ; GEODUDE

1
data/pokemon/dex_entries.asm
View file

@ -75,6 +75,7 @@ MachampPokedexEntry:: INCLUDE "data/pokemon/dex_entries/machamp.asm"
BellsproutPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellsprout.asm"
WeepinbellPokedexEntry:: INCLUDE "data/pokemon/dex_entries/weepinbell.asm"
VictreebelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/victreebel.asm"
BellignanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/bellignan.asm"
TentacoolPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tentacool.asm"
TentacruelPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tentacruel.asm"
GeodudePokedexEntry:: INCLUDE "data/pokemon/dex_entries/geodude.asm"

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

@ -0,0 +1,10 @@
db "SPROUT@" ; species name
dw 403, 160 ; height, weight
db "It lives through"
next "absorbing nutrients"
next "in the ground with"
page "its root-like"
next "feet. Revered"
next "by some faiths.@"

1
data/pokemon/dex_entry_pointers.asm
View file

@ -72,6 +72,7 @@ PokedexDataPointerTable:
dba BellsproutPokedexEntry
dba WeepinbellPokedexEntry
dba VictreebelPokedexEntry
dba BellignanPokedexEntry
dba TentacoolPokedexEntry
dba TentacruelPokedexEntry
dba GeodudePokedexEntry

1
data/pokemon/dex_order_alpha.asm
View file

@ -14,6 +14,7 @@ AlphabeticalPokedexOrder:
dw AZUMARILL
dw BAYLEEF
dw BEEDRILL
dw BELLIGNAN
dw BELLOSSOM
dw BELLSPROUT
dw BLASTOISE

1
data/pokemon/dex_order_new.asm
View file

@ -68,6 +68,7 @@ NewPokedexOrder:
dw BELLSPROUT
dw WEEPINBELL
dw VICTREEBEL
dw BELLIGNAN
dw HOPPIP
dw SKIPLOOM
dw JUMPLUFF

1
data/pokemon/egg_moves_kanto.asm
View file

@ -72,6 +72,7 @@ EggMovePointers1:
dw BellsproutEggMoves
dw NoEggMoves1
dw NoEggMoves1
dw NoEggMoves1 ; Bellignan
dw TentacoolEggMoves
dw NoEggMoves1
dw GeodudeEggMoves

12
data/pokemon/evos_attacks_kanto.asm
View file

@ -72,6 +72,7 @@ EvosAttacksPointers1::
dw BellsproutEvosAttacks
dw WeepinbellEvosAttacks
dw VictreebelEvosAttacks
dw BellignanEvosAttacks
dw TentacoolEvosAttacks
dw TentacruelEvosAttacks
dw GeodudeEvosAttacks
@ -1069,6 +1070,7 @@ BellsproutEvosAttacks:
WeepinbellEvosAttacks:
dbbw EVOLVE_ITEM, LEAF_STONE, VICTREEBEL
dbbw EVOLVE_ITEM, POISON_STONE, BELLIGNAN
db 0 ; no more evolutions
dbw 1, VINE_WHIP
dbw 1, GROWTH
@ -1092,6 +1094,16 @@ VictreebelEvosAttacks:
dbw 1, RAZOR_LEAF
db 0 ; no more level-up moves
BellignanEvosAttacks:
db 0 ; no more evolutions
dbw 1, SLEEP_POWDER
dbw 1, RAZOR_LEAF
dbw 1, LOVELY_KISS
dbw 1, ACID
dbw 40, LOVELY_KISS
dbw 48, SLUDGE_BOMB
db 0 ; no more level-up moves
TentacoolEvosAttacks:
dbbw EVOLVE_LEVEL, 30, TENTACRUEL
db 0 ; no more evolutions

1
data/pokemon/first_stages.asm
View file

@ -72,6 +72,7 @@ FirstEvoStages::
dw BELLSPROUT
dw BELLSPROUT
dw BELLSPROUT
dw BELLSPROUT
dw TENTACOOL ;48
dw TENTACOOL
dw GEODUDE

1
data/pokemon/gen1_base_special.asm
View file

@ -73,6 +73,7 @@ KantoMonSpecials:
db 70 ; BELLSPROUT
db 85 ; WEEPINBELL
db 100 ; VICTREEBEL
db 100 ; BELLIGNAN
db 100 ; TENTACOOL
db 120 ; TENTACRUEL
db 30 ; GEODUDE

1
data/pokemon/gen1_order.asm
View file

@ -255,4 +255,5 @@ Pokered_MonIndices:
db QWILFISH
db WOBBUFFET
db WOBBUFFET
db BELLIGNAN
assert_table_length NUM_POKEMON + 1

1
data/pokemon/menu_icons.asm
View file

@ -73,6 +73,7 @@ MonMenuIcons:
db ICON_ODDISH ; BELLSPROUT
db ICON_ODDISH ; WEEPINBELL
db ICON_ODDISH ; VICTREEBEL
db ICON_ODDISH ; BELLIGNAN
db ICON_JELLYFISH ; TENTACOOL
db ICON_JELLYFISH ; TENTACRUEL
db ICON_GEODUDE ; GEODUDE

1
data/pokemon/names.asm
View file

@ -75,6 +75,7 @@ PokemonNames::
db "BELLSPROUT"
db "WEEPINBELL"
db "VICTREEBEL"
db "BELLIGNAN@"
db "TENTACOOL@"
db "TENTACRUEL"
db "GEODUDE@@@"

2
data/pokemon/palettes.asm
View file

@ -175,6 +175,8 @@ INCBIN "gfx/pokemon/weepinbell/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/weepinbell/shiny.pal"
INCBIN "gfx/pokemon/victreebel/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/victreebel/shiny.pal"
INCBIN "gfx/pokemon/bellignan/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/victreebel/shiny.pal"
INCBIN "gfx/pokemon/tentacool/front.gbcpal", middle_colors
INCLUDE "gfx/pokemon/tentacool/shiny.pal"
INCBIN "gfx/pokemon/tentacruel/front.gbcpal", middle_colors

2
data/pokemon/pic_pointers.asm
View file

@ -155,6 +155,8 @@ PokemonPicPointers::
dba WeepinbellBackpic
dba VictreebelFrontpic
dba VictreebelBackpic
dba BellignanFrontpic
dba BellignanBackpic
dba TentacoolFrontpic
dba TentacoolBackpic
dba TentacruelFrontpic