thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-20 22:28:41 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

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