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

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

3
constants/map_constants.asm
View file

@ -60,6 +60,9 @@ ENDM
map_const ROUTE_42, 30, 9 ; 5
map_const ROUTE_44, 30, 9 ; 6
map_const MAHOGANY_TOWN, 10, 9 ; 7
map_const LAKE_OF_RAGE_TRADER_HOUSE, 4, 4 ; 8
map_const LAKE_OF_RAGE_POKECENTER_1F, 5, 4 ; 9
map_const LAKE_OF_RAGE_MART, 6, 4 ; 10
endgroup
newgroup DUNGEONS ; 3

1
constants/mart_constants.asm
View file

@ -42,4 +42,5 @@
const MART_MT_MOON
const MART_INDIGO_PLATEAU
const MART_UNDERGROUND
const MART_LAKEOFRAGE
DEF NUM_MARTS EQU const_value

1
constants/pokemon_constants.asm
View file

@ -90,6 +90,7 @@
const BELLSPROUT ; 45
const WEEPINBELL ; 46
const VICTREEBEL ; 47
const BELLIGNAN
const TENTACOOL ; 48
const TENTACRUEL ; 49
const GEODUDE ; 4a

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

5
engine/events/specials.asm
View file

@ -420,3 +420,8 @@ TrainerHouse:
ld a, [sMysteryGiftTrainerHouseFlag]
ld [wScriptVar], a
jp CloseSRAM
; Tradeback NPC tutorial
TradebackNPC:
farcall TradebackGuy
ret

140
engine/events/tradeback_npc.asm Normal file
View file

@ -0,0 +1,140 @@
; Fun fact, the 'trade' part of a trade isn't checked to evolve a Pokémon.
; It seems that just the trade animation and the link state are enough.
; No Pokémon is actualy ever moved to or from your party because of that fact.
TradebackGuy::
ld hl, TradebackGuyText
call PrintText
call YesNoBox
ld hl, TradebackGuyCanceledText
jr c, .done
; Select a Pokémon from the party.
ld b, PARTYMENUACTION_GIVE_MON
farcall SelectTradeOrDayCareMon
ld a, [wCurPartyMon]
ld hl, TradebackGuyCanceledText
jr c, .done
ld hl, NPCTradeCableText
call PrintText
call TradeWithTradebackGuy
call RestartMapMusic
ld hl, TradebackGuyCompleteText
call PrintText
ret
.done
call PrintText
ret
; Loads the appropriate data to perform the trade animation.
TradeWithTradebackGuy:
; Sets the link state to trading so that evolution is possible.
ld a, LINK_TRADECENTER
ld [wLinkMode], a
; Establish names of trading trainers
ld hl, wPlayerName
ld de, wPlayerTrademonSenderName
ld bc, NAME_LENGTH
call CopyBytes
ld hl, .tradeback_guy_name
ld de, wOTTrademonSenderName
ld bc, NAME_LENGTH
call CopyBytes
.tradeback_guy_name:
db "TRADER@@@"
; Establish the Pokémon's species.
ld a, [wCurPartyMon]
ld hl, wPartySpecies
ld b, 0
ld c, a
add hl, bc
ld a, [hl]
ld [wPlayerTrademonSpecies], a
ld [wOTTrademonSpecies], a
; Establish Pokémon's ID number.
ld hl, wPartyMon1ID
ld a, [wCurPartyMon]
call GetPartyLocation
ld a, [hli]
ld [wPlayerTrademonID], a
ld [wOTTrademonID], a
ld a, [hl]
ld [wPlayerTrademonID + 1], a
ld [wOTTrademonID + 1], a
; Correctly display Pokémon shiny status on the trade screen.
ld hl, wPartyMon1DVs
ld a, [wCurPartyMon]
call GetPartyLocation
ld a, [hli]
ld [wPlayerTrademonDVs], a
ld [wOTTrademonDVs], a
ld a, [hl]
ld [wPlayerTrademonDVs + 1], a
ld [wOTTrademonDVs + 1], a
; Establish Pokémon's OT's name
ld a, [wCurPartyMon]
ld hl, wPartyMonOTs
call SkipNames
ld de, wPlayerTrademonOTName
ld bc, NAME_LENGTH
call CopyBytes
ld hl, wPartyMonOTs
ld de, wOTTrademonOTName
ld bc, NAME_LENGTH
call CopyBytes
; Makes it so that pressing B will not cancel the evolution.
; This is standard for trade based evolution.
ld a, 1
ld [wForceEvolution], a
; Run the trade animation/ evolves the mon if applicable.
call DisableSpriteUpdates
; wTradeDialog aliases wFrameCounter, which TradeAnimation uses.
ld a, [wTradeDialog]
push af
predef TradeAnimation
callfar EvolvePokemon
pop af
ld [wTradeDialog], a
call ReturnToMapWithSpeechTextbox
; Changes the link mode back to not linked, battles won't work right otherwise.
ld a, LINK_NULL
ld [wLinkMode], a
ret
TradebackGuyText::
text "Hey there! I'm"
line "the TRADER!"
para "I love helping"
line "TRAINERs evolve"
cont "their #MON!"
para "Wanna try?"
done
TradebackGuyCanceledText::
text "Oh, ok then."
para "Come back if you"
line "change your mind!"
done
TradebackGuyCompleteText::
text "And...done!"
para "I hope that"
line "was helpful!"
done

10
engine/items/item_effects.asm
View file

@ -148,14 +148,14 @@ ItemEffects:
dw NoEffect ; STAR_PIECE
dw BasementKeyEffect ; BASEMENT_KEY
dw NoEffect ; PASS
dw NoEffect ; ITEM_87
dw NoEffect ; ITEM_88
dw NoEffect ; ITEM_89
dw EvoStoneEffect ; HEART_STONE
dw EvoStoneEffect ; POISON_STONE
dw EvoStoneEffect ; ICE_STONE
dw NoEffect ; CHARCOAL
dw RestoreHPEffect ; BERRY_JUICE
dw NoEffect ; SCOPE_LENS
dw NoEffect ; ITEM_8D
dw NoEffect ; ITEM_8E
dw EvoStoneEffect ; DUSK_STONE
dw EvoStoneEffect ; SHINY_STONE
dw NoEffect ; METAL_COAT
dw NoEffect ; DRAGON_FANG
dw NoEffect ; ITEM_91

1
gfx/footprints.asm
View file

@ -72,6 +72,7 @@ INCBIN "gfx/footprints/machamp.1bpp"
INCBIN "gfx/footprints/bellsprout.1bpp"
INCBIN "gfx/footprints/weepinbell.1bpp"
INCBIN "gfx/footprints/victreebel.1bpp"
;INCBIN "gfx/footprints/bellignan.1bpp"
INCBIN "gfx/footprints/tentacool.1bpp"
INCBIN "gfx/footprints/tentacruel.1bpp"
INCBIN "gfx/footprints/geodude.1bpp"

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 106 B

2
gfx/pics.asm
View file

@ -717,6 +717,8 @@ TotartleFrontpic: INCBIN "gfx/pokemon/totartle/front.animated.2bpp.lz"
TotartleBackpic: INCBIN "gfx/pokemon/totartle/back.2bpp.lz"
BlastykeFrontpic: INCBIN "gfx/pokemon/blastyke/front.animated.2bpp.lz"
BlastykeBackpic: INCBIN "gfx/pokemon/blastyke/back.2bpp.lz"
BellignanFrontpic: INCBIN "gfx/pokemon/bellignan/front.animated.2bpp.lz"
BellignanBackpic: INCBIN "gfx/pokemon/bellignan/back.2bpp.lz"
INCBIN "gfx/pokemon/poliwag/back.2bpp.lz"
INCBIN "gfx/pokemon/squirtle/back.2bpp.lz"
INCBIN "gfx/pokemon/shuckle/back.2bpp.lz"

1
gfx/pokemon/anim_pointers.asm
View file

@ -71,6 +71,7 @@ AnimationPointers:
dw BellsproutAnimation
dw WeepinbellAnimation
dw VictreebelAnimation
dw BellignanAnimation
dw TentacoolAnimation
dw TentacruelAnimation
dw GeodudeAnimation

1
gfx/pokemon/anims.asm
View file

@ -69,6 +69,7 @@ MachampAnimation: INCLUDE "gfx/pokemon/machamp/anim.asm"
BellsproutAnimation: INCLUDE "gfx/pokemon/bellsprout/anim.asm"
WeepinbellAnimation: INCLUDE "gfx/pokemon/weepinbell/anim.asm"
VictreebelAnimation: INCLUDE "gfx/pokemon/victreebel/anim.asm"
BellignanAnimation: INCLUDE "gfx/pokemon/bellignan/anim.asm"
TentacoolAnimation: INCLUDE "gfx/pokemon/tentacool/anim.asm"
TentacruelAnimation: INCLUDE "gfx/pokemon/tentacruel/anim.asm"
GeodudeAnimation: INCLUDE "gfx/pokemon/geodude/anim.asm"

19
gfx/pokemon/bellignan/anim.asm Normal file
View file

@ -0,0 +1,19 @@
frame 0, 06
frame 1, 06
frame 2, 04
frame 3, 04
frame 4, 08
frame 5, 08
frame 6, 08
frame 7, 08
frame 1, 06
frame 2, 10
frame 8, 08
frame 9, 08
frame 10, 08
frame 11, 08
frame 9, 08
frame 11, 08
frame 9, 08
frame 11, 08
endanim

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

@ -0,0 +1 @@
endanim

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 887 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

2
gfx/pokemon/bellignan/readme.txt Normal file
View file

@ -0,0 +1,2 @@
This spritework is taken from Pokemon October, which finished Game Freak's design.
https://github.com/pokeachromicdevs/pokeoctober/tree/demo-2/gfx/pokemon/bellignan

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

@ -0,0 +1,2 @@
RGB 20, 23, 03
RGB 14, 12, 31

1
gfx/pokemon/bitmask_pointers.asm
View file

@ -71,6 +71,7 @@ BitmasksPointers:
dw BellsproutBitmasks
dw WeepinbellBitmasks
dw VictreebelBitmasks
dw BellignanBitmasks
dw TentacoolBitmasks
dw TentacruelBitmasks
dw GeodudeBitmasks

1
gfx/pokemon/bitmasks.asm
View file

@ -69,6 +69,7 @@ MachampBitmasks: INCLUDE "gfx/pokemon/machamp/bitmask.asm"
BellsproutBitmasks: INCLUDE "gfx/pokemon/bellsprout/bitmask.asm"
WeepinbellBitmasks: INCLUDE "gfx/pokemon/weepinbell/bitmask.asm"
VictreebelBitmasks: INCLUDE "gfx/pokemon/victreebel/bitmask.asm"
BellignanBitmasks: INCLUDE "gfx/pokemon/bellignan/bitmask.asm"
TentacoolBitmasks: INCLUDE "gfx/pokemon/tentacool/bitmask.asm"
TentacruelBitmasks: INCLUDE "gfx/pokemon/tentacruel/bitmask.asm"
GeodudeBitmasks: INCLUDE "gfx/pokemon/geodude/bitmask.asm"

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 351 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 595 B

1
gfx/pokemon/frame_pointers.asm
View file

@ -71,6 +71,7 @@ FramesPointers:
dba BellsproutFrames
dba WeepinbellFrames
dba VictreebelFrames
dba BellignanFrames
dba TentacoolFrames
dba TentacruelFrames
dba GeodudeFrames

1
gfx/pokemon/idle_pointers.asm
View file

@ -71,6 +71,7 @@ AnimationIdlePointers:
dw BellsproutAnimationIdle
dw WeepinbellAnimationIdle
dw VictreebelAnimationIdle
dw BellignanAnimationIdle
dw TentacoolAnimationIdle
dw TentacruelAnimationIdle
dw GeodudeAnimationIdle

1
gfx/pokemon/idles.asm
View file

@ -69,6 +69,7 @@ MachampAnimationIdle: INCLUDE "gfx/pokemon/machamp/anim_idle.asm"
BellsproutAnimationIdle: INCLUDE "gfx/pokemon/bellsprout/anim_idle.asm"
WeepinbellAnimationIdle: INCLUDE "gfx/pokemon/weepinbell/anim_idle.asm"
VictreebelAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm"
BellignanAnimationIdle: INCLUDE "gfx/pokemon/victreebel/anim_idle.asm"
TentacoolAnimationIdle: INCLUDE "gfx/pokemon/tentacool/anim_idle.asm"
TentacruelAnimationIdle: INCLUDE "gfx/pokemon/tentacruel/anim_idle.asm"
GeodudeAnimationIdle: INCLUDE "gfx/pokemon/geodude/anim_idle.asm"

1
gfx/pokemon/kanto_frames.asm
View file

@ -71,6 +71,7 @@ MachampFrames: INCLUDE "gfx/pokemon/machamp/frames.asm"
BellsproutFrames: INCLUDE "gfx/pokemon/bellsprout/frames.asm"
WeepinbellFrames: INCLUDE "gfx/pokemon/weepinbell/frames.asm"
VictreebelFrames: INCLUDE "gfx/pokemon/victreebel/frames.asm"
BellignanFrames: INCLUDE "gfx/pokemon/bellignan/frames.asm"
TentacoolFrames: INCLUDE "gfx/pokemon/tentacool/frames.asm"
TentacruelFrames: INCLUDE "gfx/pokemon/tentacruel/frames.asm"
GeodudeFrames: INCLUDE "gfx/pokemon/geodude/frames.asm"

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 411 B

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 870 B

After

Width:  |  Height:  |  Size: 890 B

2
main.asm
View file

@ -480,7 +480,7 @@ SECTION "bank3F", ROMX
INCLUDE "engine/tilesets/tileset_anims.asm"
INCLUDE "engine/events/npc_trade.asm"
INCLUDE "engine/events/mom_phone.asm"
INCLUDE "engine/events/tradeback_npc.asm" ; Tradeback NPC tutorial
SECTION "mobile40", ROMX

8
maps/FuchsiaMart.asm
View file

@ -21,11 +21,9 @@ FuchsiaMartCooltrainerFScript:
jumptextfaceplayer FuchsiaMartCooltrainerFText
FuchsiaMartFisherText:
text "I was hoping to"
line "buy some SAFARI"
para "ZONE souvenirs,"
line "but it's closed…"
text "I'm buying some"
line "SAFARI ZONE"
cont "souvenirs!"
done
FuchsiaMartCooltrainerFText:

2
maps/LakeOfRage.ablk
View file

@ -1 +1 @@
,-aaaaaaa./aaa]]a\]<eeaab>f\<eeef[eea\]^\b`]<a<eeb=aTvUb?aa\]<facf`Tvy5Ydbbade\]<eeeeX555Ya>]aa[]aaTvvy555Y<[]]]<aTy55555Y\fa\<aX555555Y<b`aTvy555555YbcaTy555555Y^b]^>X5555555YbeeX55555Ya?jpp=aX5YGfhqqeWKee`ehqqaKWa`Gjqqqe=]hqqqdlrqq
\^af\a\^afG^f\\f>^fTU^abfd?fdTvyY>dG\fd\X55Ya^d?f^Tvy55Y<d`f\\Ty555Y`f]\?\aX555Y\\^?Tvvy555Y^<fTvy555555Y^bd\bf^X5555555Ydf\ffTy5555555Y\b\af\fX55555Ya^d<d\daX555Yfd\\G`f^^\<G^\<bad>>e\adfa

57
maps/LakeOfRage.asm
View file

@ -11,6 +11,7 @@
const LAKEOFRAGE_WESLEY
const LAKEOFRAGE_POKE_BALL1
const LAKEOFRAGE_POKE_BALL2
const LAKEOFRAGE_CAMERAMAN
LakeOfRage_MapScripts:
def_scene_scripts
@ -125,6 +126,9 @@ LakeOfRageSuperNerdScript:
LakeOfRageCooltrainerFScript:
jumptextfaceplayer LakeOfRageCooltrainerFText
LakeOfRageCameramanScript:
jumptextfaceplayer LakeOfRageCameramanText
LakeOfRageSign:
jumptext LakeOfRageSignText
@ -491,32 +495,51 @@ FishingGurusHouseSignText:
line "HOUSE"
done
LakeOfRageCameramanText: ; Reference to the Battle Zone
text "Hohoho!"
para "Am I lucky to"
line "have been here"
cont "when that MAGIKARP"
cont "evolved!"
para "This film is"
line "gonna make me"
cont "rich!"
done
LakeOfRage_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1
warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1
warp_event 21, 5, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1
warp_event 35, 29, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1
warp_event 3, 9, LAKE_OF_RAGE_MART, 1
warp_event 5, 19, LAKE_OF_RAGE_POKECENTER_1F, 1
warp_event 17, 13, LAKE_OF_RAGE_TRADER_HOUSE, 1
; warp_event 10, 5, LAKE_OF_RAGE_PRE_GYM, 1 ; tbd
def_coord_events
def_bg_events
bg_event 21, 27, BGEVENT_READ, LakeOfRageSign
bg_event 25, 31, BGEVENT_READ, MagikarpHouseSignScript
bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
bg_event 19, 31, BGEVENT_READ, LakeOfRageSign
bg_event 33, 29, BGEVENT_READ, MagikarpHouseSignScript
bg_event 3, 31, BGEVENT_ITEM, LakeOfRageHiddenFullRestore
bg_event 9, 11, BGEVENT_ITEM, LakeOfRageHiddenRareCandy
bg_event 19, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion
def_object_events
object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE
object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageGrampsScript, -1
object_event 19, 32, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE
object_event 20, 30, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageGrampsScript, -1
object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1
object_event 25, 29, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1
object_event 30, 23, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 24, 26, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 4, 15, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 9, 9, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCooltrainerFScript, -1
object_event 21, 15, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherAndre, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 31, 22, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 1, TrainerFisherRaymond, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 2, 25, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerCooltrainermAaron, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 36, 7, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 0, TrainerCooltrainerfLois, EVENT_LAKE_OF_RAGE_CIVILIANS
object_event 18, 22, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RedGyarados, EVENT_LAKE_OF_RAGE_RED_GYARADOS
object_event 4, 4, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
object_event 7, 10, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
object_event 35, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
object_event 19, 26, SPRITE_GYARADOS, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RedGyarados, EVENT_LAKE_OF_RAGE_RED_GYARADOS
object_event 9, 11, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, WesleyScript, EVENT_LAKE_OF_RAGE_WESLEY_OF_WEDNESDAY
object_event 7, 27, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageElixer, EVENT_LAKE_OF_RAGE_ELIXER
object_event 27, 8, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, LakeOfRageTMDetect, EVENT_LAKE_OF_RAGE_TM_DETECT
object_event 11, 18, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageCameramanScript, -1

54
maps/LakeOfRageMart.asm Normal file
View file

@ -0,0 +1,54 @@
object_const_def
const LAKEOFRAGEMART_CLERK
const LAKEOFRAGEMART_GRAMPS
const LAKEOFRAGEMART_POKEFAN_F
LakeOfRageMart_MapScripts:
def_scene_scripts
def_callbacks
LakeOfRageMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_LAKEOFRAGE
closetext
end
LakeOfRageMartPokefanFScript:
jumptextfaceplayer LakeOfRageMartPokefanFText
LakeOfRageMartGrampsScript:
jumptextfaceplayer LakeOfRageMartGrampsText
LakeOfRageMartPokefanFText:
text "This shop sells"
line "so many STONEs!"
para "I'm spoiled for"
line "choice!"
done
LakeOfRageMartGrampsText:
text "The TRADER helped"
line "me evolve my"
cont "RAICHU!"
para "...what's with"
line "that look?"
done
LakeOfRageMart_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 2, 7, LAKE_OF_RAGE, 3
warp_event 3, 7, LAKE_OF_RAGE, 3
def_coord_events
def_bg_events
def_object_events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageMartClerkScript, -1
object_event 6, 6, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LakeOfRageMartPokefanFScript, -1
object_event 9, 2, SPRITE_ROCKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageMartGrampsScript, -1

95
maps/LakeOfRagePokecenter1F.asm Normal file
View file

@ -0,0 +1,95 @@
object_const_def
const LAKEOFRAGEPOKECENTER1F_NURSE
const LAKEOFRAGEPOKECENTER1F_SCIENTIST
const LAKEOFRAGEPOKECENTER1F_GENTLEMAN
const LAKEOFRAGEPOKECENTER1F_YOUNGSTER
LakeOfRagePokecenter1F_MapScripts:
def_scene_scripts
def_callbacks
LakeOfRagePokecenter1FNurseScript:
jumpstd PokecenterNurseScript
LakeOfRagePokecenter1FGentlemanScript:
jumptextfaceplayer LakeOfRagePokecenter1FGentlemanText
LakeOfRagePokecenter1FScientistScript:
jumptextfaceplayer LakeOfRagePokecenter1FScientistText
LakeOfRagePokecenter1FYoungsterScript:
faceplayer
opentext
checkevent EVENT_LAKE_OF_RAGE_RED_GYARADOS
iftrue .GyaradosDefeated
writetext LakeOfRagePokecenter1FYoungsterText
waitbutton
closetext
end
.GyaradosDefeated:
writetext LakeOfRagePokecenter1FYoungsterText_GyaradosDefeated
waitbutton
closetext
end
LakeOfRagePokecenter1FScientistText:
text "GYARADOS are very"
line "sensitive to"
cont "changes in their"
cont "environment."
para "Even a minor"
line "tremor can drive"
cont "them wild!"
done
LakeOfRagePokecenter1FGentlemanText:
text "I wonder who is"
line "behind all this"
cont "nonsense?"
para "First the RADIO"
line "TOWER, now the"
cont "lake..."
done
LakeOfRagePokecenter1FYoungsterText:
text "Dad said I have"
line "to stay inside."
para "I hear a monster"
line "outside..."
para "And my #GEAR"
line "keeps playing"
cont "this weird music!"
para "Waaah! So scary!"
done
LakeOfRagePokecenter1FYoungsterText_GyaradosDefeated:
text "The monster is"
line "gone! I can go"
cont "outside again!"
done
LakeOfRagePokecenter1F_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 3, 7, LAKE_OF_RAGE, 4
warp_event 4, 7, LAKE_OF_RAGE, 4
warp_event 0, 7, POKECENTER_2F, 1
def_coord_events
def_bg_events
def_object_events
object_event 3, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRagePokecenter1FNurseScript, -1
object_event 7, 6, SPRITE_SCIENTIST, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRagePokecenter1FScientistScript, -1
object_event 5, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, LakeOfRagePokecenter1FGentlemanScript, -1
object_event 1, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, LakeOfRagePokecenter1FYoungsterScript, -1

42
maps/LakeOfRageTraderHouse.asm Normal file
View file

@ -0,0 +1,42 @@
object_const_def
const LAKEOFRAGETRADERHOUSE_TRADER
LakeOfRageTraderHouse_MapScripts:
def_scene_scripts
def_callbacks
; Tradeback NPC tutorial
TradebackNPCScript:
faceplayer
opentext
special TradebackNPC
waitbutton
closetext
end
LakeOfRageTraderHouseBookshelf2:
jumpstd DifficultBookshelfScript
LakeOfRageTraderHouseBookshelf1:
jumpstd MagazineBookshelfScript
LakeOfRageTraderHouseRadio:
jumpstd Radio2Script
LakeOfRageTraderHouse_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 2, 7, LAKE_OF_RAGE, 5
warp_event 3, 7, LAKE_OF_RAGE, 5
def_coord_events
def_bg_events
bg_event 0, 1, BGEVENT_READ, LakeOfRageTraderHouseBookshelf1
bg_event 1, 1, BGEVENT_READ, LakeOfRageTraderHouseBookshelf2
bg_event 7, 1, BGEVENT_READ, LakeOfRageTraderHouseRadio
def_object_events
object_event 2, 4, SPRITE_GAMEBOY_KID, SPRITEMOVEDATA_STANDING_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, TradebackNPCScript, -1

11
maps/PlayersHouse2F.asm
View file

@ -114,23 +114,23 @@ PlayersRadioText4:
DebugPokemon1Script:
opentext
getmonname STRING_BUFFER_3, BLASTYKE
getmonname STRING_BUFFER_3, BELLIGNAN
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke BLASTYKE, 35, RARE_CANDY
givepoke BELLIGNAN, 35, RARE_CANDY
closetext
end
DebugPokemon2Script:
opentext
getmonname STRING_BUFFER_3, WARTORTLE
getmonname STRING_BUFFER_3, WEEPINBELL
writetext ReceivedDebugPokemonText
playsound SFX_CAUGHT_MON
waitsfx
promptbutton
givepoke WARTORTLE, 35, RARE_CANDY
givepoke WEEPINBELL, 35, POISON_STONE
closetext
end
@ -145,7 +145,8 @@ PlayersHouse2F_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 7, 0, PLAYERS_HOUSE_1F, 3
warp_event 7, 0, LAKE_OF_RAGE, 3
;warp_event 7, 0, PLAYERS_HOUSE_1F, 3
def_coord_events