thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-05 05:00:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Post-stream bits and bobs

Browse source 
- Reused the double doors for the Route 2 gate, and added the warp for it
- Changed the Route 2 map to have the ledge on the path this irritated the fucking LIFE out of me
- Pokemon Tower takes you to the right place when going down.
- Kotora line now has Flash
- Refactored Gentlarva
- Route 2 gate now uses the double doors.
- New hidden Moon Stone where the Clefairy are in Mt. Moon
- Added a new Paradox Pokemon-themed border by Gecko557
- Shifted a ledge in Cerulean City that was off-centre in a really jarring way
- Added the Nugget glitch from FRLG because it's funny and cool
This commit is contained in:
Llinos Evans 2023-09-20 08:17:34 +01:00
parent ad4567e691
commit 953e8e295f
33 changed files with 52 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
3DS Border/KEPBorder.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

2
3DS Border/READ THIS.md
View file

@ -7,6 +7,6 @@ Download the software [here](https://www.gamebrew.org/wiki/New_Super_Ultimate_In
# Credits
* Shawesome (Initial suggestion)
* Gecko557 (Information & [Template](https://cdn.discordapp.com/attachments/1014321591657709569/1147616605166108744/3DSVCBorderForGBandGBC.png))
* Gecko557 (Information, Paradox Pokemon Border, & [Template](https://cdn.discordapp.com/attachments/1014321591657709569/1147616605166108744/3DSVCBorderForGBandGBC.png))
* Plague von Karma (KEP OG Dimensions Border)
* Mephistopheles (Prototype RG Expanded Border)

3
README.md
View file

@ -217,6 +217,7 @@ QoL Enhancements
Bug Fixes
====
Many non-multiplayer, non-battle related bugs have been fixed. Battle-related bugs have been preserved for the sake of the RBY battle experience. Bugs that are fixed are ones that objectively hurt the gameplay experience, so glitches like the Mew Glitch, which arguably add to the gameplay, are preserved. Much of the fixes made here can be attributed to [the tutorials](https://github.com/pret/pokered/wiki/Bugs-and-Glitches) made by the good people at pret.
- Added the Infinite Nugget glitch from FireRed/LeafGreen. Why? It's funny, I dunno.
- Fixed various translation errors/retcons (eg. Route 14 Birdkeeper's "birds of prey" line, Koji and Atsuko in Fuschia.)
- More accurate translations from FRLG/LGPE (eg. Bill not being a PokeManiac, but a "Pokemon fanatic" from LGPE) have been ported.
- Some grammar tweaks have been made (eg. If a move is disabled, it now has an upper-case D instead of a lower-case one.)
@ -313,7 +314,7 @@ Kanto Beta Pokemon:
- Coinpur -> Meowth | L14
- Decilla -> Gawarhed | L40
- Gyopin -> Goldeen | L16
- Kokana -> Pupal | L7
- Gentlarva -> Pupal | L7
- Pupal -> Carapthor | L10
- Kotora -> Gaotora -> Gorotora | L16, L36
- Kolta -> Ponyta | L20

2
constants/pokedex_constants.asm
View file

@ -43,7 +43,7 @@
const DEX_WEEDLE ; 13 (037)
const DEX_KAKUNA ; 14 (038)
const DEX_BEEDRILL ; 15 (039)
const DEX_KOKANA ; (040)
const DEX_GENTLARVA ; (040)
const DEX_PUPAL ; (041)
const DEX_CARAPTHOR ; (042)
const DEX_KOTORA ; (043)

2
constants/pokemon_constants.asm
View file

@ -221,7 +221,7 @@
const ELECTIVIRE ; $D4
const MAGMORTAR ; $D5
const DISTURBAN ; $D6
const KOKANA ; $D7
const GENTLARVA ; $D7
const PUPAL ; $D8
const CARAPTHOR ; $D9
const MAGNEZONE ; $DA

2
crysaudio/cry_headers.asm
View file

@ -44,7 +44,7 @@ PokemonCries::
mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE
mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA
mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL
mon_cry CRY_NIDORAN_M, 0, 0 ; KOKANA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; GENTLARVA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; PUPAL (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete)
mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA

1
data/events/hidden_item_coords.asm
View file

@ -63,4 +63,5 @@ HiddenItemCoords:
hidden_item MT_MOON_CRATER, 20, 17 ; Black Augurite
hidden_item MT_MOON_CRATER, 32, 45 ; Old Amber
hidden_item DAYCARE, 4, 1 ; Daycare PC
hidden_item MT_MOON_SQUARE, 5, 5 ; Moon Stone
db -1 ; end

6
data/events/hidden_objects.asm
View file

@ -89,6 +89,7 @@ HiddenObjectMaps:
db VERMILION_DOCK
db MT_MOON_CRATER
db DAYCARE
db MT_MOON_SQUARE
db -1 ; end
HiddenObjectPointers:
@ -183,6 +184,7 @@ HiddenObjectPointers:
dw VermilionDockHiddenObjects
dw MtMoonCraterHiddenObjects
dw DaycareHiddenItems
dw MtMoonSquareHiddenItems
MACRO hidden_object
db \2 ; y coord
@ -661,3 +663,7 @@ MtMoonCraterHiddenObjects:
DaycareHiddenItems:
hidden_object 4, 1, SPRITE_FACING_UP, OpenPokemonCenterPC
db -1
MtMoonSquareHiddenItems:
hidden_object 5, 5, MOON_STONE, HiddenItems
db -1

2
data/maps/objects/PokemonTower6F.asm
View file

@ -2,7 +2,7 @@ PokemonTower6F_Object:
db $1 ; border block
def_warp_events
warp_event 3, 9, POKEMON_TOWER_2F, 2
warp_event 3, 9, POKEMON_TOWER_2F, 1
warp_event 9, 16, POKEMON_TOWER_7F, 1
def_bg_events

3
data/maps/objects/Route2.asm
View file

@ -5,9 +5,10 @@ Route2_Object:
warp_event 12, 9, DIGLETTS_CAVE_ROUTE_2, 1
warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 2
warp_event 15, 19, ROUTE_2_TRADE_HOUSE, 1
warp_event 16, 35, ROUTE_2_GATE, 2
warp_event 17, 35, ROUTE_2_GATE, 2
warp_event 15, 39, ROUTE_2_GATE, 3
warp_event 3, 43, VIRIDIAN_FOREST_SOUTH_GATE, 3
warp_event 3, 11, VIRIDIAN_FOREST_NORTH_GATE, 1
def_bg_events
bg_event 5, 65, 3 ; Route2Text3

2
data/maps/objects/Route2Gate.asm
View file

@ -2,7 +2,7 @@ Route2Gate_Object:
db $a ; border block
def_warp_events
warp_event 4, 0, LAST_MAP, 4
warp_event 4, 0, LAST_MAP, 7
warp_event 5, 0, LAST_MAP, 4
warp_event 4, 7, LAST_MAP, 5
warp_event 5, 7, LAST_MAP, 5

2
data/pokemon/base_stats.asm
View file

@ -39,7 +39,7 @@ INCLUDE "data/pokemon/base_stats/butterfree.asm"
INCLUDE "data/pokemon/base_stats/weedle.asm"
INCLUDE "data/pokemon/base_stats/kakuna.asm"
INCLUDE "data/pokemon/base_stats/beedrill.asm"
INCLUDE "data/pokemon/base_stats/kokana.asm"
INCLUDE "data/pokemon/base_stats/kokana.asm" ; Gentlarva
INCLUDE "data/pokemon/base_stats/pupal.asm"
INCLUDE "data/pokemon/base_stats/carapthor.asm"
INCLUDE "data/pokemon/base_stats/kotora.asm"

2
data/pokemon/base_stats/gaotora.asm
View file

@ -16,7 +16,7 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \
THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \
SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE
SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, FLASH
; end
db BANK(GaotoraPicFront)

2
data/pokemon/base_stats/gorotora.asm
View file

@ -17,7 +17,7 @@
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, HYPER_BEAM, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
MIMIC, DOUBLE_TEAM, BIDE, SWIFT, SKULL_BASH, \
REST, THUNDER_WAVE, SUBSTITUTE
REST, THUNDER_WAVE, SUBSTITUTE, FLASH
; end
db BANK(GorotoraPicFront)

8
data/pokemon/base_stats/kokana.asm
View file

@ -1,4 +1,4 @@
db DEX_KOKANA ; pokedex id
db DEX_GENTLARVA ; pokedex id
db 40, 35, 30, 45, 25
; hp atk def spd spc
@ -8,7 +8,7 @@
db 54 ; base exp
INCBIN "gfx/pokemon/front/kokana.pic", 0, 1 ; sprite dimensions
dw KokanaPicFront, KokanaPicBack
dw GentlarvaPicFront, GentlarvaPicBack
db LEECH_LIFE, STRING_SHOT, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -17,5 +17,5 @@
tmhm
; end
db BANK(KokanaPicFront)
assert BANK(KokanaPicFront) == BANK(KokanaPicBack)
db BANK(GentlarvaPicFront)
assert BANK(GentlarvaPicFront) == BANK(GentlarvaPicBack)

2
data/pokemon/base_stats/kotora.asm
View file

@ -16,7 +16,7 @@
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, RAGE, \
THUNDERBOLT, THUNDER, MIMIC, DOUBLE_TEAM, BIDE, \
SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE
SWIFT, SKULL_BASH, REST, THUNDER_WAVE, SUBSTITUTE, FLASH
; end
db BANK(KotoraPicFront)

6
data/pokemon/dex_entries.asm
View file

@ -214,7 +214,7 @@ PokedexEntryPointers:
dw ElectivireDexEntry
dw MagmortarDexEntry
dw DisturbanDexEntry
dw KokanaDexEntry
dw GentlarvaDexEntry
dw PupalDexEntry
dw CarapthorDexEntry
dw MagnezoneDexEntry
@ -1749,11 +1749,11 @@ DisturbanDexEntry:
text_far _DisturbanDexEntry
text_end
KokanaDexEntry:
GentlarvaDexEntry:
db "GRUB@"
db 1,0
dw 80
text_far _KokanaDexEntry
text_far _GentlarvaDexEntry
text_end
PupalDexEntry:

2
data/pokemon/dex_order.asm
View file

@ -214,7 +214,7 @@ PokedexOrder:
db DEX_ELECTIVIRE
db DEX_MAGMORTAR
db DEX_DISTURBAN
db DEX_KOKANA
db DEX_GENTLARVA
db DEX_PUPAL
db DEX_CARAPTHOR
db DEX_MAGNEZONE

2
data/pokemon/dex_text.asm
View file

@ -335,7 +335,7 @@ _PidgeyDexEntry:: ; new entry
page "grass, feeding on"
next "bugs like CATERPIE"
next "and KOKANA"
next "and GENTLARVA"
dex
_SlowpokeDexEntry::

4
data/pokemon/evos_moves.asm
View file

@ -226,7 +226,7 @@ EvosMovesPointerTable:
dw ElectivireEvosMoves
dw MagmortarEvosMoves
dw DisturbanEvosMoves
dw KokanaEvosMoves
dw GentlarvaEvosMoves
dw PupalEvosMoves
dw CarapthorEvosMoves
dw MagnezoneEvosMoves
@ -2840,7 +2840,7 @@ DisturbanEvosMoves:
db 50, POISON_GAS
db 0
KokanaEvosMoves:
GentlarvaEvosMoves:
; Evolutions
db EV_LEVEL, 7, PUPAL
db 0

2
data/pokemon/menu_icons.asm
View file

@ -39,7 +39,7 @@ MonPartyData:
nybble ICON_BUG ; Weedle
nybble ICON_BUG ; Kakuna
nybble ICON_BUG ; Beedrill
nybble ICON_BUG ; Kokana
nybble ICON_BUG ; Gentlarva
nybble ICON_BUG ; Pupal
nybble ICON_BUG ; Carapthor
nybble ICON_CAT ; Kotora

4
data/pokemon/names.asm
View file

@ -214,8 +214,8 @@ MonsterNames::
db "ELECTIVIRE"
db "MAGMORTAR@"
db "DISTURBAN@"
db "KOKANA@@@@"
db "PUPAL@@@@@"
db "GENTLARVA@" ; Gentlarva
db "PUPAL@@@@@" ; Kasanagi
db "CARAPTHOR@"
db "MAGNEZONE@"
db "PORYGON-Z@"

2
data/pokemon/new_dex_text.asm
View file

@ -398,7 +398,7 @@ _DisturbanDexEntry::
next "it with venom"
dex
_KokanaDexEntry::
_GentlarvaDexEntry::
text "Closely related to"
next "WEEDLE. Due to the"
next "lack of a horn,"

2
data/pokemon/palettes.asm
View file

@ -40,7 +40,7 @@ MonsterPalettes:
db PAL_YELLOWMON ; WEEDLE
db PAL_YELLOWMON ; KAKUNA
db PAL_YELLOWMON ; BEEDRILL
db PAL_YELLOWMON ; KOKANA
db PAL_YELLOWMON ; GENTLARVA
db PAL_YELLOWMON ; PUPAL
db PAL_YELLOWMON ; CARAPTHOR
db PAL_YELLOWMON ; KOTORA

4
data/pokemon/tradeback_moves.asm
View file

@ -219,7 +219,7 @@ TradebackMovesPointerTable:
dw ElectivireTradebackMoves
dw MagmortarTradebackMoves
dw DisturbanTradebackMoves
dw KokanaTradebackMoves
dw GentlarvaTradebackMoves
dw PupalTradebackMoves
dw CarapthorTradebackMoves
dw MagnezoneTradebackMoves
@ -1977,7 +1977,7 @@ DisturbanTradebackMoves:
db 1, SCREECH
db 0
KokanaTradebackMoves:
GentlarvaTradebackMoves:
db 0
PupalTradebackMoves:

6
data/trainers/parties.asm
View file

@ -91,17 +91,17 @@ YoungsterData:
BugCatcherData:
; Viridian Forest
db 6, WEEDLE, CATERPIE, 0
db 7, CATERPIE, KAKUNA, KOKANA, 0
db 7, CATERPIE, KAKUNA, GENTLARVA, 0
db 9, VENONAT, 0
; Route 3
db 10, KOKANA, PUPAL, 0 ; trimmed down to create counterpart trainers
db 10, GENTLARVA, PUPAL, 0 ; trimmed down to create counterpart trainers
db 10, WEEDLE, KAKUNA, 0
db 10, CATERPIE, METAPOD, 0
; Mt. Moon 1F
db 12, PARAS, 0
db 10, PUPAL, PARAS, 0
; Route 24
db 14, KOKANA, WEEDLE, 0
db 14, GENTLARVA, WEEDLE, 0
; Route 6
db 16, VENONAT, PARAS, 0 ; By this point, the player has fought like, 2 "three bugs" trainers. Toning it down.
db 17, BUTTERFREE, 0 ; this is that one boss fight-like one, levelled down for learnset reasons

2
data/wild/maps/ViridianForest.asm
View file

@ -4,7 +4,7 @@ ViridianForestWildMons:
db 4, WEEDLE
db 4, PIDGEY
db 5, CATERPIE
db 4, KOKANA
db 4, GENTLARVA
db 5, WEEDLE
db 7, KAKUNA
db 7, METAPOD

2
gfx/gallery_generator.cmd
View file

@ -2,7 +2,7 @@ cd pokemon
cd front
magick bulbasaur.png ivysaur.png venusaur.png charmander.png charmeleon.png charizard.png squirtle.png wartortle.png totartle.png pikachu.png raichu.png raichua.png gorochu.png eevee.png vaporeon.png jolteon.png flareon.png espeon.png +append ../row1.png
magick umbreon.png leafeon.png glaceon.png sylveon.png rattata.png raticate.png raticatea.png pidgey.png pidgeotto.png pidgeot.png konya.png meowth.png persian.png persiana.png perrserker.png caterpie.png metapod.png butterfree.png +append ../row2.png
magick weedle.png kakuna.png beedrill.png kokana.png kasanagi.png carapthor.png spearow.png fearow.png ekans.png arbok.png sandshrew.png sandslash.png sandslasha.png nidoranf.png nidorina.png nidoqueen.png nidoranm.png nidorino.png nidoking.png nidoreign.png +append ../row3.png
magick weedle.png kakuna.png beedrill.png Gentlarva.png kasanagi.png carapthor.png spearow.png fearow.png ekans.png arbok.png sandshrew.png sandslash.png sandslasha.png nidoranf.png nidorina.png nidoqueen.png nidoranm.png nidorino.png nidoking.png nidoreign.png +append ../row3.png
magick bittybat.png zubat.png golbat.png crobat.png geodude.png graveler.png golem.png golema.png paras.png parasect.png clefairy.png clefable.png jigglypuff.png wigglytuff.png mikon.png vulpix.png ninetales.png ninetalesa.png +append ../row4.png
magick growlithe.png arcanine.png arcanineh.png mankey.png primeape.png annihilape.png oddish.png gloom.png vileplume.png bellossom.png bellsprout.png weepinbell.png victreebel.png tsubomitto.png magikarp.png gyarados.png gyopin.png goldeen.png +append ../row5.png
magick seaking.png venonat.png venomoth.png cheep.png jabetta.png psyduck.png weirduck.png golduck.png poliwag.png poliwhirl.png poliwrath.png politoed.png abra.png kadabra.png alakazam.png lickitung.png lickilicky.png +append ../row6.png

4
gfx/pics.asm
View file

@ -452,8 +452,8 @@ GawarhedPicFront:: INCBIN "gfx/pokemon/front/gawarhed.pic"
GawarhedPicBack:: INCBIN "gfx/pokemon/back/gawarhedb.pic"
OmegadgePicFront:: INCBIN "gfx/pokemon/front/omegadge.pic"
OmegadgePicBack:: INCBIN "gfx/pokemon/back/omegadgeb.pic"
KokanaPicFront:: INCBIN "gfx/pokemon/front/kokana.pic"
KokanaPicBack:: INCBIN "gfx/pokemon/back/kokanab.pic"
GentlarvaPicFront:: INCBIN "gfx/pokemon/front/kokana.pic"
GentlarvaPicBack:: INCBIN "gfx/pokemon/back/kokanab.pic"
ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic"
ScizorPicBack:: INCBIN "gfx/pokemon/back/scizorb.pic"
RhyperiorPicFront:: INCBIN "gfx/pokemon/front/rhyperior.pic"

2
maps/CeruleanCity.blk
View file

@ -16,7 +16,7 @@ N\  !
|r 

/\bQQN
bQQN
tttttt111_NttN ! !ttt_NttN
V|~0 |s0 _NttN_Nttbllll6V2llllllllNttNNttPRRm]nN]MRRRRNtttttm'n

2
maps/Route2.blk
View file

@ -42,7 +42,7 @@ lllmt
t111
mtt
/4/tt
\4/tt
1
m

BIN
maps/Route2Gate.blk
View file

Binary file not shown.

7
scripts/Route24.asm
View file

@ -103,17 +103,18 @@ Route24TrainerHeader5:
trainer EVENT_BEAT_ROUTE_24_TRAINER_5, 1, Route24BattleText6, Route24EndBattleText6, Route24AfterBattleText6
db -1 ; end
; We added the infinite Nugget glitch from FRLG to own the libs
Route24Text1:
text_asm
ResetEvent EVENT_NUGGET_REWARD_AVAILABLE
CheckEvent EVENT_GOT_NUGGET
jr nz, .got_item
;CheckEvent EVENT_GOT_NUGGET
;jr nz, .got_item
ld hl, Route24Text_51510
call PrintText
lb bc, NUGGET, 1
call GiveItem
jr nc, .bag_full
SetEvent EVENT_GOT_NUGGET
;SetEvent EVENT_GOT_NUGGET - Introduces the Nugget glitch from FRLG
ld hl, Route24Text_5151a
call PrintText
ld hl, Route24Text_51526