thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-11-14 00:56:40 +13: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 2024-07-24 23:36:05 -04:00
parent 56554e2558 37980e84d0
commit 0161dc096d
33 changed files with 392 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -6,6 +6,7 @@
*.2bpp *.2bpp
*.lz *.lz
*.gbcpal *.gbcpal
!chris.gbcpal
*.dimensions *.dimensions
*.animated.tilemap *.animated.tilemap
*.sgb.tilemap *.sgb.tilemap

11
constants/event_flags.asm
View file

@ -1097,10 +1097,19 @@
const EVENT_BEAT_LEADER_SOUTHGUY const EVENT_BEAT_LEADER_SOUTHGUY
const EVENT_BEAT_LEADER_IMPOSTEROAK const EVENT_BEAT_LEADER_IMPOSTEROAK
const EVENT_BEAT_LEADER_AGATHA const EVENT_BEAT_LEADER_AGATHA
const EVENT_BEAT_TOHJO_GIOVANNI
const EVENT_BEAT_LEADER_GIOVANNI const EVENT_BEAT_LEADER_GIOVANNI
const EVENT_BEAT_LEADER_GREEN const EVENT_BEAT_LEADER_GREEN
const EVENT_BEAT_KURT const EVENT_BEAT_KURT
; Unused: next 93 events const EVENT_BEAT_ARIANA1
const EVENT_BEAT_ARIANA2
const EVENT_BEAT_ARIANA3
const EVENT_BEAT_ARIANA4
const EVENT_BEAT_ARCHER1
const EVENT_BEAT_ARCHER2
const EVENT_BEAT_ARCHER3
const EVENT_BEAT_PROFBLUE
; Unused: next 85 events
const_next 1600 const_next 1600
; Sprite visibility flags ; Sprite visibility flags

6
constants/sprite_constants.asm
View file

@ -121,8 +121,8 @@
const SPRITE_BANCHOMAN ; Bancho student with a pompadour. const SPRITE_BANCHOMAN ; Bancho student with a pompadour.
const SPRITE_ENOKI ; Prototype Morty, may use somewhere. const SPRITE_ENOKI ; Prototype Morty, may use somewhere.
const SPRITE_IMPOSTER_OAK const SPRITE_IMPOSTER_OAK
const GOLD_SKATEBOARD const SPRITE_GOLD_SKATEBOARD
const SILVERS_SISTER const SPRITE_SILVERS_SISTER
; KEP imports proceeding... ; KEP imports proceeding...
const SPRITE_OWVOLTORB const SPRITE_OWVOLTORB
@ -135,7 +135,7 @@
const SPRITE_GREEN const SPRITE_GREEN
const SPRITE_OWDIGLETT const SPRITE_OWDIGLETT
const SPRITE_CAT const SPRITE_CAT
const SPRITE_PWARBOK const SPRITE_OWARBOK
const SPRITE_BAOBA const SPRITE_BAOBA
const SPRITE_SILPH_PRESIDENT const SPRITE_SILPH_PRESIDENT
const SPRITE_SAFARI_ZONE_WORKER const SPRITE_SAFARI_ZONE_WORKER

16
constants/trainer_constants.asm
View file

@ -743,10 +743,12 @@ DEF KRIS EQU __trainer_class__
const DALI const DALI
trainerclass SOLDIER ; 52 trainerclass SOLDIER ; 52
const PEPPINO ; unused, may change const WIART ; unused, named after Adrian Carton de Wiart, a famous Irish-Belgian soldier who was shot in most parts of the body and fought in so many wars, just because he thought it was fun.
; Flynn
trainerclass SPORTSMAN ; 53 trainerclass SPORTSMAN ; 53
const JACQUES ; unused const JACQUES ; unused
; Pele?
trainerclass AEROFOSSIL ; 54 trainerclass AEROFOSSIL ; 54
const FOSSIL1 const FOSSIL1
@ -770,6 +772,9 @@ DEF KRIS EQU __trainer_class__
trainerclass AGATHA ; 56 trainerclass AGATHA ; 56
const AGATHA1 const AGATHA1
trainerclass COATGIOVANNI ; 56
const GIOVANNI1
trainerclass LEADERGIOVANNI ; 56 trainerclass LEADERGIOVANNI ; 56
const GIOVANNI3 const GIOVANNI3
@ -778,6 +783,15 @@ DEF KRIS EQU __trainer_class__
trainerclass KURT ; 56 trainerclass KURT ; 56
const KURT1 const KURT1
trainerclass ARIANA
const ARIANA1
trainerclass ARCHER
const ARCHER1
trainerclass PROFBLUE
const PROFBLUE1
DEF TOPAZ EQU __trainer_class__ DEF TOPAZ EQU __trainer_class__
DEF NUM_TRAINER_CLASSES EQU __trainer_class__ - 1 DEF NUM_TRAINER_CLASSES EQU __trainer_class__ - 1

4
data/maps/outdoor_sprites.asm
View file

@ -697,8 +697,8 @@ CableClubGroupSprites:
SilentHillsGroupSprites: SilentHillsGroupSprites:
; 12 non-walking filler sprites ; 12 non-walking filler sprites
db SPRITE_SUICUNE db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY db SPRITE_SILVERS_SISTER
db SPRITE_FAMICOM db SPRITE_SAFARI_ZONE_WORKER
db SPRITE_POKEDEX db SPRITE_POKEDEX
db SPRITE_WILL db SPRITE_WILL
db SPRITE_ROCKER db SPRITE_ROCKER

80
data/pokemon/cries.asm
View file

@ -22,13 +22,13 @@ PokemonCries::
mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE mon_cry CRY_WEEDLE, 238, 129 ; WEEDLE
mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA
mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL
mon_cry CRY_NIDORAN_M, 0, 0 ; GENTLARVA (incomplete) mon_cry CRY_MUK, 163, 187 ; GENTLARVA
mon_cry CRY_NIDORAN_M, 0, 0 ; PUPAL (incomplete) mon_cry CRY_KRABBY, 144, 151 ; PUPAL
mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete) mon_cry CRY_KRABBY, 245, 288 ; CARAPTHOR
mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA
mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA
mon_cry CRY_KANGASKHAN, 5, 129 ; GOROTORA mon_cry CRY_RHYDON, 32, 144 ; GOROTORA
mon_cry CRY_KANGASKHAN, 5, 129 ; RAITORA (Clone of Gorotora's for nowtm) mon_cry CRY_KANGASKHAN, 5, 129 ; RAITORA (incomplete?)
mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY
mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO
mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT
@ -73,9 +73,9 @@ PokemonCries::
mon_cry CRY_CLEFAIRY, 193, 156 ; COINPUR mon_cry CRY_CLEFAIRY, 193, 156 ; COINPUR
mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH
mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN
mon_cry CRY_CLEFAIRY, 26, 192 ; PERRSERKER (may revise) mon_cry CRY_AIPOM, -221, 232 ; PERRSERKER (kep import; may revise - mm?)
mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK
mon_cry CRY_PSYDUCK, 32, 224 ; WEIRDUCK (incomplete) mon_cry CRY_PSYDUCK, 147, 208 ; WEIRDUCK
mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK
mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY
mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE
@ -98,28 +98,28 @@ PokemonCries::
mon_cry CRY_SLOWKING, 573, 320 ; BELLIGNAN mon_cry CRY_SLOWKING, 573, 320 ; BELLIGNAN
mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL mon_cry CRY_VENONAT, 0, 256 ; TENTACOOL
mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL mon_cry CRY_VENONAT, 238, 383 ; TENTACRUEL
mon_cry CRY_NIDORAN_M, 0, 0 ; TOEDSCOOL (incomplete) mon_cry CRY_DIGLETT, -22, 353 ; TOEDSCOOL
mon_cry CRY_NIDORAN_M, 0, 0 ; TOEDSCRUEL (incomplete) mon_cry CRY_SLOWKING, -38, 704 ; TOEDSCRUEL
mon_cry CRY_NIDORAN_M, 0, 0 ; BLOTTLE (incomplete) mon_cry CRY_BLASTOISE, 147, 128 ; BLOTTLE
mon_cry CRY_NIDORAN_M, 0, 0 ; PENDRAKEN (incomplete) mon_cry CRY_BLASTOISE, 60, 128 ; PENDRAKEN
mon_cry CRY_VULPIX, 240, 144 ; GEODUDE mon_cry CRY_VULPIX, 240, 144 ; GEODUDE
mon_cry CRY_VULPIX, 0, 256 ; GRAVELER mon_cry CRY_VULPIX, 0, 256 ; GRAVELER
mon_cry CRY_GOLEM, 224, 192 ; GOLEM mon_cry CRY_GOLEM, 224, 192 ; GOLEM
mon_cry CRY_NIDORAN_M, 0, 0 ; KOLTA (incomplete) mon_cry CRY_WEEPINBELL, 55, 144 ; KOLTA
mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA
mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH
mon_cry CRY_NIDORAN_M, 0, 0 ; BALUMBA (incomplete) mon_cry CRY_PIDGEY, 0, 256 ; BALUMBA
mon_cry CRY_SLOWPOKE, 0, 256 ; SLOWPOKE mon_cry CRY_SLOWPOKE, 0, 256 ; SLOWPOKE
mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO
mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE
mon_cry CRY_NIDORAN_M, 0, 0 ; MAGNETITE (incomplete) mon_cry CRY_METAPOD, 177, 272 ; MAGNETITE
mon_cry CRY_METAPOD, 32, 320 ; MAGNETON mon_cry CRY_METAPOD, 32, 320 ; MAGNETON
mon_cry CRY_NIDORAN_M, 0, 0 ; MAGNEZONE (incomplete) mon_cry CRY_AMPHAROS, 656, 682 ; MAGNEZONE
mon_cry CRY_NIDORAN_M, 0, 0 ; GAVILLAIN (incomplete) mon_cry CRY_EARTHTRON, 246, 192 ; GAVILLAIN
mon_cry CRY_NIDORAN_M, 0, 0 ; CHEEP (incomplete) mon_cry CRY_RATTATA, 255, 192 ; CHEEP
mon_cry CRY_NIDORAN_M, 0, 0 ; JABETTA (incomplete) mon_cry CRY_RATTATA, 50, 383 ; JABETTA
mon_cry CRY_NIDORAN_M, 0, 0 ; RIBBITO (incomplete) mon_cry CRY_GOLEM, 147, 224 ; RIBBITO
mon_cry CRY_NIDORAN_M, 0, 0 ; CROAKOZUNA (incomplete) mon_cry CRY_GOLEM, 37, 383 ; CROAKOZUNA
mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D mon_cry CRY_SPEAROW, 221, 129 ; FARFETCH_D
mon_cry CRY_SUNFLORA, 13, 256 ; LUXWAN (incomplete - just taken from remoraid for now) mon_cry CRY_SUNFLORA, 13, 256 ; LUXWAN (incomplete - just taken from remoraid for now)
mon_cry CRY_DIGLETT, 187, 129 ; DODUO mon_cry CRY_DIGLETT, 187, 129 ; DODUO
@ -131,7 +131,7 @@ PokemonCries::
mon_cry CRY_MUK, 239, 383 ; MUK mon_cry CRY_MUK, 239, 383 ; MUK
mon_cry CRY_FEAROW, 0, 256 ; SHELLDER mon_cry CRY_FEAROW, 0, 256 ; SHELLDER
mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER
mon_cry CRY_NIDORAN_M, 0, 0 ; DISTURBAN (incomplete) mon_cry CRY_TOTODILE, 512, 320 ; DISTURBAN
mon_cry CRY_METAPOD, 0, 256 ; GASTLY mon_cry CRY_METAPOD, 0, 256 ; GASTLY
mon_cry CRY_METAPOD, 48, 192 ; HAUNTER mon_cry CRY_METAPOD, 48, 192 ; HAUNTER
mon_cry CRY_MUK, 0, 383 ; GENGAR mon_cry CRY_MUK, 0, 383 ; GENGAR
@ -146,11 +146,11 @@ PokemonCries::
mon_cry CRY_DROWZEE, 0, 256 ; EXEGGUTOR mon_cry CRY_DROWZEE, 0, 256 ; EXEGGUTOR
mon_cry CRY_CLEFAIRY, 0, 256 ; CUBONE mon_cry CRY_CLEFAIRY, 0, 256 ; CUBONE
mon_cry CRY_ODDISH, 79, 224 ; MAROWAK mon_cry CRY_ODDISH, 79, 224 ; MAROWAK
mon_cry CRY_NIDORAN_M, 0, 0 ; GUARDIA (incomplete) mon_cry CRY_ODDISH, 0, 383 ; GUARDIA
mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE
mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN
mon_cry CRY_SEEL, 0, 256 ; LICKITUNG mon_cry CRY_SEEL, 0, 256 ; LICKITUNG
mon_cry CRY_SEEL, -256, 300 ; LICKILICKY, tentative mon_cry CRY_SEEL, 169, 639 ; LICKILICKY
mon_cry CRY_SEEL, -300, 400 ; LICKILORD, tentative mon_cry CRY_SEEL, -300, 400 ; LICKILORD, tentative
mon_cry CRY_GOLEM, 230, 349 ; KOFFING mon_cry CRY_GOLEM, 230, 349 ; KOFFING
mon_cry CRY_GOLEM, 255, 383 ; WEEZING mon_cry CRY_GOLEM, 255, 383 ; WEEZING
@ -160,14 +160,14 @@ PokemonCries::
mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY
mon_cry CRY_GOLEM, 50, 140 ; BURGELA, tentative mon_cry CRY_GOLEM, 50, 140 ; BURGELA, tentative
mon_cry CRY_GOLEM, 0, 256 ; TANGELA mon_cry CRY_GOLEM, 0, 256 ; TANGELA
mon_cry CRY_GOLEM, -256, 350 ; TANGROWTH, tentative mon_cry CRY_RAIKOU, 426, 592 ; TANGROWTH
mon_cry CRY_GOLEM, -140, 383 ; JUNGELA, tentative mon_cry CRY_GOLEM, -140, 383 ; JUNGELA, tentative
mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN
mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA
mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA
mon_cry CRY_BLASTOISE, 247, 128 ; BLASTYKE mon_cry CRY_BLASTOISE, 247, 128 ; BLASTYKE
mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE
mon_cry CRY_NIDORAN_M, 0, 0 ; ORFRY (incomplete) mon_cry CRY_CATERPIE, 137, 142 ; ORFRY
mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN
mon_cry CRY_CATERPIE, 16, 383 ; SEAKING mon_cry CRY_CATERPIE, 16, 383 ; SEAKING
mon_cry CRY_PARAS, 2, 160 ; STARYU mon_cry CRY_PARAS, 2, 160 ; STARYU
@ -177,11 +177,11 @@ PokemonCries::
mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER mon_cry CRY_CATERPIE, 0, 256 ; SCYTHER
mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR
mon_cry CRY_DROWZEE, 255, 383 ; JYNX mon_cry CRY_DROWZEE, 255, 383 ; JYNX
mon_cry CRY_NIDORAN_M, 0, 0 ; BUU mon_cry CRY_DROWZEE, 46, 352 ; BUU
mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ
mon_cry CRY_NIDORAN_M, 0, 0 ; ELECTIVIRE (incomplete) mon_cry CRY_TEDDIURSA, 470, 256 ; ELECTIVIRE
mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR
mon_cry CRY_NIDORAN_M, 0, 0 ; MAGMORTAR (incomplete) mon_cry CRY_PIDGEOTTO, 3093, 642 ; MAGMORTAR
mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR
mon_cry CRY_RAICHU, 291, 256 ; TRICULES mon_cry CRY_RAICHU, 291, 256 ; TRICULES
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS
@ -191,7 +191,7 @@ PokemonCries::
mon_cry CRY_EKANS, 0, 256 ; TERRADOS (incomplete) mon_cry CRY_EKANS, 0, 256 ; TERRADOS (incomplete)
mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS
mon_cry CRY_PIDGEY, 255, 383 ; DITTO mon_cry CRY_PIDGEY, 255, 383 ; DITTO
mon_cry CRY_NIDORAN_M, 0, 0 ; MIMMEO (incomplete) mon_cry CRY_PIDGEY, 80, 383 ; MIMMEO
mon_cry CRY_VENONAT, 136, 224 ; EEVEE mon_cry CRY_VENONAT, 136, 224 ; EEVEE
mon_cry CRY_VENONAT, 170, 383 ; VAPOREON mon_cry CRY_VENONAT, 170, 383 ; VAPOREON
mon_cry CRY_VENONAT, 61, 256 ; JOLTEON mon_cry CRY_VENONAT, 61, 256 ; JOLTEON
@ -203,16 +203,16 @@ PokemonCries::
mon_cry CRY_FEAROW, 238, 129 ; KABUTOPS mon_cry CRY_FEAROW, 238, 129 ; KABUTOPS
mon_cry CRY_NIDORAN_M, 0, 0 ; FERADACTYL (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; FERADACTYL (incomplete)
mon_cry CRY_VILEPLUME, 32, 368 ; AERODACTYL mon_cry CRY_VILEPLUME, 32, 368 ; AERODACTYL
mon_cry CRY_NIDORAN_M, 0, 0 ; DECILLA (incomplete) mon_cry CRY_BULBASAUR, 64, 256 ; DECILLA
mon_cry CRY_NIDORAN_M, 0, 0 ; GAWARHED (incomplete) mon_cry CRY_BULBASAUR, 0, 256 ; GAWARHED
mon_cry CRY_GRIMER, 101, 128 ; MUNCHLAX mon_cry CRY_GRIMER, 101, 128 ; MUNCHLAX
mon_cry CRY_GRIMER, 85, 129 ; SNORLAX mon_cry CRY_GRIMER, 85, 129 ; SNORLAX
mon_cry CRY_RAICHU, 128, 192 ; ARTICUNO mon_cry CRY_RAICHU, 128, 192 ; ARTICUNO
mon_cry CRY_FEAROW, 255, 256 ; ZAPDOS mon_cry CRY_FEAROW, 255, 256 ; ZAPDOS
mon_cry CRY_RAICHU, 248, 192 ; MOLTRES mon_cry CRY_RAICHU, 248, 192 ; MOLTRES
mon_cry CRY_NIDORAN_M, 0, 0 ; SQUEAMATA (incomplete) mon_cry CRY_BULBASAUR, 100, 320 ; SQUEAMATA
mon_cry CRY_NIDORAN_M, 0, 0 ; MINISTARE (incomplete) mon_cry CRY_BULBASAUR, 64, 320 ; MINISTARE
mon_cry CRY_NIDORAN_M, 0, 0 ; IGUANARCH (incomplete) mon_cry CRY_BULBASAUR, 32, 320 ; IGUANARCH
mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI
mon_cry CRY_BULBASAUR, 64, 256 ; DRAGONAIR mon_cry CRY_BULBASAUR, 64, 256 ; DRAGONAIR
mon_cry CRY_BULBASAUR, 60, 320 ; DRAGONITE mon_cry CRY_BULBASAUR, 60, 320 ; DRAGONITE
@ -285,9 +285,9 @@ PokemonCries::
mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE mon_cry CRY_WOOPER, -198, 320 ; QUAGSIRE
mon_cry CRY_AIPOM, 162, 320 ; ESPEON mon_cry CRY_AIPOM, 162, 320 ; ESPEON
mon_cry CRY_VENONAT, -233, 240 ; UMBREON mon_cry CRY_VENONAT, -233, 240 ; UMBREON
mon_cry CRY_NIDORAN_M, 0, 0 ; LEAFEON (incomplete) mon_cry CRY_CHIKORITA, -1, 512 ; LEAFEON
mon_cry CRY_NIDORAN_M, 0, 0 ; GLACEON (incomplete) mon_cry CRY_AMPHAROS, 63, 592 ; GLACEON
mon_cry CRY_NIDORAN_M, 0, 0 ; SYLVEON (incomplete) mon_cry CRY_NIDOQUEEN, 253, 367 ; SYLVEON
mon_cry CRY_MARILL, -31, 384 ; MURKROW mon_cry CRY_MARILL, -31, 384 ; MURKROW
mon_cry CRY_NIDORAN_M, 0, 0 ; HONCHKROW (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; HONCHKROW (incomplete)
mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING
@ -341,7 +341,7 @@ PokemonCries::
mon_cry CRY_SENTRET, 72, 560 ; PHANPY mon_cry CRY_SENTRET, 72, 560 ; PHANPY
mon_cry CRY_DONPHAN, 0, 416 ; DONPHAN mon_cry CRY_DONPHAN, 0, 416 ; DONPHAN
mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2 mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2
mon_cry CRY_NIDORAN_M, 0, 0 ; PORYGON_Z (incomplete) mon_cry CRY_PARAS, 287, 519 ; PORYGONZ
mon_cry CRY_AIPOM, -352, 384 ; STANTLER mon_cry CRY_AIPOM, -352, 384 ; STANTLER
mon_cry CRY_NIDORAN_M, 0, 0 ; WYRDEER (incomplete) mon_cry CRY_NIDORAN_M, 0, 0 ; WYRDEER (incomplete)
mon_cry CRY_PICHU, -538, 496 ; SMEARGLE mon_cry CRY_PICHU, -538, 496 ; SMEARGLE
@ -379,8 +379,8 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 128 ; XYLODON mon_cry CRY_NIDORAN_M, 0, 128 ; XYLODON
mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN mon_cry CRY_NIDORAN_M, 0, 128 ; XYLOFIN
mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR mon_cry CRY_METAPOD, 766, 566 ; DOKUROAR
mon_cry CRY_NIDORAN_M, 0, 128 ; SCREAM_TAIL mon_cry CRY_PIDGEY, 250, 256 ; SCREAM_TAIL
mon_cry CRY_NIDORAN_M, 0, 128 ; SANDY_SHOCKS mon_cry CRY_METAPOD, 31, 349 ; SANDY_SHOCKS
mon_cry CRY_NIDORAN_M, 0, 128 ; GREAT_TUSK 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 ; FLUTTER_MANE
mon_cry CRY_NIDORAN_M, 0, 128 ; IRON_TREADS mon_cry CRY_NIDORAN_M, 0, 128 ; IRON_TREADS

24
data/sprites/sprites.asm
View file

@ -116,36 +116,36 @@ OverworldSprites:
overworld_sprite TopazRunSpriteGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE overworld_sprite TopazRunSpriteGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
; SW97 Imports ; SW97 Imports
overworld_sprite TsukushiGFX, 4, STILL_SPRITE, PAL_OW_PURPLE overworld_sprite TsukushiGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
overworld_sprite MikanGFX, 12, WALKING_SPRITE, PAL_OW_GREEN overworld_sprite MikanGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
overworld_sprite MediumSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite MediumSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite AgathaGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE overworld_sprite AgathaGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
overworld_sprite HelmetBikerGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite HelmetBikerGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite WalkerGFX, 4, STILL_SPRITE, PAL_OW_BLUE overworld_sprite WalkerGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
overworld_sprite SpaceworldGirlGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite SpaceworldGirlGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite BanchomanGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE overworld_sprite BanchomanGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
overworld_sprite EnokiGFX, 4, STILL_SPRITE, PAL_OW_PURPLE overworld_sprite EnokiGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
overworld_sprite ImposterOakGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite ImposterOakGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite GoldSkateboardGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite GoldSkateboardGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite SilverSisterGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite SilverSisterGFX, 12, WALKING_SPRITE, PAL_OW_RED
; KEP Imports ; KEP Imports
overworld_sprite VoltorbGFX, 4, STILL_SPRITE, PAL_OW_RED overworld_sprite VoltorbGFX, 12, STANDING_SPRITE, PAL_OW_RED
overworld_sprite SmallBirdGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite SmallBirdGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite OfficerJennyGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite OfficerJennyGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
overworld_sprite KoffingGFX, 4, STILL_SPRITE, PAL_OW_PURPLE overworld_sprite KoffingGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
overworld_sprite JessieGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite JessieGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite JamesGFX, 12, WALKING_SPRITE, PAL_OW_BLUE overworld_sprite JamesGFX, 12, WALKING_SPRITE, PAL_OW_BLUE
overworld_sprite GengarGFX, 4, STILL_SPRITE, PAL_OW_PURPLE overworld_sprite GengarGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
overworld_sprite GreenGFX, 12, WALKING_SPRITE, PAL_OW_GREEN overworld_sprite GreenGFX, 12, WALKING_SPRITE, PAL_OW_GREEN
overworld_sprite DiglettGFX, 4, STILL_SPRITE, PAL_OW_BROWN overworld_sprite DiglettGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
overworld_sprite CatGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite CatGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite ArbokGFX, 4, STILL_SPRITE, PAL_OW_PURPLE overworld_sprite ArbokGFX, 12, STANDING_SPRITE, PAL_OW_PURPLE
overworld_sprite BaobaGFX, 4, STILL_SPRITE, PAL_OW_BROWN overworld_sprite BaobaGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
overworld_sprite SilphChiefGFX, 4, STILL_SPRITE, PAL_OW_BROWN overworld_sprite SilphChiefGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
overworld_sprite SafariZoneWorkerGFX, 4, STILL_SPRITE, PAL_OW_BROWN overworld_sprite SafariZoneWorkerGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
overworld_sprite LoreleiGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite LoreleiGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite GiovanniGFX, 12, WALKING_SPRITE, PAL_OW_RED overworld_sprite GiovanniGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite ChannelerGFX, 12, WALKING_SPRITE, PAL_OW_BROWN overworld_sprite ChannelerGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite BaldingGuyGFX, 4, STILL_SPRITE, PAL_OW_BROWN overworld_sprite BaldingGuyGFX, 12, STANDING_SPRITE, PAL_OW_BROWN
assert_table_length NUM_OVERWORLD_SPRITES assert_table_length NUM_OVERWORLD_SPRITES

24
data/trainers/attributes.asm
View file

@ -507,6 +507,12 @@ TrainerClassAttributes:
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
dw CONTEXT_USE | SWITCH_SOMETIMES dw CONTEXT_USE | SWITCH_SOMETIMES
; Giovanni 1
db FULL_RESTORE, NO_ITEM ; items
db 25 ; base reward
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
dw CONTEXT_USE | SWITCH_SOMETIMES
; Giovanni 3 ; Giovanni 3
db FULL_RESTORE, FULL_HEAL ; items db FULL_RESTORE, FULL_HEAL ; items
db 25 ; base reward db 25 ; base reward
@ -525,4 +531,22 @@ TrainerClassAttributes:
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
dw CONTEXT_USE | SWITCH_SOMETIMES dw CONTEXT_USE | SWITCH_SOMETIMES
; Ariana
db FULL_RESTORE, NO_ITEM ; items
db 25 ; base reward
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
dw CONTEXT_USE | SWITCH_SOMETIMES
; Archer
db FULL_RESTORE, NO_ITEM ; items
db 25 ; base reward
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY | AI_OPPORTUNIST | AI_TYPES
dw CONTEXT_USE | SWITCH_SOMETIMES
; Prof.Blue
db FULL_RESTORE, FULL_RESTORE ; items
db 25 ; base reward
dw AI_BASIC | AI_SETUP | AI_SMART | AI_AGGRESSIVE | AI_CAUTIOUS | AI_STATUS | AI_RISKY
dw CONTEXT_USE | SWITCH_SOMETIMES
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

10
data/trainers/class_names.asm
View file

@ -12,7 +12,7 @@ TrainerClassNames::
li "RIVAL" li "RIVAL"
li "#MON PROF." li "#MON PROF."
li "ELITE FOUR" li "ELITE FOUR"
li "<PKMN> TRAINER" li "<PKMN>TRAINER"
li "ELITE FOUR" li "ELITE FOUR"
li "ELITE FOUR" li "ELITE FOUR"
li "ELITE FOUR" li "ELITE FOUR"
@ -63,7 +63,7 @@ TrainerClassNames::
li "KIMONO GIRL" li "KIMONO GIRL"
li "TWINS" li "TWINS"
li "#FAN" li "#FAN"
li "<PKMN> TRAINER" li "<PKMN>TRAINER"
li "LEADER" li "LEADER"
li "OFFICER" li "OFFICER"
li "ROCKET" li "ROCKET"
@ -83,9 +83,13 @@ TrainerClassNames::
li "LEADER" li "LEADER"
li "LEADER" li "LEADER"
li "LEADER" li "LEADER"
li "LEADER?" ; Impostor Oak li "LEADER?" ; Imposter Oak
li "LEADER" li "LEADER"
li "<PKMN>TRAINER"
li "LEADER" li "LEADER"
li "LEADER" li "LEADER"
li "BALLSMITH" li "BALLSMITH"
li "EXECUTIVE"
li "EXECUTIVE"
li "PROFESSOR"
assert_list_length NUM_TRAINER_CLASSES assert_list_length NUM_TRAINER_CLASSES

4
data/trainers/dvs.asm
View file

@ -86,7 +86,11 @@ TrainerClassDVs:
dn 13, 12, 13, 13 ; South guy dn 13, 12, 13, 13 ; South guy
dn 13, 12, 13, 13 ; IMPOSTEROAK dn 13, 12, 13, 13 ; IMPOSTEROAK
dn 12, 12, 15, 15 ; AGATHA (HP Fighting 70) dn 12, 12, 15, 15 ; AGATHA (HP Fighting 70)
dn 13, 12, 13, 13 ; GIOVANNI1
dn 13, 12, 13, 13 ; GIOVANNI3 dn 13, 12, 13, 13 ; GIOVANNI3
dn 13, 12, 13, 13 ; GREEN dn 13, 12, 13, 13 ; GREEN
dn 13, 12, 13, 13 ; KURT dn 13, 12, 13, 13 ; KURT
dn 13, 12, 13, 13 ; ARIANA
dn 13, 12, 13, 13 ; ARCHER
dn 13, 12, 13, 13 ; PROF.BLUE
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

4
data/trainers/encounter_music.asm
View file

@ -88,7 +88,11 @@ TrainerEncounterMusic::
db MUSIC_OFFICER_ENCOUNTER ; South Guy db MUSIC_OFFICER_ENCOUNTER ; South Guy
db MUSIC_POKEMANIAC_ENCOUNTER ; IMPOSTOROAK db MUSIC_POKEMANIAC_ENCOUNTER ; IMPOSTOROAK
db MUSIC_SAGE_ENCOUNTER ; AGATHA db MUSIC_SAGE_ENCOUNTER ; AGATHA
db MUSIC_ROCKET_ENCOUNTER ; GIOVANNI1
db MUSIC_ROCKET_ENCOUNTER ; GIOVANNI3 db MUSIC_ROCKET_ENCOUNTER ; GIOVANNI3
db MUSIC_OFFICER_ENCOUNTER ; GREEN db MUSIC_OFFICER_ENCOUNTER ; GREEN
db MUSIC_OFFICER_ENCOUNTER ; KURT db MUSIC_OFFICER_ENCOUNTER ; KURT
db MUSIC_ROCKET_ENCOUNTER ; ARIANA
db MUSIC_ROCKET_ENCOUNTER ; ARCHER
db MUSIC_OFFICER_ENCOUNTER ; PROF.BLUE
assert_table_length NUM_TRAINER_CLASSES + 1 assert_table_length NUM_TRAINER_CLASSES + 1

4
data/trainers/genders.asm
View file

@ -87,7 +87,11 @@ BTTrainerClassGenders:
db MALE ; SOUTH GUY db MALE ; SOUTH GUY
db MALE ; IMPOSTEROAK db MALE ; IMPOSTEROAK
db FEMALE ; AGATHA db FEMALE ; AGATHA
db MALE ; GIOVANNI1
db MALE ; GIOVANNI3 db MALE ; GIOVANNI3
db FEMALE ; GREEN db FEMALE ; GREEN
db MALE ; KURT db MALE ; KURT
db MALE ; ARIANA
db FEMALE ; ARCHER
db MALE ; PROF.BLUE
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

12
data/trainers/leaders.asm
View file

@ -17,8 +17,16 @@ GymLeaders:
db BRUNO db BRUNO
db KAREN db KAREN
db KOGA db KOGA
db CHAMPION ; db CHAMPION
db RED ; db RED
; For now Nihon bosses will be here.
db WALKER
db LORELEI
db XXX
db IMPOSTEROAK
db AGATHA
db LEADERGIOVANNI
db GREEN
; fallthrough ; fallthrough
KantoGymLeaders: KantoGymLeaders:
db BROCK db BROCK

6
data/trainers/palettes.asm
View file

@ -7,7 +7,7 @@ TrainerPalettes:
table_width PAL_COLOR_SIZE * 2, TrainerPalettes table_width PAL_COLOR_SIZE * 2, TrainerPalettes
PlayerPalette: PlayerPalette:
INCBIN "gfx/player/chris.gbcpal", middle_colors INCBIN "gfx/player/chris.gbcpal", middle_colors ; ignore the fact that this is an exception in the gitignore. do not research. DO NOT RESEARCH. I SAID DO NOT RESEARCH!!
KrisPalette: ; Kris shares Falkner's palette KrisPalette: ; Kris shares Falkner's palette
INCBIN "gfx/trainers/falkner.gbcpal", middle_colors INCBIN "gfx/trainers/falkner.gbcpal", middle_colors
INCBIN "gfx/trainers/whitney.gbcpal", middle_colors INCBIN "gfx/trainers/whitney.gbcpal", middle_colors
@ -94,9 +94,13 @@ INCBIN "gfx/trainers/lorelei.gbcpal", middle_colors
INCBIN "gfx/trainers/southguy.gbcpal", middle_colors INCBIN "gfx/trainers/southguy.gbcpal", middle_colors
INCBIN "gfx/trainers/oak.gbcpal", middle_colors ; dupe for imposter oak INCBIN "gfx/trainers/oak.gbcpal", middle_colors ; dupe for imposter oak
INCBIN "gfx/trainers/agatha.gbcpal", middle_colors INCBIN "gfx/trainers/agatha.gbcpal", middle_colors
INCBIN "gfx/trainers/giovanni_coat.gbcpal", middle_colors
INCBIN "gfx/trainers/giovanni3.gbcpal", middle_colors INCBIN "gfx/trainers/giovanni3.gbcpal", middle_colors
INCBIN "gfx/trainers/green.gbcpal", middle_colors INCBIN "gfx/trainers/green.gbcpal", middle_colors
INCBIN "gfx/trainers/kurt.gbcpal", middle_colors INCBIN "gfx/trainers/kurt.gbcpal", middle_colors
INCBIN "gfx/trainers/ariana.gbcpal", middle_colors
INCBIN "gfx/trainers/archer.gbcpal", middle_colors
INCBIN "gfx/trainers/blue_professor.gbcpal", middle_colors
EnbyPalette: EnbyPalette:
INCLUDE "gfx/player/topaz.pal" INCLUDE "gfx/player/topaz.pal"

266
data/trainers/parties_new_classes.asm
View file

@ -80,7 +80,7 @@ PainterGroup:
SoldierGroup: SoldierGroup:
next_list_item ; SOLDIER (1) next_list_item ; SOLDIER (1)
db "PEPPINO@", TRAINERTYPE_NORMAL db "WIART@", TRAINERTYPE_NORMAL
db 23 db 23
dw FORRETRESS dw FORRETRESS
db -1 ; end db -1 ; end
@ -267,15 +267,15 @@ LassGroup:
db 43 db 43
dw NIDOQUEEN ; From the Yellow Lass dw NIDOQUEEN ; From the Yellow Lass
db NO_ITEM db NO_ITEM
db BODY_SLAM, SCRATCH, BLIZZARD, THUNDERBOLT dw BODY_SLAM, SCRATCH, BLIZZARD, THUNDERBOLT
db 43 db 43
dw GOROTORA ; Basically the beta Pikaclone counterpart, right? dw GOROTORA ; Basically the beta Pikaclone counterpart, right?
db NO_ITEM db NO_ITEM
db THUNDERBOLT, SCARY_FACE, QUICK_ATTACK, PURSUIT dw THUNDERBOLT, SCARY_FACE, QUICK_ATTACK, PURSUIT
db 45 db 45
dw PIKACHU ; And a pipe bomb. dw PIKACHU ; And a pipe bomb.
db LIGHT_BALL db LIGHT_BALL
db THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime dw THUNDERBOLT, QUICK_ATTACK, DOUBLE_EDGE, AGILITY ; Moves from Johto anime
db -1 ; end db -1 ; end
end_list_items end_list_items
@ -286,27 +286,27 @@ WalkerGroup:
db 60 db 60
dw TOGEKISS dw TOGEKISS
db PINK_BOW db PINK_BOW
db EXTREMESPEED, MIRROR_MOVE, SAFEGUARD, HIDDEN_POWER ; HP Water dw EXTREMESPEED, MIRROR_MOVE, SAFEGUARD, HIDDEN_POWER ; HP Water
db 60 db 60
dw LUXWAN dw LUXWAN
db STICK db STICK
db FURY_CUTTER, SLASH, DRILL_PECK, THUNDERBOLT dw FURY_CUTTER, SLASH, DRILL_PECK, THUNDERBOLT
db 60 db 60
dw CARETORKER dw CARETORKER
db LEFTOVERS db LEFTOVERS
db SOFTBOILED, DRILL_PECK, HEAL_BELL, WHIRLWIND ; Drill Peck should be Dazzling Gleam! dw SOFTBOILED, DRILL_PECK, HEAL_BELL, WHIRLWIND ; Drill Peck should be Dazzling Gleam!
db 60 db 60
dw DODRIO dw DODRIO
db POLKADOT_BOW db POLKADOT_BOW
db FLAIL, DRILL_PECK, AGILITY, ENDURE dw FLAIL, DRILL_PECK, AGILITY, ENDURE
db 60 db 60
dw AERODACTYL ; Progenitor of Birds in Tajiri lore! dw AERODACTYL ; Progenitor of Birds in Tajiri lore!
db MIRACLEBERRY db MIRACLEBERRY
db ROCK_HEAD, WING_ATTACK, EARTHQUAKE, FIRE_BLAST dw ROCK_HEAD, WING_ATTACK, EARTHQUAKE, FIRE_BLAST
db 60 db 60
dw SKARMORY dw SKARMORY
db NO_ITEM ; Fire-type damage reduction item here please! db NO_ITEM ; Fire-type damage reduction item here please!
db STEEL_WING, DRILL_PECK, PURSUIT, LEER dw STEEL_WING, DRILL_PECK, PURSUIT, LEER
db -1 ; end db -1 ; end
end_list_items end_list_items
@ -316,27 +316,27 @@ LoreleiGroup:
db 60 db 60
dw CLOYSTER dw CLOYSTER
db MINT_BERRY db MINT_BERRY
db SPIKES, ICE_BEAM, SURF, EXPLOSION dw SPIKES, ICE_BEAM, SURF, EXPLOSION
db 60 db 60
dw SNEASEL ; WEAVILE dw SNEASEL ; WEAVILE
db PRZCUREBERRY db PRZCUREBERRY
db BEAT_UP, SLASH, ICE_BEAM, SWAGGER dw BEAT_UP, SLASH, ICE_BEAM, SWAGGER
db 60 db 60
dw JYNX dw JYNX
db NO_ITEM db NO_ITEM
db LOVELY_KISS, PSYCHIC_M, PERISH_SONG, THIEF dw LOVELY_KISS, PSYCHIC_M, PERISH_SONG, THIEF
db 60 db 60
dw LUXWAN ; BUNBERG dw LUXWAN ; BUNBERG
db MIRACLEBERRY db MIRACLEBERRY
db SYNTHESIS, ICE_BEAM, RAZOR_LEAF, PRESENT ; funny,,,,, dw SYNTHESIS, ICE_BEAM, RAZOR_LEAF, PRESENT ; funny,,,,,
db 60 db 60
dw NINETALES ; NINETALESA dw NINETALES ; NINETALESA
db FAIRY_FEATHER db FAIRY_FEATHER
db ICE_BEAM, CONFUSE_RAY, HIDDEN_POWER, NO_MOVE ; DAZZLING_GLEAM please! also, HP Electric dw ICE_BEAM, CONFUSE_RAY, HIDDEN_POWER, NO_MOVE ; DAZZLING_GLEAM please! also, HP Electric
db 60 db 60
dw LAPRAS dw LAPRAS
db NEVERMELTICE db NEVERMELTICE
db THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY dw THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
db -1 ; end db -1 ; end
end_list_items end_list_items
@ -346,27 +346,27 @@ XXXGroup: ; South Man
db 60 db 60
dw BALUMBA dw BALUMBA
db MIRACLEBERRY db MIRACLEBERRY
db HYPNOSIS, GUST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls! dw HYPNOSIS, GUST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls!
db 60 db 60
dw SYLVEON dw SYLVEON
db PRZCUREBERRY db PRZCUREBERRY
db QUICK_ATTACK, GROWTH, LIGHT_SCREEN, NO_MOVE ; Dazzling Gleam pls! dw QUICK_ATTACK, GROWTH, LIGHT_SCREEN, NO_MOVE ; Dazzling Gleam pls!
db 60 db 60
dw MIMEAR dw MIMEAR
db MAGNET db MAGNET
db LOVELY_KISS, THUNDERBOLT, PRESENT, NO_MOVE ; Dazzling Gleam pls! dw LOVELY_KISS, THUNDERBOLT, PRESENT, NO_MOVE ; Dazzling Gleam pls!
db 60 db 60
dw WEEZING ; WEEZINGG dw WEEZING ; WEEZINGG
db NO_ITEM ; Ground-type reducing item db NO_ITEM ; Ground-type reducing item
db SLUDGE_BOMB, FIRE_BLAST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls! dw SLUDGE_BOMB, FIRE_BLAST, EXPLOSION, NO_MOVE ; Dazzling Gleam pls!
db 60 db 60
dw PHANDARIN dw PHANDARIN
db PSNCUREBERRY db PSNCUREBERRY
db SHADOW_BALL, BODY_SLAM, PURSUIT, NO_MOVE ; Dazzling Gleam pls! dw SHADOW_BALL, BODY_SLAM, PURSUIT, NO_MOVE ; Dazzling Gleam pls!
db 60 db 60
dw GRANBO dw GRANBO
db FAIRY_FEATHER db FAIRY_FEATHER
db NO_MOVE, NO_MOVE, NO_MOVE, NO_MOVE ; Dazzling Gleam pls! dw SURF, NO_MOVE, NO_MOVE, NO_MOVE ; Dazzling Gleam pls!
db -1 ; end db -1 ; end
end_list_items end_list_items
@ -376,27 +376,27 @@ ImposterOakGroup:
db 60 db 60
dw TAUROS dw TAUROS
db POLKADOT_BOW db POLKADOT_BOW
db BODY_SLAM, HYPER_BEAM, FIRE_BLAST, THUNDERBOLT dw BODY_SLAM, HYPER_BEAM, FIRE_BLAST, THUNDERBOLT
db 60 db 60
dw EXEGGUTOR dw EXEGGUTOR
db MIRACLE_SEED db MIRACLE_SEED
db SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, STUN_SPORE dw SLEEP_POWDER, GIGA_DRAIN, PSYCHIC_M, STUN_SPORE
db 60 db 60
dw ARCANINE dw ARCANINE
db MINT_BERRY db MINT_BERRY
db FIRE_BLAST, EXTREMESPEED, BODY_SLAM, REST dw FIRE_BLAST, EXTREMESPEED, BODY_SLAM, REST
db 60 db 60
dw GYARADOS dw GYARADOS
db MYSTIC_WATER db MYSTIC_WATER
db HYDRO_PUMP, THUNDERBOLT, DOUBLE_EDGE, ROAR dw HYDRO_PUMP, THUNDERBOLT, DOUBLE_EDGE, ROAR
db 60 db 55 ; Lower-levelled because Oak ran out of the stolen gym Pokemon!
dw WEEZING dw WEEZING
db NO_ITEM db BERRY
db SLUDGE_BOMB, THUNDERBOLT, EXPLOSION, FIRE_BLAST dw SLUDGE_BOMB, THUNDERBOLT, EXPLOSION, FIRE_BLAST
db 60 db 55
dw GENGAR dw GENGAR
db NO_ITEM db BERRY
db HYPNOSIS, DREAM_EATER, SHADOW_BALL, EXPLOSION ; An inept set designed to illustrate that Impostor Oak isn't actually very competent. dw HYPNOSIS, DREAM_EATER, SHADOW_BALL, EXPLOSION ; An inept set designed to illustrate that Impostor Oak isn't actually very competent.
db -1 ; end db -1 ; end
end_list_items end_list_items
@ -406,27 +406,51 @@ AgathaGroup:
db 60 db 60
dw KITSEN dw KITSEN
db NO_ITEM db NO_ITEM
db HYPNOSIS, THIEF, NIGHTMARE, DESTINY_BOND ; rude dw HYPNOSIS, THIEF, NIGHTMARE, DESTINY_BOND ; rude
db 60 db 60
dw PRIMEAPE ; ANNIHILAPE dw PRIMEAPE ; ANNIHILAPE
db SCOPE_LENS ; hahahahaha db SCOPE_LENS ; hahahahaha
db CROSS_CHOP, ROCK_HEAD, SHADOW_BALL, FOCUS_ENERGY dw CROSS_CHOP, ROCK_HEAD, SHADOW_BALL, FOCUS_ENERGY
db 60 db 60
dw MAROWAK ; MAROWAKA dw MAROWAK ; MAROWAKA
db THICK_CLUB db THICK_CLUB
db EARTHQUAKE, BONEMERANG, SHADOW_BALL, SWORDS_DANCE dw EARTHQUAKE, BONEMERANG, SHADOW_BALL, SWORDS_DANCE
db 60 db 60
dw MISMAGIUS dw MISMAGIUS
db PRZCUREBERRY db PRZCUREBERRY
db THUNDERBOLT, PERISH_SONG, MEAN_LOOK, PROTECT ; also rude dw THUNDERBOLT, PERISH_SONG, MEAN_LOOK, PROTECT ; also rude
db 60 db 60
dw GENGAR dw GENGAR
db MAGNET ; psychic damage-reducing item? db MAGNET ; psychic damage-reducing item?
db CONFUSE_RAY, THUNDERBOLT, GIGA_DRAIN, PSYCHIC_M dw CONFUSE_RAY, THUNDERBOLT, GIGA_DRAIN, PSYCHIC_M
db 60 db 60
dw DOKUROAR dw DOKUROAR
db HARD_STONE db HARD_STONE
db ROCK_SLASH, SHADOW_BALL, EARTHQUAKE, HIDDEN_POWER ; HP Fighting dw ROCK_SLASH, SHADOW_BALL, EARTHQUAKE, HIDDEN_POWER ; HP Fighting
db -1 ; end
end_list_items
Giovanni1Group:
next_list_item
db "GIOVANNI@", TRAINERTYPE_MOVES
db 50
dw BEEDRILL
dw SWORDS_DANCE, TWINEEDLE, GIGA_DRAIN, SLUDGE_BOMB
db 50
dw HONCHKROW
dw FAINT_ATTACK, DRILL_PECK, NIGHT_SHADE, PURSUIT
db 50
dw NIDOKING
dw ICE_BEAM, EARTHQUAKE, ROCK_SLIDE, HORN_DRILL
db 50
dw NIDOQUEEN
dw THUNDERBOLT, EARTHQUAKE, BODY_SLAM, FIRE_BLAST
db 50
dw KANGASKHAN
dw BODY_SLAM, EARTHQUAKE, ENDURE, REVERSAL ; Oh the siren call of this strat...I should give it Attract to punish high-DV players, but it's just so fucking funny
db 50
dw PERSIAN
dw BITE, SLASH, THUNDERBOLT, HYPNOSIS ; Bite over Faint Attack because it has the same BP and flinches.
db -1 ; end db -1 ; end
end_list_items end_list_items
@ -438,27 +462,27 @@ LeaderGiovanniGroup: ; since he uses different sprites
db 60 db 60
dw GLIGAR ; GLISCOR dw GLIGAR ; GLISCOR
db SHARP_BEAK db SHARP_BEAK
db EARTHQUAKE, WING_ATTACK, SWORDS_DANCE, SANDSTORM dw EARTHQUAKE, WING_ATTACK, SWORDS_DANCE, SANDSTORM
db 60 db 60
dw DONPHAN ; TRAMPEL dw DONPHAN ; TRAMPEL
db LEFTOVERS db LEFTOVERS
db BELLY_DRUM, EARTHQUAKE, BODY_SLAM, ROCK_SLIDE dw BELLY_DRUM, EARTHQUAKE, BODY_SLAM, ROCK_SLIDE
db 60 db 60
dw NIDOQUEEN dw NIDOQUEEN
db MYSTIC_WATER db MYSTIC_WATER
db SURF, FIRE_BLAST, EARTHQUAKE, BODY_SLAM dw SURF, FIRE_BLAST, EARTHQUAKE, BODY_SLAM
db 60 db 60
dw MAROWAK ; GUARDIA dw MAROWAK ; GUARDIA
db THICK_CLUB db THICK_CLUB
db SWORDS_DANCE, EARTHQUAKE, BONEMERANG, BODY_SLAM dw SWORDS_DANCE, EARTHQUAKE, BONEMERANG, BODY_SLAM
db 60 db 60
dw NIDOKING dw NIDOKING
db NEVERMELTICE db NEVERMELTICE
db THUNDERBOLT, ICE_BEAM, EARTHQUAKE, BODY_SLAM dw THUNDERBOLT, ICE_BEAM, EARTHQUAKE, BODY_SLAM
db 60 db 60
dw RHYDON ; RHYPERIOR dw RHYDON ; RHYPERIOR
db SOFT_SAND db SOFT_SAND
db EARTHQUAKE, ROCK_SLIDE, BODY_SLAM, ROAR dw EARTHQUAKE, ROCK_SLIDE, BODY_SLAM, ROAR
db -1 ; end db -1 ; end
end_list_items end_list_items
@ -468,27 +492,27 @@ GreenGroup:
db 60 db 60
dw HITMONCHAN dw HITMONCHAN
db MIRACLEBERRY db MIRACLEBERRY
db MACH_PUNCH, MIND_READER, DYNAMICPUNCH, PURSUIT dw MACH_PUNCH, MIND_READER, DYNAMICPUNCH, PURSUIT
db 60 db 60
dw JOLTEON dw JOLTEON
db MINT_BERRY db MINT_BERRY
db THUNDERBOLT, REST, DOUBLE_KICK, THUNDER_WAVE dw THUNDERBOLT, REST, DOUBLE_KICK, THUNDER_WAVE
db 60 db 60
dw LAPRAS dw LAPRAS
db MYSTIC_WATER db MYSTIC_WATER
db THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY dw THUNDERBOLT, ICE_BEAM, SURF, CONFUSE_RAY
db 60 db 60
dw AERODACTYL dw AERODACTYL
db BURNT_BERRY db BURNT_BERRY
db ROCK_HEAD, WING_ATTACK, FIRE_BLAST, EARTHQUAKE dw ROCK_HEAD, WING_ATTACK, FIRE_BLAST, EARTHQUAKE
db 60 db 60
dw GYARADOS dw GYARADOS
db NO_ITEM ; electric damage-reducing item db NO_ITEM ; electric damage-reducing item
db THUNDERBOLT, HYDRO_PUMP, TWISTER, ICE_BEAM dw THUNDERBOLT, HYDRO_PUMP, TWISTER, ICE_BEAM
db 60 db 60
dw VENUSAUR dw VENUSAUR
db MIRACLE_SEED db MIRACLE_SEED
db GIGA_DRAIN, SLUDGE_BOMB, SWORDS_DANCE, BODY_SLAM dw GIGA_DRAIN, SLUDGE_BOMB, SWORDS_DANCE, BODY_SLAM
db -1 ; end db -1 ; end
end_list_items end_list_items
@ -499,22 +523,152 @@ KurtGroup:
db "KURT@", TRAINERTYPE_MOVES db "KURT@", TRAINERTYPE_MOVES
db 50 db 50
dw PARASECT dw PARASECT
db SPORE, GIGA_DRAIN, SLASH, ROCK_SLASH dw SPORE, GIGA_DRAIN, SLASH, ROCK_SLASH
db 50 db 50
dw SANDSLASH dw SANDSLASH
db SWORDS_DANCE, EARTHQUAKE, ROCK_SLIDE, BODY_SLAM dw SWORDS_DANCE, EARTHQUAKE, ROCK_SLIDE, BODY_SLAM
db 50 db 50
dw BELLOSSOM dw BELLOSSOM
db SLEEP_POWDER, GROWTH, PETAL_DANCE, SYNTHESIS dw SLEEP_POWDER, GROWTH, PETAL_DANCE, SYNTHESIS
db 50 db 50
dw MUK dw MUK
db SLUDGE_BOMB, EXPLOSION, FIRE_BLAST, THUNDERBOLT dw SLUDGE_BOMB, EXPLOSION, FIRE_BLAST, THUNDERBOLT
db 50 db 50
dw GRANBULL dw GRANBULL
db HEAL_BELL, TAKE_DOWN, CURSE, SHADOW_BALL dw HEAL_BELL, TAKE_DOWN, CURSE, SHADOW_BALL
db 50 db 50
dw SLOWBRO dw SLOWBRO
db SURF, PSYCHIC_M, ICE_BEAM, EARTHQUAKE dw SURF, PSYCHIC_M, ICE_BEAM, EARTHQUAKE
db -1 ; end db -1 ; end
end_list_items end_list_items
ArianaGroup:
next_list_item
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw ARBOK
db 30
dw HONCHKROW
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw HONCHKROW
db 30
dw SNEASEL
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw MUK
db 30
dw HONCHKROW
db 30
dw SNEASEL
db -1 ; end
db "ARIANA@", TRAINERTYPE_NORMAL
db 30
dw BELLEDAM
db 30
dw ARBOK
db 30
dw VILEPLUME
db 30
dw HONCHKROW
db 30
dw SNEASEL
db 30
dw JUNGELA
db -1 ; end
end_list_items
ArcherGroup:
next_list_item
db "ARCHER@", TRAINERTYPE_NORMAL
db 30
dw ELECTRODE
db 30
dw MAGMAR
db 30
dw GOLBAT
db 30
dw HOUNDOOM
db -1 ; end
db "ARCHER@", TRAINERTYPE_NORMAL
db 30
dw ELECTRODE
db 30
dw MAGMORTAR
db 30
dw GOLBAT
db 30
dw WEEZING
db 30
dw HOUNDOOM
db -1 ; end
db "ARCHER@", TRAINERTYPE_NORMAL
db 30
dw ELECTRODE
db 30
dw MAGMORTAR
db 30
dw GOLBAT
db 30
dw WEEZING
db 30
dw PILOSWINE ; MAMOSWINE
db 30
dw HOUNDOOM
db -1 ; end
end_list_items
ProfBlueGroup:
next_list_item
db "BLUE@", TRAINERTYPE_ITEM_MOVES
db 70
dw UMBREON
db LEFTOVERS
dw MEAN_LOOK, BATON_PASS, MOONLIGHT, CURSE
db 70
dw HERACROSS
db BLACKBELT_I
dw ENDURE, REVERSAL, MEGAHORN, FLAIL
db 70
dw TYRANITAR
db HARD_STONE
dw EARTHQUAKE, ROCK_SLASH, PURSUIT, ICE_BEAM
db 70
dw ARCANINE
db MIRACLEBERRY
dw FIRE_BLAST, EXTREMESPEED, BODY_SLAM, CRUNCH
db 70
dw BLASTOISE
db MYSTIC_WATER
dw HYDRO_PUMP, ICE_BEAM, MIRROR_COAT, EARTHQUAKE
db 70
dw ELECTIVIRE
db MAGNET
dw THUNDERBOLT, CROSS_CHOP, EARTHQUAKE, THIEF
db -1 ; end
end_list_items

4
data/trainers/party_pointers.asm
View file

@ -87,7 +87,11 @@ TrainerGroups:
dba XXXGroup dba XXXGroup
dba ImposterOakGroup dba ImposterOakGroup
dba AgathaGroup dba AgathaGroup
dba Giovanni1Group
dba LeaderGiovanniGroup dba LeaderGiovanniGroup
dba GreenGroup dba GreenGroup
dba KurtGroup dba KurtGroup
dba ArianaGroup
dba ArcherGroup
dba ProfBlueGroup
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

4
data/trainers/pic_pointers.asm
View file

@ -87,7 +87,11 @@ TrainerPicPointers::
dba SouthGuyPic dba SouthGuyPic
dba ImposterOakPic dba ImposterOakPic
dba AgathaPic dba AgathaPic
dba Giovanni1Pic
dba Giovanni3Pic dba Giovanni3Pic
dba GreenPic dba GreenPic
dba KurtPic dba KurtPic
dba ArianaPic
dba ArcherPic
dba ProfBluePic
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

4
data/trainers/sprites.asm
View file

@ -85,7 +85,11 @@ BTTrainerClassSprites:
db SPRITE_RED ; South Guy Placeholder db SPRITE_RED ; South Guy Placeholder
db SPRITE_RED ; Imposter Oak Placeholder db SPRITE_RED ; Imposter Oak Placeholder
db SPRITE_RED ; Agatha Placeholder db SPRITE_RED ; Agatha Placeholder
db SPRITE_RED ; Giovanni1 Placeholder
db SPRITE_RED ; Giovanni3 Placeholder db SPRITE_RED ; Giovanni3 Placeholder
db SPRITE_RED ; Green Placeholder db SPRITE_RED ; Green Placeholder
db SPRITE_RED ; Kurt Placeholder db SPRITE_RED ; Kurt Placeholder
db SPRITE_RED ; Ariana
db SPRITE_RED ; Archer
db SPRITE_RED ; Prof.Blue
assert_table_length NUM_TRAINER_CLASSES assert_table_length NUM_TRAINER_CLASSES

6
gfx/pics.asm
View file

@ -1036,8 +1036,12 @@ TogekissBackpic: INCBIN "gfx/pokemon/togekiss/back.2bpp.lz"
WalkerPic: INCBIN "gfx/trainers/walker.2bpp.lz" WalkerPic: INCBIN "gfx/trainers/walker.2bpp.lz"
LoreleiPic: INCBIN "gfx/trainers/lorelei.2bpp.lz" LoreleiPic: INCBIN "gfx/trainers/lorelei.2bpp.lz"
SouthGuyPic: INCBIN "gfx/trainers/southguy.2bpp.lz" SouthGuyPic: INCBIN "gfx/trainers/southguy.2bpp.lz"
ImposterOakPic: INCBIN "gfx/trainers/imposteroak.2bpp.lz" ImposterOakPic: INCBIN "gfx/trainers/imposter_oak.2bpp.lz"
AgathaPic: INCBIN "gfx/trainers/agatha.2bpp.lz" AgathaPic: INCBIN "gfx/trainers/agatha.2bpp.lz"
Giovanni1Pic: INCBIN "gfx/trainers/giovanni_coat.2bpp.lz"
Giovanni3Pic: INCBIN "gfx/trainers/giovanni3.2bpp.lz" Giovanni3Pic: INCBIN "gfx/trainers/giovanni3.2bpp.lz"
GreenPic: INCBIN "gfx/trainers/green.2bpp.lz" GreenPic: INCBIN "gfx/trainers/green.2bpp.lz"
KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz" KurtPic: INCBIN "gfx/trainers/kurt.2bpp.lz"
ArianaPic: INCBIN "gfx/trainers/ariana.2bpp.lz"
ArcherPic: INCBIN "gfx/trainers/archer.2bpp.lz"
ProfBluePic: INCBIN "gfx/trainers/blue_professor.2bpp.lz"

BIN
gfx/player/chris.gbcpal Normal file
View file

Binary file not shown.

BIN
gfx/player/chris.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 997 B

BIN
gfx/trainers/archer.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
gfx/trainers/ariana.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 410 B

BIN
gfx/trainers/blue_professor.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
gfx/trainers/cal.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 944 B

After

Width:  |  Height:  |  Size: 453 B

BIN
gfx/trainers/giovanni.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
gfx/trainers/giovanni3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 386 B

After

Width:  |  Height:  |  Size: 423 B

BIN
gfx/trainers/giovanni_coat.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 460 B

BIN
gfx/trainers/green.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 430 B

After

Width:  |  Height:  |  Size: 426 B

BIN
gfx/trainers/imposter_oak.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 519 B

BIN
gfx/trainers/imposteroak.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 430 B

BIN
gfx/trainers/impostor_oak.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 18 KiB

25
maps/DebugRoom.asm
View file

@ -198,6 +198,29 @@ DebugTextE:
line "many items!" line "many items!"
done done
TrainerTestScript:
faceplayer
opentext
writetext TrainerTestAsk
yesorno
iffalse .end
winlosstext TrainerTestScript_BeatenText, 0
loadtrainer ARCHER, ARCHER1
startbattle
reloadmapafterbattle
.end
closetext
end
TrainerTestAsk:
text "Would you like to"
line "test the TRAINER?"
done
TrainerTestScript_BeatenText:
text "Test complete!"
done
DebugRoom_MapEvents: DebugRoom_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
@ -228,4 +251,4 @@ DebugRoom_MapEvents:
object_event 17, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugFlyScript, -1 object_event 17, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugFlyScript, -1
object_event 16, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugDexScript, -1 object_event 16, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugDexScript, -1
object_event 19, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugItemScript, -1 object_event 19, 13, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_OW_PURPLE, OBJECTTYPE_SCRIPT, 0, DebugItemScript, -1
object_event 18, 13, SPRITE_NURSE, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, HoneyGrannyScript, -1 object_event 18, 13, SPRITE_SAFARI_ZONE_WORKER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TrainerTestScript, -1