Nihon & Paradoxes Part 1

This commit is contained in:
Llinos Evans 2024-07-01 21:26:31 +01:00
parent 97557d005e
commit 9f000f98f4
12 changed files with 977 additions and 1 deletions

View file

@ -313,6 +313,40 @@ DEF JOHTO_POKEMON EQU const_value
const MAGBY ; f0
const MILTANK ; f1
const BLISSEY ; f2
; Nihon non-Starters begin here i guess
; also Folage is uh somewhere thatll be fine
const WARUCHU
const SONEGG
const CACAWPHONY
const TREBIR
const SAKURAZE
const AMANOBI
const TRUSTAN
const KUWAGUARD
const TONQUITO
const MOLAMBINO
const LUANBO
const GRANBO
const ANGORE
const EUCALA
const KIWOOKED
const CYCLORP
const KITSEN
const WISPIRIT
const COATL
const MIMEAR
const INOSHIKA
const RUDDERNAUT
const XYLODON
const XYLOFIN
const DOKUROAR
const SCREAM_TAIL
const SANDY_SHOCKS
const GREAT_TUSK
const FLUTTER_MANE
const IRON_TREADS
const IRON_BUNDLE
const IRON_THORNS
const RAGING_BOLT
const GOUGING_FIRE
const WALKING_WAKE

View file

@ -320,6 +320,38 @@ INCLUDE "data/pokemon/base_stats/elekid.asm"
INCLUDE "data/pokemon/base_stats/magby.asm"
INCLUDE "data/pokemon/base_stats/miltank.asm"
INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/waruchu.asm"
INCLUDE "data/pokemon/base_stats/sonegg.asm"
INCLUDE "data/pokemon/base_stats/cacawphony.asm"
INCLUDE "data/pokemon/base_stats/trebir.asm"
INCLUDE "data/pokemon/base_stats/sakuraze.asm"
INCLUDE "data/pokemon/base_stats/amanobi.asm"
INCLUDE "data/pokemon/base_stats/trustan.asm"
INCLUDE "data/pokemon/base_stats/kuwaguard.asm"
INCLUDE "data/pokemon/base_stats/tonquito.asm"
INCLUDE "data/pokemon/base_stats/molambino.asm"
INCLUDE "data/pokemon/base_stats/luanbo.asm"
INCLUDE "data/pokemon/base_stats/granbo.asm"
INCLUDE "data/pokemon/base_stats/angore.asm"
INCLUDE "data/pokemon/base_stats/eucala.asm"
INCLUDE "data/pokemon/base_stats/kiwooked.asm"
INCLUDE "data/pokemon/base_stats/cyclorp.asm"
INCLUDE "data/pokemon/base_stats/kitsen.asm"
INCLUDE "data/pokemon/base_stats/wispirit.asm"
INCLUDE "data/pokemon/base_stats/coatl.asm"
INCLUDE "data/pokemon/base_stats/mimear.asm"
INCLUDE "data/pokemon/base_stats/inoshika.asm"
INCLUDE "data/pokemon/base_stats/ruddernaut.asm"
INCLUDE "data/pokemon/base_stats/xylodon.asm"
INCLUDE "data/pokemon/base_stats/xylofin.asm"
INCLUDE "data/pokemon/base_stats/dokuroar.asm"
INCLUDE "data/pokemon/base_stats/scream_tail.asm"
INCLUDE "data/pokemon/base_stats/sandy_shocks.asm"
INCLUDE "data/pokemon/base_stats/great_tusk.asm"
INCLUDE "data/pokemon/base_stats/flutter_mane.asm"
INCLUDE "data/pokemon/base_stats/iron_treads.asm"
INCLUDE "data/pokemon/base_stats/iron_bundle.asm"
INCLUDE "data/pokemon/base_stats/iron_thorns.asm"
INCLUDE "data/pokemon/base_stats/raging_bolt.asm"
INCLUDE "data/pokemon/base_stats/gouging_fire.asm"
INCLUDE "data/pokemon/base_stats/walking_wake.asm"

View file

@ -299,6 +299,38 @@ PokemonCries::
mon_cry CRY_TEDDIURSA, 374, 58 ; MAGBY
mon_cry CRY_GLIGAR, -461, 416 ; MILTANK
mon_cry CRY_SLOWKING, 659, 320 ; BLISSEY
mon_cry CRY_NIDORAN_M, 0, 128 ; WARUCHU
mon_cry CRY_NIDORAN_M, 0, 128 ; SONEGG
mon_cry CRY_NIDORAN_M, 0, 128 ; CACAWPHONY
mon_cry CRY_NIDORAN_M, 0, 128 ; TREBIR
mon_cry CRY_NIDORAN_M, 0, 128 ; SAKURAZE
mon_cry CRY_NIDORAN_M, 0, 128 ; AMANOBI
mon_cry CRY_NIDORAN_M, 0, 128 ; TRUSTAN
mon_cry CRY_NIDORAN_M, 0, 128 ; KUWAGUARD
mon_cry CRY_NIDORAN_M, 0, 128 ; TONQUITO
mon_cry CRY_NIDORAN_M, 0, 128 ; MOLAMBINO
mon_cry CRY_NIDORAN_M, 0, 128 ; LUANBO
mon_cry CRY_NIDORAN_M, 0, 128 ; GRANBO
mon_cry CRY_NIDORAN_M, 0, 128 ; ANGORE
mon_cry CRY_NIDORAN_M, 0, 128 ; EUCALA
mon_cry CRY_NIDORAN_M, 0, 128 ; KIWOOKED
mon_cry CRY_NIDORAN_M, 0, 128 ; CYCLORP
mon_cry CRY_NIDORAN_M, 0, 128 ; KITSEN
mon_cry CRY_NIDORAN_M, 0, 128 ; WISPIRIT
mon_cry CRY_NIDORAN_M, 0, 128 ; COATL
mon_cry CRY_NIDORAN_M, 0, 128 ; MIMEAR
mon_cry CRY_NIDORAN_M, 0, 128 ; INOSHIKA
mon_cry CRY_NIDORAN_M, 0, 128 ; RUDDERNAUT
mon_cry CRY_NIDORAN_M, 0, 128 ; XYLODON
mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN
mon_cry CRY_NIDORAN_M, 0, 128 ; DOKUROAR
mon_cry CRY_NIDORAN_M, 0, 128 ; SCREAM_TAIL
mon_cry CRY_NIDORAN_M, 0, 128 ; SANDY_SHOCKS
mon_cry CRY_NIDORAN_M, 0, 128 ; GREAT_TUSK
mon_cry CRY_NIDORAN_M, 0, 128 ; FLUTTER_MANE
mon_cry CRY_NIDORAN_M, 0, 128 ; IRON_TREADS
mon_cry CRY_NIDORAN_M, 0, 128 ; IRON_BUNDLE
mon_cry CRY_NIDORAN_M, 0, 128 ; IRON_THORNS
mon_cry CRY_RAIKOU, 564, 310 ; RAGING_BOLT
mon_cry CRY_ENTEI, 5, 432 ; GOUGING_FIRE
mon_cry CRY_MAGCARGO, 3, 400 ; WALKING_WAKE

View file

@ -305,6 +305,37 @@ ElekidPokedexEntry:: INCLUDE "data/pokemon/dex_entries/elekid.asm"
MagbyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/magby.asm"
MiltankPokedexEntry:: INCLUDE "data/pokemon/dex_entries/miltank.asm"
BlisseyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/blissey.asm"
WaruchuPokedexEntry:: INCLUDE "data/pokemon/dex_entries/waruchu.asm"
SoneggPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sonegg.asm"
CacawphonyPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cacawphony.asm"
TrebirPokedexEntry:: INCLUDE "data/pokemon/dex_entries/trebir.asm"
SakurazePokedexEntry:: INCLUDE "data/pokemon/dex_entries/sakuraze.asm"
AmanobiPokedexEntry:: INCLUDE "data/pokemon/dex_entries/amanobi.asm"
TrustanPokedexEntry:: INCLUDE "data/pokemon/dex_entries/trustan.asm"
KuwaguardPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kuwaguard.asm"
TonquitoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/tonquito.asm"
MolambinoPokedexEntry:: INCLUDE "data/pokemon/dex_entries/molambino.asm"
LuanboPokedexEntry:: INCLUDE "data/pokemon/dex_entries/luanbo.asm"
GranboPokedexEntry:: INCLUDE "data/pokemon/dex_entries/granbo.asm"
AngorePokedexEntry:: INCLUDE "data/pokemon/dex_entries/angore.asm"
EucalaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/eucala.asm"
KiwookedPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kiwooked.asm"
CyclorpPokedexEntry:: INCLUDE "data/pokemon/dex_entries/cyclorp.asm"
KitsenPokedexEntry:: INCLUDE "data/pokemon/dex_entries/kitsen.asm"
WispiritPokedexEntry:: INCLUDE "data/pokemon/dex_entries/wispirit.asm"
CoatlPokedexEntry:: INCLUDE "data/pokemon/dex_entries/coatl.asm"
MimearPokedexEntry:: INCLUDE "data/pokemon/dex_entries/mimear.asm"
InoshikaPokedexEntry:: INCLUDE "data/pokemon/dex_entries/inoshika.asm"
RuddernautPokedexEntry:: INCLUDE "data/pokemon/dex_entries/ruddernaut.asm"
XylodonPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xylodon.asm"
XylofinPokedexEntry:: INCLUDE "data/pokemon/dex_entries/xylofin.asm"
DokuroarPokedexEntry:: INCLUDE "data/pokemon/dex_entries/dokuroar.asm"
ScreamTailPokedexEntry:: INCLUDE "data/pokemon/dex_entries/scream_tail.asm"
SandyShocksPokedexEntry:: INCLUDE "data/pokemon/dex_entries/sandy_shocks.asm"
GreatTuskPokedexEntry:: INCLUDE "data/pokemon/dex_entries/great_tusk.asm"
IronTreadsPokedexEntry:: INCLUDE "data/pokemon/dex_entries/iron_treads.asm"
IronBundlePokedexEntry:: INCLUDE "data/pokemon/dex_entries/iron_bundle.asm"
IronThornsPokedexEntry:: INCLUDE "data/pokemon/dex_entries/iron_thorns.asm"
RagingBoltPokedexEntry:: INCLUDE "data/pokemon/dex_entries/raging_bolt.asm"
GougingFirePokedexEntry:: INCLUDE "data/pokemon/dex_entries/gouging_fire.asm"
WalkingWakePokedexEntry:: INCLUDE "data/pokemon/dex_entries/walking_wake.asm"

View file

@ -294,6 +294,37 @@ PokedexDataPointerTable:
dba MagbyPokedexEntry
dba MiltankPokedexEntry
dba BlisseyPokedexEntry
dba WaruchuPokedexEntry
dba SoneggPokedexEntry
dba CacawphonyPokedexEntry
dba TrebirPokedexEntry
dba SakurazePokedexEntry
dba AmanobiPokedexEntry
dba TrustanPokedexEntry
dba KuwaguardPokedexEntry
dba TonquitoPokedexEntry
dba MolambinoPokedexEntry
dba LuanboPokedexEntry
dba GranboPokedexEntry
dba AngorePokedexEntry
dba EucalaPokedexEntry
dba KiwookedPokedexEntry
dba CyclorpPokedexEntry
dba KitsenPokedexEntry
dba WispiritPokedexEntry
dba CoatlPokedexEntry
dba MimearPokedexEntry
dba InoshikaPokedexEntry
dba RuddernautPokedexEntry
dba XylodonPokedexEntry
dba XylofinPokedexEntry
dba DokuroarPokedexEntry
dba ScreamTailPokedexEntry
dba SandyShocksPokedexEntry
dba GreatTuskPokedexEntry
dba IronTreadsPokedexEntry
dba IronBundlePokedexEntry
dba IronThornsPokedexEntry
dba RagingBoltPokedexEntry
dba GougingFirePokedexEntry
dba WalkingWakePokedexEntry

View file

@ -7,7 +7,9 @@ AlphabeticalPokedexOrder:
dw AERODACTYL
dw AIPOM
dw ALAKAZAM
dw AMANOBI
dw AMPHAROS
dw ANGORE
dw ANNIHILAPE
dw ARBOK
dw ARCANINE
@ -30,6 +32,7 @@ AlphabeticalPokedexOrder:
dw BULBASAUR
dw BURGELA
dw BUTTERFREE
dw CACAWPHONY
dw CALFLAC
dw CARAPTHOR
dw CATERPIE
@ -44,12 +47,14 @@ AlphabeticalPokedexOrder:
dw CLEFAIRY
dw CLEFFA
dw CLOYSTER
dw COATL
dw COINPUR
dw CORSOLA
dw CROBAT
dw CROCONAW
dw CUBBURN
dw CUBONE
dw CYCLORP
dw CYNDAQUIL
dw DELIBIRD
dw DEWGONG
@ -57,6 +62,7 @@ AlphabeticalPokedexOrder:
dw DITTO
dw DODRIO
dw DODUO
dw DOKUROAR
dw DONMARIN
dw DONPHAN
dw DRAGONAIR
@ -73,6 +79,7 @@ AlphabeticalPokedexOrder:
dw ELEKID
dw ENTEI
dw ESPEON
dw EUCALA
dw EXEGGCUTE
dw EXEGGUTOR
dw FARFETCH_D
@ -82,6 +89,7 @@ AlphabeticalPokedexOrder:
dw FLAAFFY
dw FLAMBEAR
dw FLAREON
dw FLUTTER_MANE
dw FOLAGE
dw FORRETRESS
dw FURRET
@ -101,8 +109,10 @@ AlphabeticalPokedexOrder:
dw GOROCHU
dw GOROTORA
dw GOUGING_FIRE
dw GRANBO
dw GRANBULL
dw GRAVELER
dw GREAT_TUSK
dw GRIMER
dw GROWLITHE
dw GYARADOS
@ -119,6 +129,10 @@ AlphabeticalPokedexOrder:
dw HOUNDOUR
dw HYPNO
dw IGGLYBUFF
dw INOSHIKA
dw IRON_TREADS
dw IRON_BUNDLE
dw IRON_THORNS
dw IVYSAUR
dw JIGGLYPUFF
dw JOLTEON
@ -132,10 +146,13 @@ AlphabeticalPokedexOrder:
dw KANGASKHAN
dw KINGDRA
dw KINGLER
dw KITSEN
dw KIWOOKED
dw KLEAVOR
dw KOFFING
dw KOTORA
dw KRABBY
dw KUWAGUARD
dw LANTURN
dw LAPRAS
dw LARVITAR
@ -145,6 +162,7 @@ AlphabeticalPokedexOrder:
dw LICKILICKY
dw LICKILORD
dw LICKITUNG
dw LUANBO
dw LUGIA
dw MACHAMP
dw MACHOKE
@ -165,10 +183,12 @@ AlphabeticalPokedexOrder:
dw METAPOD
dw MEW
dw MEWTWO
dw MIMEAR
dw MILTANK
dw MISDREAVUS
dw MISMAGIUS
dw MOIBELLE
dw MOLAMBINO
dw MOLTRES
dw MR__MIME
dw MUK
@ -232,9 +252,14 @@ AlphabeticalPokedexOrder:
dw REMORAID
dw RHYDON
dw RHYHORN
; dw RHYPERIOR
dw RUDDERNAUT
dw SAKURAZE
dw SANDSHREW
dw SANDSLASH
dw SANDY_SHOCKS
dw SCIZOR
dw SCREAM_TAIL
dw SCYTHER
dw SEADRA
dw SEAKING
@ -254,6 +279,7 @@ AlphabeticalPokedexOrder:
dw SNEASEL
dw SNORLAX
dw SNUBBULL
dw SONEGG
dw SPEAROW
dw SPINARAK
dw SQUIRTLE
@ -276,9 +302,12 @@ AlphabeticalPokedexOrder:
dw TENTACRUEL
dw TOGEPI
dw TOGETIC
dw TONQUITO
dw TOTARTLE
dw TOTODILE
dw TREBIR
dw TRICULES
dw TRUSTAN
dw TYPHLOSION
dw TYRANITAR
dw TYROGUE
@ -297,15 +326,20 @@ AlphabeticalPokedexOrder:
dw VULPIX
dw WALKING_WAKE
dw WARTORTLE
dw WARUCHU
dw WEEDLE
dw WEEPINBELL
dw WEEZING
dw WIGGLYTUFF
dw WISPIRIT
dw WOBBUFFET
dw WOOPER
dw WYNAUT
dw XATU
dw XYLODON
dw XYLOFIN
dw YANMA
; dw YANMEGA
dw ZAPDOS
dw ZUBAT
assert_table_length NUM_POKEMON

View file

@ -270,6 +270,31 @@ NewPokedexOrder:
dw PORYGON2
dw CHANSEY
dw BLISSEY
dw WARUCHU
dw SONEGG
dw CACAWPHONY
dw TREBIR
dw SAKURAZE
dw AMANOBI
dw TRUSTAN
dw KUWAGUARD
dw TONQUITO
dw MOLAMBINO
dw LUANBO
dw GRANBO
dw ANGORE
dw EUCALA
dw KIWOOKED
dw CYCLORP
dw KITSEN
dw WISPIRIT
dw COATL
dw MIMEAR
dw INOSHIKA
dw RUDDERNAUT
dw XYLODON
dw XYLOFIN
dw DOKUROAR
dw LAPRAS
dw OMANYTE
dw OMASTAR
@ -290,6 +315,13 @@ NewPokedexOrder:
dw ARTICUNO
dw ZAPDOS
dw MOLTRES
dw SCREAM_TAIL
dw SANDY_SHOCKS
dw GREAT_TUSK
dw FLUTTER_MANE
dw IRON_TREADS
dw IRON_BUNDLE
dw IRON_THORNS
dw RAGING_BOLT
dw GOUGING_FIRE
dw WALKING_WAKE

View file

@ -116,8 +116,41 @@ EggMovePointers2::
dw ElekidEggMoves
dw MagbyEggMoves
dw MiltankEggMoves
dw NoEggMoves2 ; Blissey
; Nihon non-starter/folage/barreau here
dw WaruchuEggMoves
dw SoneggEggMoves
dw NoEggMoves2
dw NoEggMoves2
dw SakurazeEggMoves
dw AmanobiEggMoves
dw TrustanEggMoves
dw KuwaguardEggMoves
dw TonquitoEggMoves
dw MolambinoEggMoves
dw NoEggMoves2
dw NoEggMoves2
dw AngoreEggMoves
dw EucalaEggMoves
dw KiwookedEggMoves
dw CyclorpEggMoves
dw KitsenEggMoves
dw WispiritEggMoves
dw CoatlEggMoves
dw MimearEggMoves
dw InoshikaEggMoves
dw RuddernautEggMoves
dw XylodonEggMoves
dw NoEggMoves2
dw DokuroarEggMoves ; Dokuroar
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2 ; Raging Bolt
dw NoEggMoves2
dw NoEggMoves2
dw NoEggMoves2
@ -525,6 +558,153 @@ MiltankEggMoves:
dw SEISMIC_TOSS
dw -1 ; end
WaruchuEggMoves:
dw BELLY_DRUM
dw DISABLE
dw DIZZY_PUNCH
dw FAINT_ATTACK
dw MEAN_LOOK
dw QUICK_ATTACK
dw -1 ;end
SoneggEggMoves:
dw DRILL_PECK
dw MIRROR_MOVE
dw SAND_ATTACK
dw SKY_ATTACK
dw WHIRLWIND
dw -1 ;end
SakurazeEggMoves:
dw ACID
dw FIRE_SPIN
dw MORNING_SUN
dw -1 ;end
AmanobiEggMoves:
dw EXTREMESPEED
dw FAINT_ATTACK
dw FURY_SWIPES
dw PETAL_DANCE
dw SMOKESCREEN
dw SUBSTITUTE
dw -1 ;end
TrustanEggMoves:
dw FAINT_ATTACK
dw PAY_DAY
dw SPLASH
dw SUBMISSION
dw -1 ;end
KuwaguardEggMoves:
dw CRUNCH
dw METAL_CLAW
dw WHIRLWIND
dw -1 ;end
TonquitoEggMoves:
dw MEGAPHONE
dw AGILITY
dw POISON_STING
dw PSYWAVE
dw -1 ;end
MolambinoEggMoves:
dw DOUBLE_EDGE
dw PSYBEAM
dw SELFDESTRUCT
dw SWEET_KISS
dw TAKE_DOWN
dw -1 ;end
AngoreEggMoves:
dw CRUNCH
dw FURY_ATTACK
dw SWORDS_DANCE
dw -1 ;end
EucalaEggMoves:
dw FAINT_ATTACK
dw FLAME_WHEEL
dw LICK
dw SLUDGE
dw -1 ;end
KiwookedEggMoves:
dw DOUBLE_KICK
dw FAINT_ATTACK
dw QUICK_ATTACK
dw JUMP_KICK
dw -1 ;end
CyclorpEggMoves:
dw BEAT_UP
dw FURY_ATTACK
dw PURSUIT
dw SWORDS_DANCE
dw -1 ;end
KitsenEggMoves:
dw RAZOR_WIND
dw NIGHT_SHADE
dw SPITE
dw WHIRLWIND
dw -1 ;end
WispiritEggMoves:
dw CONFUSE_RAY
dw DISABLE
dw PAIN_SPLIT
dw PURSUIT
dw SCARY_FACE
dw -1 ;end
CoatlEggMoves:
dw BITE
dw MEDITATE
dw PETAL_DANCE
dw RAZOR_WIND
dw -1 ;end
MimearEggMoves:
dw LOVELY_KISS
dw PRESENT
dw SWEET_KISS
dw -1 ;end
InoshikaEggMoves:
dw FURY_ATTACK
dw PAY_DAY
dw ROCK_SLIDE
dw TAKE_DOWN
dw -1 ;end
RuddernautEggMoves:
dw DOUBLE_EDGE
dw MIST
dw OUTRAGE
dw PSYBEAM
dw SAFEGUARD
dw -1 ;end
XylodonEggMoves:
dw BELLY_DRUM
dw CRUNCH
dw DOUBLE_EDGE
dw LEER
dw SLAM
dw THRASH
dw -1 ;end
DokuroarEggMoves:
dw BONEMERANG
dw BONE_RUSH
dw BONE_CLUB
dw ROCK_SLIDE
dw SCARY_FACE
dw -1 ;end
LarvitarEggMoves:
dw PURSUIT
dw STOMP

View file

@ -116,6 +116,38 @@ EvosAttacksPointers2::
dw MagbyEvosAttacks
dw MiltankEvosAttacks
dw BlisseyEvosAttacks
dw WaruchuEvosAttacks
dw SoneggEvosAttacks
dw CacawphonyEvosAttacks
dw TrebirEvosAttacks
dw SakurazeEvosAttacks
dw AmanobiEvosAttacks
dw TrustanEvosAttacks
dw KuwaguardEvosAttacks
dw TonquitoEvosAttacks
dw MolambinoEvosAttacks
dw LuanboEvosAttacks
dw GranboEvosAttacks
dw AngoreEvosAttacks
dw EucalaEvosAttacks
dw KiwookedEvosAttacks
dw CyclorpEvosAttacks
dw KitsenEvosAttacks
dw WispiritEvosAttacks
dw CoatlEvosAttacks
dw MimearEvosAttacks
dw InoshikaEvosAttacks
dw RuddernautEvosAttacks
dw XylodonEvosAttacks
dw XylofinEvosAttacks
dw DokuroarEvosAttacks
dw ScreamTailEvosAttacks
dw SandyShocksEvosAttacks
dw GreatTuskEvosAttacks
dw FlutterManeEvosAttacks
dw IronTreadsEvosAttacks
dw IronBundleEvosAttacks
dw IronThornsEvosAttacks
dw RagingBoltEvosAttacks
dw GougingFireEvosAttacks
dw WalkingWakeEvosAttacks
@ -1634,7 +1666,448 @@ BlisseyEvosAttacks:
dbw 40, LIGHT_SCREEN
dbw 47, DOUBLE_EDGE
db 0 ; no more level-up moves
WaruchuEvosAttacks:
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 1, THUNDER_WAVE
dbw 7, LEER
dbw 11, PURSUIT
dbw 16, COMET_PUNCH
dbw 20, BEAT_UP
dbw 24, SPARK
dbw 28, SWIFT
dbw 33, THUNDERPUNCH
dbw 40, CRUNCH
db 0 ; no more level-up moves
SoneggEvosAttacks:
db 0 ; no more evolutions - TODO: ADD GENDERED EVOLUTION (L23)
dbw 1, PECK
dbw 1, MEGAPHONE
dbw 8, TACKLE
dbw 10, SING
dbw 16, METRONOME
dbw 21, WING_ATTACK
dbw 26, SUPERSONIC
dbw 29, ENCORE
dbw 35, DOUBLE_EDGE
db 0 ; no more level-up moves
CacawphonyEvosAttacks:
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, MEGAPHONE
dbw 1, SCREECH
dbw 8, TACKLE
dbw 10, SING
dbw 16, METRONOME
dbw 21, WING_ATTACK
dbw 29, SUPERSONIC
dbw 35, ENCORE
dbw 44, DOUBLE_EDGE
db 0 ; no more level-up moves
TrebirEvosAttacks:
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, MEGAPHONE
dbw 1, PERISH_SONG
dbw 8, TACKLE
dbw 10, SING
dbw 16, METRONOME
dbw 21, WING_ATTACK
dbw 29, SUPERSONIC
dbw 35, ENCORE
dbw 44, PERISH_SONG
db 0 ; no more level-up moves
SakurazeEvosAttacks:
db 0 ; no more evolutions
dbw 1, EMBER
dbw 1, GROWTH
dbw 8, LEECH_SEED
dbw 14, RAZOR_LEAF
dbw 20, SUNNY_DAY
dbw 26, PETAL_DANCE
dbw 32, TAKE_DOWN
dbw 38, SYNTHESIS
dbw 44, SOLAR_BEAM
db 0 ; no more level-up moves
AmanobiEvosAttacks: ; TODO: review moveset, it's fighting/steel
db 0 ; no more evolutions
dbw 1, EMBER
dbw 1, LEER
dbw 7, QUICK_ATTACK
dbw 12, FLAME_WHEEL
dbw 20, AGILITY
dbw 27, FIRE_SPIN
dbw 34, SPIKES
dbw 41, METAL_CLAW
dbw 48, SLASH
db 0 ; no more level-up moves
TrustanEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, GROWL
dbw 7, EMBER
dbw 12, SMOKESCREEN
dbw 17, QUICK_ATTACK
dbw 20, FLAME_WHEEL
dbw 27, FURY_SWIPES
dbw 34, TAKE_DOWN
dbw 40, SCREECH
dbw 46, DOUBLE_EDGE
db 0 ; no more level-up moves
KuwaguardEvosAttacks:
db 0 ; no more evolutions
dbw 1, VICEGRIP
dbw 1, STRING_SHOT
dbw 7, GUST
dbw 13, PIN_MISSILE
dbw 22, HARDEN
dbw 31, QUICK_ATTACK
dbw 43, WING_ATTACK
db 0 ; no more level-up moves
TonquitoEvosAttacks:
db 0 ; no more evolutions
dbw 1, LEECH_LIFE
dbw 1, GROWTH
dbw 7, ABSORB
dbw 13, GUST
dbw 22, MEGA_DRAIN
dbw 31, BATON_PASS
dbw 43, GIGA_DRAIN
db 0 ; no more level-up moves
MolambinoEvosAttacks:
db EVOLVE_LEVEL, 20, LUANBO
dbw 1, BUBBLE
dbw 1, SUPERSONIC
dbw 7, DRAINING_KISS
dbw 13, FLAIL
dbw 19, WATER_GUN
dbw 24, MORNING_SUN
dbw 29, BUBBLEBEAM
dbw 34, THRASH
dbw 39, HYDRO_PUMP
dbw 45, DAZZLING_GLEAM
db 0 ; no more level-up moves
LuanboEvosAttacks:
db EVOLVE_LEVEL, 35, GRANBO
dbw 1, BUBBLE
dbw 1, SUPERSONIC
dbw 7, DRAINING_KISS
dbw 13, FLAIL
dbw 19, WATER_GUN
dbw 25, MORNING_SUN
dbw 32, BUBBLEBEAM
dbw 39, THRASH
dbw 46, HYDRO_PUMP
dbw 54, DAZZLING_GLEAM
db 0 ; no more level-up moves
GranboEvosAttacks:
db 0 ; no more evolutions
dbw 1, BUBBLE
dbw 1, SUPERSONIC
dbw 7, DRAINING_KISS
dbw 13, FLAIL
dbw 19, WATER_GUN
dbw 25, MORNING_SUN
dbw 32, BUBBLEBEAM
dbw 43, THRASH
dbw 52, HYDRO_PUMP
dbw 63, DAZZLING_GLEAM
db 0 ; no more level-up moves
AngoreEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 6, LEER
dbw 12, RAGE
dbw 18, WATER_GUN
dbw 24, BITE
dbw 30, SLAM
dbw 36, SCARY_FACE
dbw 42, THRASH
dbw 48, IRON_TAIL
dbw 54, HYDRO_PUMP
db 0 ; no more level-up moves
EucalaEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, GROWL
dbw 8, FURY_SWIPES
dbw 14, RAZOR_LEAF
dbw 23, RAPID_SPIN
dbw 29, SCREECH
dbw 34, POISONPOWDER
dbw 34, STUN_SPORE
dbw 34, SLEEP_POWDER
dbw 40, THRASH
dbw 45, PETAL_DANCE
db 0 ; no more level-up moves
KiwookedEvosAttacks:
db 0 ; no more evolutions
dbw 1, PECK
dbw 1, LEER
dbw 7, SAND_ATTACK
dbw 13, GUST
dbw 19, MAGNITUDE
dbw 28, WHIRLWIND
dbw 34, FORESIGHT
dbw 39, FURY_ATTACK
dbw 45, DRILL_PECK
db 0 ; no more level-up moves
CyclorpEvosAttacks:
db 0 ; no more evolutions
dbw 1, VICEGRIP
dbw 1, STRING_SHOT
dbw 13, POISON_STING
dbw 24, PIN_MISSILE
dbw 31, FAINT_ATTACK
dbw 37, HARDEN
dbw 41, SLASH
dbw 45, CRUNCH
db 0 ; no more level-up moves
KitsenEvosAttacks:
db 0 ; no more evolutions
dbw 1, LICK
dbw 1, SPITE
dbw 8, MINIMIZE
dbw 13, GUST
dbw 20, CONFUSE_RAY
dbw 26, CURSE
dbw 31, HYPNOSIS
dbw 35, THIEF
dbw 38, DESTINY_BOND
dbw 43, FUTURE_SIGHT
db 0 ; no more level-up moves
WispiritEvosAttacks:
db 0 ; no more evolutions
dbw 1, LICK
dbw 1, SPITE
dbw 8, EMBER
dbw 14, SAFEGUARD
dbw 20, NIGHT_SHADE
dbw 27, FIRE_SPIN
dbw 34, DESTINY_BOND
dbw 43, PERISH_SONG
db 0 ; no more level-up moves
CoatlEvosAttacks:
db 0 ; no more evolutions
dbw 1, CONSTRICT
dbw 1, GUST
dbw 5, TRANSFORM
dbw 11, GROWTH
dbw 18, TWISTER
dbw 25, FLAIL
dbw 32, MORNING_SUN
dbw 38, FORESIGHT
dbw 43, HEAL_BELL
dbw 50, OUTRAGE
db 0 ; no more level-up moves
MimearEvosAttacks:
db 0 ; no more evolutions
dbw 1, DISARMING_VOICE
dbw 1, GROWL
dbw 8, FAIRY_WIND
dbw 13, CHARM
dbw 21, DRAINING_KISS
dbw 32, MIRROR_COAT
dbw 37, SAFEGUARD
dbw 43, DAZZLING_GLEAM
db 0 ; no more level-up moves
InoshikaEvosAttacks:
db 0 ; no more evolutions
dbw 1, TACKLE
dbw 1, LEER
dbw 7, ROCK_THROW
dbw 13, STOMP
dbw 21, ROLLOUT
dbw 28, HORN_ATTACK
dbw 35, ROCK_HEAD
dbw 42, DOUBLE_EDGE
dbw 50, SKULL_BASH
db 0 ; no more level-up moves
RuddernautEvosAttacks:
db 0 ; no more evolutions
dbw 1, WATER_GUN
dbw 7, GUST
dbw 14, RAGE
dbw 21, BUBBLEBEAM
dbw 28, AGILITY
dbw 35, TWISTER
dbw 42, FUTURE_SIGHT
dbw 49, HYDRO_PUMP
db 0 ; no more level-up moves
XylodonEvosAttacks:
db 0 ; no more evolutions
dbw 1, HEADBUTT
dbw 1, WITHDRAW
dbw 7, ROCK_THROW
dbw 13, ROAR
dbw 21, TAKE_DOWN
dbw 29, ROCK_SLIDE
dbw 36, THRASH
dbw 43, ANCIENTPOWER
dbw 50, ROCK_HEAD
db 0 ; no more level-up moves
XylofinEvosAttacks:
db 0 ; no more evolutions
dbw 1, HEADBUTT
dbw 1, WITHDRAW
dbw 7, ROCK_THROW
dbw 13, ROAR
dbw 21, TAKE_DOWN
dbw 29, ROCK_SLIDE
dbw 36, THRASH
dbw 40, IRON_TAIL
dbw 48, ANCIENTPOWER
dbw 55, ROCK_HEAD
dbw 62, HYDRO_PUMP
db 0 ; no more level-up moves
DokuroarEvosAttacks:
db 0 ; no more evolutions
dbw 1, SCRATCH
dbw 1, LEER
dbw 7, SPITE
dbw 14, NIGHT_SHADE
dbw 21, ANCIENTPOWER
dbw 28, SLASH
dbw 35, ROCK_HEAD
dbw 42, DESTINY_BOND
dbw 49, ROCK_SLASH
db 0 ; no more level-up moves
ScreamTailEvosAttacks:
db 0 ; no more evolutions
dbw 1, POUND
dbw 1, SING
dbw 7, SUNNY_DAY
dbw 14, DISABLE
dbw 21, BITE
dbw 28, BODY_SLAM
dbw 35, REST
dbw 42, DRAINING_KISS
dbw 49, PSYCHIC_M
dbw 56, CRUNCH
dbw 63, DAZZLING_GLEAM
dbw 70, PERISH_SONG
db 0 ; no more level-up moves
SandyShocksEvosAttacks:
db 0 ; no more evolutions
dbw 1, THUNDERSHOCK
dbw 1, SUPERSONIC
dbw 7, SUNNY_DAY
dbw 14, THUNDER_WAVE
dbw 21, SPARK
dbw 28, TRI_ATTACK
dbw 35, SCREECH
dbw 42, THUNDERBOLT
dbw 49, IRON_TAIL
dbw 56, EARTHQUAKE
dbw 63, ZAP_CANNON
dbw 70, MIRROR_COAT
db 0 ; no more level-up moves
GreatTuskEvosAttacks:
db 0 ; no more evolutions
dbw 1, HORN_ATTACK
dbw 1, DEFENSE_CURL
dbw 7, SUNNY_DAY
dbw 14, ROLLOUT
dbw 21, RAPID_SPIN
dbw 28, ROLLING_KICK
dbw 35, MAGNITUDE
dbw 42, ROCK_SLIDE
dbw 49, EARTHQUAKE
dbw 56, SUBMISSION
dbw 63, ROCK_HEAD
dbw 70, MEGAHORN
db 0 ; no more level-up moves
FlutterManeEvosAttacks:
db 0 ; no more evolutions
dbw 1, CONFUSE_RAY
dbw 1, SPITE
dbw 7, SUNNY_DAY
dbw 14, PSYBEAM
dbw 21, MEAN_LOOK
dbw 28, FAIRY_WIND
dbw 35, PSYCH_UP
dbw 42, DAZZLING_GLEAM
dbw 49, SHADOW_BALL
dbw 56, PSYCHIC_M
dbw 63, PAIN_SPLIT
dbw 70, PERISH_SONG
db 0 ; no more level-up moves
IronTreadsEvosAttacks:
db 0 ; no more evolutions
dbw 1, HORN_ATTACK
dbw 1, DEFENSE_CURL
dbw 7, MAGNITUDE
dbw 14, ROLLOUT
dbw 21, RAPID_SPIN
dbw 28, METAL_CLAW
dbw 35, FLAIL
dbw 42, ROCK_SLIDE
dbw 49, EARTHQUAKE
dbw 56, FURY_ATTACK
dbw 63, TAKE_DOWN
dbw 70, MEGAHORN
db 0 ; no more level-up moves
IronBundleEvosAttacks:
db 0 ; no more evolutions
dbw 1, PRESENT
dbw 7, RAIN_DANCE
dbw 14, POWDER_SNOW
dbw 21, WATER_GUN
dbw 28, TAKE_DOWN
dbw 35, DRILL_PECK
dbw 42, WHIRLPOOL
dbw 49, ICE_BEAM
dbw 56, AGILITY
dbw 63, HYDRO_PUMP
dbw 70, BLIZZARD
db 0 ; no more level-up moves
IronThornsEvosAttacks:
db 0 ; no more evolutions
dbw 1, ROCK_THROW
dbw 1, SPARK
dbw 7, SANDSTORM
dbw 14, SCREECH
dbw 21, THRASH
dbw 28, BITE
dbw 35, THUNDER_WAVE
dbw 42, ROCK_SLIDE
dbw 49, THUNDER
dbw 56, PIN_MISSILE
dbw 70, ROCK_SLASH
db 0 ; no more level-up moves
RagingBoltEvosAttacks:
db 0 ; no more evolutions
dbw 1, STOMP

View file

@ -295,6 +295,38 @@ MonMenuIcons:
db ICON_HUMANSHAPE ; MAGBY
db ICON_EQUINE ; MILTANK
db ICON_CLEFAIRY ; BLISSEY
db ICON_PIKACHU ; WARUCHU
db ICON_BIRD ; SONEGG
db ICON_BIRD ; CACAWPHONY
db ICON_BIRD ; TREBIR
db ICON_ODDISH ; SAKURAZE - Want this to be the old Flower icon
db ICON_FOX ; AMANOBI
db ICON_FOX ; TRUSTAN
db ICON_BUG ; KUWAGUARD
db ICON_BUG ; TONQUITO
db ICON_FISH ; MOLAMBINO
db ICON_FISH ; LUANBO
db ICON_FISH ; GRANBO
db ICON_FISH ; ANGORE
db ICON_FOX ; EUCALA
db ICON_BIRD ; KIWOOKED
db ICON_BUG ; CYCLORP
db ICON_GHOST ; KITSEN
db ICON_GHOST ; WISPIRIT
db ICON_SERPENT ; COATL
db ICON_HUMANSHAPE ; MIMEAR
db ICON_EQUINE ; INOSHIKA
db ICON_LAPRAS ; RUDDERNAUT
db ICON_MONSTER ; XYLODON
db ICON_MONSTER ; XYLOFIN
db ICON_MONSTER ; DOKUROAR
db ICON_JIGGLYPUFF ; SCREAM_TAIL
db ICON_VOLTORB ; SANDY_SHOCKS
db ICON_EQUINE ; GREAT_TUSK
db ICON_GHOST ; FLUTTER_MANE
db ICON_EQUINE ; IRON_TREADS
db ICON_BIRD ; IRON_BUNDLE
db ICON_MONSTER ; IRON_THORNS
db ICON_MONSTER ; RAGING_BOLT
db ICON_MONSTER ; GOUGING_FIRE
db ICON_MONSTER ; WALKING_WAKE

View file

@ -297,6 +297,39 @@ PokemonNames::
db "MAGBY@@@@@"
db "MILTANK@@@"
db "BLISSEY@@@"
; Nihon mons not named folage/barreau or the starters here
db "WARUCHU@@@"
db "SONEGG@@@@"
db "CACAWPHONY"
db "TREBIR@@@@"
db "SAKURAZE@@"
db "AMANOBI@@@"
db "TRUSTAN@@@"
db "KUWAGUARD@"
db "TONQUITO@@"
db "MOLAMBINO@"
db "LUANBO@@@@"
db "GRANBO@@@@"
db "ANGORE@@@@"
db "EUCALA@@@@"
db "KIWOOKED@@"
db "CYCLORP@@@"
db "KITSEN@@@@"
db "WISPIRIT@@"
db "COATL@@@@@"
db "MIMEAR@@@@"
db "INOSHIKA@@"
db "RUDDERNAUT"
db "XYLODON@@@"
db "XYLOFIN@@@"
db "DOKUROAR@@"
db "SCREAMTAIL"
db "SANDY SHOX"
db "GREAT TUSK"
db "FLUTTRMANE"; pain
db "IRONTREADS"
db "IRONBUNDLE"
db "IRONTHORNS"
db "RAGINGBOLT"
db "GOUGINFIRE" ; this is terrible but unless we can increase the character limit this is our best option
db "WALKINWAKE" ; see above

View file

@ -294,6 +294,38 @@ INCBIN "gfx/footprints/elekid.1bpp"
INCBIN "gfx/footprints/magby.1bpp"
INCBIN "gfx/footprints/miltank.1bpp"
INCBIN "gfx/footprints/blissey.1bpp"
INCBIN "gfx/footprints/waruchu.1bpp"
INCBIN "gfx/footprints/sonegg.1bpp"
INCBIN "gfx/footprints/cacawphony.1bpp"
INCBIN "gfx/footprints/trebir.1bpp"
INCBIN "gfx/footprints/sakuraze.1bpp"
INCBIN "gfx/footprints/amanobi.1bpp"
INCBIN "gfx/footprints/trustan.1bpp"
INCBIN "gfx/footprints/kuwaguard.1bpp"
INCBIN "gfx/footprints/tonquito.1bpp"
INCBIN "gfx/footprints/molambino.1bpp"
INCBIN "gfx/footprints/luanbo.1bpp"
INCBIN "gfx/footprints/granbo.1bpp"
INCBIN "gfx/footprints/angore.1bpp"
INCBIN "gfx/footprints/eucala.1bpp"
INCBIN "gfx/footprints/kiwooked.1bpp"
INCBIN "gfx/footprints/cyclorp.1bpp"
INCBIN "gfx/footprints/kitsen.1bpp"
INCBIN "gfx/footprints/wispirit.1bpp"
INCBIN "gfx/footprints/coatl.1bpp"
INCBIN "gfx/footprints/mimear.1bpp"
INCBIN "gfx/footprints/inoshika.1bpp"
INCBIN "gfx/footprints/ruddernaut.1bpp"
INCBIN "gfx/footprints/xylodon.1bpp"
INCBIN "gfx/footprints/xylofin.1bpp"
INCBIN "gfx/footprints/dokuroar.1bpp"
INCBIN "gfx/footprints/scream_tail.1bpp"
INCBIN "gfx/footprints/sandy_shocks.1bpp"
INCBIN "gfx/footprints/great_tusk.1bpp"
INCBIN "gfx/footprints/flutter_mane.1bpp"
INCBIN "gfx/footprints/iron_treads.1bpp"
INCBIN "gfx/footprints/iron_bundle.1bpp"
INCBIN "gfx/footprints/iron_thorns.1bpp"
INCBIN "gfx/footprints/raging_bolt.1bpp"
INCBIN "gfx/footprints/gouging_fire.1bpp"
INCBIN "gfx/footprints/walking_wake.1bpp"