Post-stream bits and bobs

- 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

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"

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)

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)

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)

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)

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:

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

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::

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

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

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@"

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,"

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

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: