mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
Merge branch 'master' into mistress
This commit is contained in:
Thorn Avery
commit
644abf1f2b
|
|
@ -385,12 +385,12 @@ If you use our implementations of anything at all, it is encouraged to submit Pu
|
|||
* FrenchOrange - Reconstructions of various overworld prototype sprites.
|
||||
* Helix Chamber (RacieBeep & Orchid) - Prototype Pokémon sprites. Precise credits are available [here](https://cdn.discordapp.com/attachments/1014321591657709569/1015347305483878521/unknown.png) and below.
|
||||
* Vortiene/Vortyne - Reused a bit of code from their pureRGB hack, including their Trainer AI, move animations and Pokedex stats page. Assisted in bug fixes. Used their sprite sheet generator.
|
||||
* wrulfy - Reused a bit of code from their Carmine Red hack to improve a handful of move animations, most notably Drill Peck and Horn Drill. Technical advice.
|
||||
* Pigu-A, RevoSucks, walle303 - Contributors to Pokemon Anniversary Red's repository, where we reused the Green/FemC sprites and the Battle Tent.
|
||||
* Rangi - Reused a bit of code from their Red* / Blue* hack to make HMs usable in the overworld, and generally being an amazing individual.
|
||||
* BGVC - Composed the original 4-channel version of the unused Koukan (trading) music.
|
||||
* Rainbow Metal Pigeon - Bug fix relating to Gym Leader rematches.
|
||||
* SatoMew - Technical advice.
|
||||
* wrulfy - Technical advice.
|
||||
* suloku - Technical advice regarding setting where you spawn after beating the Elite Four, Exp. All modernisation code
|
||||
* 大吟醸 (Daiginjo) - Assistance in translating the Tamamushi University Student Book, allowing for an accurate adaptation of the location.
|
||||
* Molk - Balancing of some prototype Pokemon, most notably Ramoose.
|
||||
|
|
|
|||
|
|
@ -144,6 +144,7 @@ DEF FIRST_SE_ID EQU const_value
|
|||
const SUBANIM_0_PIN_JAB
|
||||
const SUBANIM_0_PIN_MISSILE
|
||||
const SUBANIM_0_BARB_JAB
|
||||
const SUBANIM_DRILL_ROTATE
|
||||
DEF NUM_SUBANIMS EQU const_value
|
||||
|
||||
; types of subanimations
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ SubanimationPointers:
|
|||
dw Subanim_0PinJab
|
||||
dw Subanim_0PinMissile
|
||||
dw Subanim_0BarbJab
|
||||
dw Subanim_DrillRotate
|
||||
assert_table_length NUM_SUBANIMS
|
||||
|
||||
; format:
|
||||
|
|
@ -1023,4 +1024,13 @@ Subanim_0BarbJab:
|
|||
db FRAMEBLOCK_6D, BASECOORD_23, FRAMEBLOCKMODE_02
|
||||
db FRAMEBLOCK_6D, BASECOORD_21, FRAMEBLOCKMODE_02
|
||||
|
||||
|
||||
Subanim_DrillRotate:
|
||||
subanim SUBANIMTYPE_HFLIP, 8
|
||||
db FRAMEBLOCK_30, BASECOORD_11, FRAMEBLOCKMODE_00
|
||||
db FRAMEBLOCK_30, BASECOORD_19, FRAMEBLOCKMODE_00
|
||||
db FRAMEBLOCK_30, BASECOORD_1D, FRAMEBLOCKMODE_00
|
||||
db FRAMEBLOCK_30, BASECOORD_17, FRAMEBLOCKMODE_00
|
||||
db FRAMEBLOCK_30, BASECOORD_11, FRAMEBLOCKMODE_00
|
||||
db FRAMEBLOCK_30, BASECOORD_19, FRAMEBLOCKMODE_00
|
||||
db FRAMEBLOCK_30, BASECOORD_1D, FRAMEBLOCKMODE_00
|
||||
db FRAMEBLOCK_30, BASECOORD_17, FRAMEBLOCKMODE_00
|
||||
|
|
|
|||
|
|
@ -261,8 +261,7 @@ PoundAnim:
|
|||
db -1 ; end
|
||||
|
||||
StruggleAnim:
|
||||
battle_anim AMNESIA, SE_SHAKE_BACK_AND_FORTH
|
||||
battle_anim NO_MOVE, SE_RESET_MON_POSITION
|
||||
battle_anim SPLASH, SE_BOUNCE_UP_AND_DOWN
|
||||
battle_anim POUND, SUBANIM_0_STAR_TWICE, 0, 8
|
||||
db -1 ; end
|
||||
|
||||
|
|
@ -376,7 +375,9 @@ BindAnim:
|
|||
db -1 ; end
|
||||
|
||||
SlamAnim:
|
||||
battle_anim SLAM, SUBANIM_0_STAR_THRICE, 0, 6
|
||||
battle_anim SLAM, SE_MOVE_MON_HORIZONTALLY
|
||||
battle_anim NO_MOVE, SE_RESET_MON_POSITION
|
||||
battle_anim NO_MOVE, SUBANIM_0_STAR_THRICE, 0, 6
|
||||
db -1 ; end
|
||||
|
||||
VineWhipAnim:
|
||||
|
|
@ -394,18 +395,21 @@ DoubleKickAnim:
|
|||
db -1 ; end
|
||||
|
||||
MegaKickAnim:
|
||||
battle_anim NO_MOVE, SE_DARK_SCREEN_PALETTE
|
||||
battle_anim MEGA_KICK, SUBANIM_1_STAR_BIG_MOVING, 1, 6
|
||||
battle_anim LEECH_SEED, SE_SLIDE_MON_HALF_OFF
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_MOVE_MON_HORIZONTALLY
|
||||
battle_anim NO_MOVE, SE_RESET_MON_POSITION
|
||||
battle_anim MEGA_KICK, SUBANIM_1_STAR_BIG_MOVING, 1, 8
|
||||
battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
db -1 ; end
|
||||
|
||||
JumpKickAnim:
|
||||
battle_anim NO_MOVE, SE_SLIDE_MON_DOWN
|
||||
battle_anim BUBBLE, SE_SHOW_MON_PIC
|
||||
battle_anim MEDITATE, SE_SLIDE_MON_DOWN
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim JUMP_KICK, SUBANIM_0_STAR_ASCENDING, 0, 8
|
||||
battle_anim NO_MOVE, SE_SHOW_MON_PIC
|
||||
battle_anim NO_MOVE, SE_MOVE_MON_HORIZONTALLY
|
||||
battle_anim JUMP_KICK, SUBANIM_0_STAR_ASCENDING, 0, 6
|
||||
battle_anim NO_MOVE, SE_RESET_MON_POSITION
|
||||
db -1 ; end
|
||||
|
||||
RollingKickAnim:
|
||||
|
|
@ -435,11 +439,13 @@ FuryAttackAnim:
|
|||
db -1 ; end
|
||||
|
||||
HornDrillAnim:
|
||||
battle_anim HORN_DRILL, SUBANIM_1_STAR_BIG, 1, 2
|
||||
battle_anim NO_MOVE, SUBANIM_1_STAR_BIG, 1, 2
|
||||
battle_anim NO_MOVE, SUBANIM_1_STAR_BIG, 1, 2
|
||||
battle_anim NO_MOVE, SUBANIM_1_STAR_BIG, 1, 2
|
||||
battle_anim NO_MOVE, SUBANIM_1_STAR_BIG, 1, 2
|
||||
battle_anim EXPLOSION, SE_DARK_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SE_MOVE_MON_HORIZONTALLY
|
||||
battle_anim HORN_DRILL, SUBANIM_DRILL_ROTATE, 0, 1
|
||||
battle_anim HORN_DRILL, SUBANIM_DRILL_ROTATE, 0, 2
|
||||
battle_anim HORN_DRILL, SUBANIM_DRILL_ROTATE, 0, 3
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SE_RESET_MON_POSITION
|
||||
db -1 ; end
|
||||
|
||||
TackleAnim:
|
||||
|
|
@ -550,7 +556,9 @@ SingAnim:
|
|||
db -1 ; end
|
||||
|
||||
SupersonicAnim:
|
||||
battle_anim SUPERSONIC, SUBANIM_0_SOUND_WAVE, 0, 6
|
||||
battle_anim SUPERSONIC, SUBANIM_0_SOUND_WAVE, 0, 4
|
||||
battle_anim AMNESIA, SUBANIM_0_BIRDIES_CIRCLING_ENEMY, 0, 2
|
||||
battle_anim AMNESIA, SUBANIM_0_BIRDIES_CIRCLING_ENEMY, 0, 4
|
||||
db -1 ; end
|
||||
|
||||
SonicBoomAnim:
|
||||
|
|
@ -647,8 +655,9 @@ AuroraBeamAnim:
|
|||
HyperBeamAnim:
|
||||
battle_anim LEECH_SEED, SE_DARK_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD
|
||||
battle_anim HYPER_BEAM, SUBANIM_0_BEAM, 0, 2
|
||||
battle_anim HYPER_BEAM, SUBANIM_0_BEAM, 0, 4
|
||||
battle_anim NO_MOVE, SUBANIM_1_STAR_BIG_MOVING, 1, 6
|
||||
battle_anim NO_MOVE, SE_SHAKE_SCREEN
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
db -1 ; end
|
||||
|
||||
|
|
@ -657,7 +666,8 @@ PeckAnim:
|
|||
db -1 ; end
|
||||
|
||||
DrillPeckAnim:
|
||||
battle_anim DRILL_PECK, SUBANIM_1_STAR_BIG_MOVING, 1, 6
|
||||
battle_anim DRILL_PECK, SUBANIM_DRILL_ROTATE, 0, 3
|
||||
battle_anim DRILL_PECK, SUBANIM_DRILL_ROTATE, 0, 3
|
||||
db -1 ; end
|
||||
|
||||
SubmissionAnim:
|
||||
|
|
@ -757,8 +767,12 @@ RazorLeafAnim:
|
|||
db -1 ; end
|
||||
|
||||
SolarBeamAnim:
|
||||
battle_anim GROWTH, SE_LIGHT_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SE_SPIRAL_BALLS_INWARD
|
||||
battle_anim SOLARBEAM, SUBANIM_0_BEAM, 0, 6
|
||||
battle_anim NO_MOVE, SUBANIM_0_STAR_TWICE, 0, 6
|
||||
battle_anim NO_MOVE, SUBANIM_1_STAR_BIG_MOVING, 1, 6
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
db -1 ; end
|
||||
|
||||
PoisonPowderAnim:
|
||||
|
|
@ -960,9 +974,6 @@ SmokeScreenAnim:
|
|||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DARKEN_MON_PALETTE
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
|
|
@ -971,6 +982,8 @@ SmokeScreenAnim:
|
|||
ConfuseRayAnim:
|
||||
battle_anim CONFUSE_RAY, SE_DARK_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SUBANIM_1_STAR_BIG_TOSS, 1, 6
|
||||
battle_anim AMNESIA, SUBANIM_0_BIRDIES_CIRCLING_ENEMY, 0, 2
|
||||
battle_anim AMNESIA, SUBANIM_0_BIRDIES_CIRCLING_ENEMY, 0, 4
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
db -1 ; end
|
||||
|
||||
|
|
@ -1094,7 +1107,10 @@ SwiftAnim:
|
|||
db -1 ; end
|
||||
|
||||
SkullBashAnim:
|
||||
battle_anim SKULL_BASH, SUBANIM_1_STAR_BIG, 1, 6
|
||||
battle_anim TACKLE, SE_MOVE_MON_HORIZONTALLY
|
||||
battle_anim SKULL_BASH, SUBANIM_1_STAR_BIG_MOVING, 1, 6
|
||||
battle_anim NO_MOVE, SE_SHAKE_SCREEN
|
||||
battle_anim NO_MOVE, SE_RESET_MON_POSITION
|
||||
db -1 ; end
|
||||
|
||||
SpikeCannonAnim:
|
||||
|
|
@ -1136,7 +1152,6 @@ HiJumpKickAnim:
|
|||
battle_anim HI_JUMP_KICK, SE_SHOOT_BALLS_UPWARD
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim TAKE_DOWN, SUBANIM_0_STAR_ASCENDING, 0, 8
|
||||
battle_anim NO_MOVE, SE_DARK_SCREEN_FLASH
|
||||
battle_anim NO_MOVE, SE_SLIDE_MON_DOWN
|
||||
|
|
@ -1217,8 +1232,10 @@ FlashAnim:
|
|||
|
||||
DazzleGleamAnim:
|
||||
battle_anim GLARE, SE_DARK_SCREEN_FLASH
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim DOUBLE_TEAM, SE_WAVY_SCREEN
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
db -1 ; end
|
||||
|
||||
PsywaveAnim:
|
||||
|
|
@ -1231,7 +1248,12 @@ SplashAnim:
|
|||
db -1 ; end
|
||||
|
||||
AcidArmorAnim:
|
||||
battle_anim ACID_ARMOR, SE_SLIDE_MON_DOWN_AND_HIDE
|
||||
battle_anim ACID_ARMOR, SE_SLIDE_MON_DOWN
|
||||
battle_anim NO_MOVE, SE_DELAY_ANIMATION_10
|
||||
battle_anim NO_MOVE, SE_LIGHT_SCREEN_PALETTE
|
||||
battle_anim HARDEN, SUBANIM_1_BARRIER, 1, 4
|
||||
battle_anim NO_MOVE, SE_RESET_SCREEN_PALETTE
|
||||
battle_anim NO_MOVE, SE_SHOW_MON_PIC
|
||||
db -1 ; end
|
||||
|
||||
CrabHammerAnim:
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
EscapeRopeTilesets:
|
||||
db FOREST
|
||||
db SHIP
|
||||
db CEMETERY
|
||||
db CAVERN
|
||||
db FACILITY
|
||||
|
|
|
|||
|
|
@ -159,7 +159,7 @@ SailorData:
|
|||
; Vermilion Gym
|
||||
db 21, KOTORA, GAOTORA, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 58, KINGDRA, MACHAMP, GOROCHU, STARMIE, POLIWRATH, TENTACRUEL, 0
|
||||
db 58, CROAKOZUNA, MACHAMP, GOROCHU, STARMIE, POLIWRATH, TENTACRUEL, 0
|
||||
|
||||
; One of the most varied trainers in the game. No criticisms.
|
||||
JrTrainerMData:
|
||||
|
|
@ -232,11 +232,11 @@ PokemaniacData:
|
|||
db 22, CHARMANDER, CUBONE, 0
|
||||
db 23, GAVILLAIN, 0
|
||||
; Victory Road 2F
|
||||
db 40, MINISTARE, LAPRAS, LICKILICKY, RHYDON, 0
|
||||
db 47, MINISTARE, LAPRAS, LICKILICKY, RHYDON, 0
|
||||
; Rock Tunnel 1F
|
||||
db 23, CUBONE, SLOWPOKE, 0
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
db 57, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYPERIOR, 0
|
||||
db 57, GUARDIA, SLOWKING, CHARIZARD, STEELIX, LICKILICKY, RHYDON, 0
|
||||
|
||||
; The Super Nerd has some weird choices, but I think they're mostly inorganic Pokemon, except for Fire-types that the Cinnabar Gym Trainers use.
|
||||
SuperNerdData:
|
||||
|
|
@ -248,16 +248,19 @@ SuperNerdData:
|
|||
db 20, GRIMER, KOFFING, KOFFING, MAGNEMITE, 0
|
||||
db 22, VOLTORB, KOFFING, MAGNETITE, 0
|
||||
db 26, ELECTRODE, 0
|
||||
; Unused - both now used in Celadon University
|
||||
; Celadon University
|
||||
db 30, PORYGON, 0 ;
|
||||
db 25, GRIMER, KOFFING, KABUTO, OMANYTE, 0 ;
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
db 57, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0
|
||||
db 57, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGON2, 0
|
||||
; Cinnabar Gym
|
||||
db 36, VULPIX, NINETALES, CHARIZARD, 0
|
||||
db 34, PONYTA, CHARMANDER, RAPIDASH, ARCANINE, 0
|
||||
db 41, FLAREON, 0
|
||||
db 37, CHARMELEON, MAGMAR, 0
|
||||
; Celadon University
|
||||
db 48, PORYGON2, 0 ;
|
||||
db 42, MUK, WEEZING, KABUTOPS, OMASTAR, AERODACTYL, 0 ;
|
||||
|
||||
; Expanding the Hiker's cast is hard, as Rock-types are actually quite limited.
|
||||
; Machop is more of an exception and not the rule, it's just "strong".
|
||||
|
|
@ -324,7 +327,7 @@ BikerData:
|
|||
; Fire specialist
|
||||
BurglarData:
|
||||
; Silph Gauntlet 4F (Lavender Tower)
|
||||
db 59, RAPIDASH, CROAKOZUNA, ARCANINE, PERSIAN_A, WEEZING, MAGMORTAR, 0
|
||||
db 59, RAPIDASH, CROAKOZUNA, ARCANINE, UMBREON, WEEZING_G, MAGMORTAR, 0
|
||||
; Unused
|
||||
db 33, GROWLITHE, 0
|
||||
db 28, VULPIX, CHARMANDER, PONYTA, 0
|
||||
|
|
@ -341,13 +344,15 @@ BurglarData:
|
|||
|
||||
; Electric dude with little variety due to not being seen often
|
||||
EngineerData:
|
||||
; Unused - used in celadon university
|
||||
; Celadon University
|
||||
db 36, GOLEM, 0
|
||||
; Route 11
|
||||
db 21, KOTORA, VOLTORB, 0
|
||||
db 18, MAGNEMITE, MAGNEMITE, PIKACHU, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 58, ELECTRODE, SANDSLASH_A, ELECTIVIRE, GOROTORA, PERRSERKER, SCIZOR, 0 ; The Engineer trainer EXCLUSIVELY uses Magnemites and Voltorbs in normal battles, so I kinda had to improvise with his team a bit...
|
||||
; Celadon University
|
||||
db 52, GOLEM_A, 0
|
||||
|
||||
; Super Rod encounter showcase, basically
|
||||
FisherData:
|
||||
|
|
@ -368,9 +373,9 @@ FisherData:
|
|||
; Route 12
|
||||
db 24, BLASTYKE, WIGLETT, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 58, GYARADOS, SEAKING, DISTURBAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0
|
||||
db 58, SEAKING, DISTURBAN, WUGTRIO, KINGLER, PENDRAKEN, GYARADOS, 0
|
||||
; Brunswick Trail
|
||||
db 57, POLIWRATH, MACHAMP, GOROTORA, PENDRAKEN, TAUROS_PA, 0
|
||||
db 57, POLIWRATH, DISTURBAN, JABETTA, PENDRAKEN, TAUROS_PA, 0
|
||||
|
||||
; God this took forever to remove repeats from
|
||||
; Surf encounter extravaganza
|
||||
|
|
@ -395,7 +400,7 @@ SwimmerData:
|
|||
db 33, BLASTYKE, STARYU, WARTORTLE, 0
|
||||
db 32, POLIWHIRL, TENTACOOL, GOLDUCK, 0
|
||||
; Silph Gauntlet 5F (Safari Zone)
|
||||
db 60, LAPRAS, KINGDRA, CLOYSTER, GOLDUCK, POLIWRATH, TENTACRUEL, 0
|
||||
db 60, LAPRAS, PENDRAKEN, CLOYSTER, GOLDUCK, POLIWRATH, VAPOREON, 0
|
||||
|
||||
; Fighting specialist, very odd.
|
||||
CueBallData:
|
||||
|
|
@ -424,7 +429,7 @@ GamblerData:
|
|||
; Route 8
|
||||
db 22, POLIWAG, RIBBITO, POLIWHIRL, 0
|
||||
; Silph Gauntlet 4F (Lavender Tower)
|
||||
db 59, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0
|
||||
db 59, SEAKING, RHYDON, CACTORMUS, DEWGONG, GOLEM, POLITOED, 0
|
||||
; Route 8
|
||||
db 24, CACTORMUS, 0 ; This was a repeat of Growlithe/Vulpix, so I made it a Game Corner prize instead.
|
||||
|
||||
|
|
@ -447,7 +452,7 @@ BeautyData:
|
|||
db 29, PERSIAN, 0 ; it doesn't have slash until like L47 trust me it's fine
|
||||
db 29, BULBASAUR, IVYSAUR, 0
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
db 57, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
|
||||
db 57, PERSIAN_A, VICTREEBEL, WIGGLYTUFF, SHARPOON, CLOYSTER, SYLVEON, 0
|
||||
; Route 19
|
||||
db 27, POLIWAG, GOLDEEN, SEAKING, 0
|
||||
db 30, BLASTYKE, GOLDUCK, 0
|
||||
|
|
@ -456,9 +461,10 @@ BeautyData:
|
|||
db 30, KINGDRA, 0 ; Close to the Trader
|
||||
; Brunswick Trail
|
||||
db 58, PERSIAN, VENUSAUR, KINGDRA, SYLVEON, CLOYSTER, 0
|
||||
; Celeste Hill?
|
||||
db 60, MR_MIME, WIGGLYTUFF, NINETALES_A, PENDRAKEN, 0 ; Mina
|
||||
; Celeste Hill
|
||||
db 60, BALUMBA, NINETALES_A, PENDRAKEN, SYLVEON, 0 ; Mina
|
||||
db 62, PERSIAN, PERSIAN_A, PERRSERKER, 0 ; Selphy
|
||||
; Brunswick Trail
|
||||
db 63, MUK, ARBOK, VILEPLUME, 0 ; Ariana
|
||||
|
||||
; yep psychic yep psychic yep psychic
|
||||
|
|
@ -478,23 +484,23 @@ RockerData:
|
|||
; Route 12
|
||||
db 29, VOLTORB, ELECTRODE, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 58, GAVILLAIN, ELECTRODE, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0
|
||||
db 58, GAVILLAIN, GAWARHED, MAGNEZONE, GOLEM_A, GOROCHU, JOLTEON, 0
|
||||
|
||||
; Psychic, Poison, and a little bit of Voltorb.
|
||||
JugglerData:
|
||||
; Silph Co. 5F
|
||||
db 29, ELECTRODE, KADABRA, MR_MIME, 0
|
||||
; Victory Road 2F
|
||||
db 41, DROWZEE, HYPNO, ESPEON, KADABRA, 0
|
||||
db 45, ESPEON, UMBREON, HYPNO, MR_MIME, 0
|
||||
; Fuchsia Gym
|
||||
db 31, BEEDRILL, HAUNTER, VILEPLUME, 0
|
||||
db 34, GOLBAT, TENTACRUEL, 0
|
||||
; Victory Road 2F
|
||||
db 48, ELECTRODE, HYPNO, MR_MIME, 0 ; buffed roster
|
||||
; Silph Gauntlet 5F (Safari Zone)
|
||||
db 60, HYPNO, MR_MIME, ALAKAZAM, ELECTRODE, VICTREEBEL, SLOWKING_G, 0
|
||||
db 60, TENTACRUEL, MR_MIME, ALAKAZAM, ELECTRODE, BELLIGNAN, SLOWKING_G, 0
|
||||
; Fuchsia Gym
|
||||
db 38, UMBREON, 0
|
||||
db 36, UMBREON, 0
|
||||
; Fuchsia Gym
|
||||
db 34, WEEPINBELL, BELLIGNAN, 0
|
||||
|
||||
|
|
@ -509,9 +515,9 @@ TamerData:
|
|||
db 43, RHYDON, 0
|
||||
db 39, SANDSLASH, TRAMPEL, 0
|
||||
; Victory Road 2F
|
||||
db 44, KANGASKHAN, TAUROS, GOLDUCK, PRIMEAPE, 0
|
||||
db 47, KANGASKHAN, TAUROS, GOLDUCK, PRIMEAPE, 0
|
||||
; Silph Gauntlet 5F (Safari Zone)
|
||||
db 60, RHYPERIOR, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, TAUROS, 0
|
||||
db 60, TAUROS, ARBOK, KANGASKHAN, ANNIHILAPE, TRAMPEL, KANGASKHAN, 0
|
||||
|
||||
; yep bird yep bird yep bird yep bird
|
||||
; If nothing else, just make them less agonising to fight.
|
||||
|
|
@ -556,21 +562,14 @@ BlackbeltData:
|
|||
db 43, GUARDIA, 0
|
||||
db 38, CACTORMUS, DUGTRIO, STEELIX, 0
|
||||
; Victory Road 2F
|
||||
db 43, MACHOKE, MACHOP, MACHOKE, 0
|
||||
db 46, POLIWRATH, MACHOKE, HITMONTOP, 0
|
||||
; Silph Gauntlet 2F (Mt. Moon)
|
||||
db 63, HITMONTOP, JABETTA, GORILLAIMO, POLIWRATH, CARAPTHOR, MACHAMP, 0
|
||||
|
||||
; Uses Silph products and Steel-types
|
||||
ChiefData:
|
||||
; Silph Gauntlet 7F
|
||||
db $FF, 66, ELECTRODE, 65, LAPRAS, 66, SCIZOR, 65, GENGAR, 68, PORYGONZ, 70, OMEGADGE, 0
|
||||
db $FF, 73, ELECTRODE, 72, LAPRAS, 73, SCIZOR, 72, GENGAR, 75, PORYGONZ, 78, OMEGADGE, 0
|
||||
; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope.
|
||||
db 57, HITMONTOP, JABETTA, GORILLAIMO, POLIWRATH, CARAPTHOR, MACHAMP, 0
|
||||
|
||||
; Poison- and Electric-type Pokemon
|
||||
ScientistData:
|
||||
; Silph Gauntlet 4F (Lavender Tower)
|
||||
db 59, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, GAVILLAIN, WEEZING, 0
|
||||
db 59, MAGNEZONE, TRICULES, PORYGON2, MIMMEO, GAVILLAIN, WEEZING, 0
|
||||
; Silph Co. 2F (unused)
|
||||
db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
|
||||
db 28, MAGNETITE, VOLTORB, MAGNETON, 0
|
||||
|
|
@ -629,7 +628,7 @@ RocketData:
|
|||
db 26, VOLTORB, KOFFING, DROWZEE, 0
|
||||
db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0
|
||||
; Silph Gauntlet 4F (Lavender Tower)
|
||||
db 59, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0
|
||||
db 59, GUARDIA, ARBOK, RATICATE, CROBAT, HYPNO, NIDOREIGN, 0
|
||||
; Silph Co. 2F - cut
|
||||
db 29, CUBONE, ZUBAT, 0
|
||||
db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0
|
||||
|
|
@ -638,7 +637,7 @@ RocketData:
|
|||
; Silph Co. 4F - cut
|
||||
db 29, MACHOP, DROWZEE, 0
|
||||
db 28, EKANS, ZUBAT, CUBONE, 0
|
||||
; Silph Co. 5F - cut
|
||||
; Silph Co. 5F
|
||||
db 33, ARBOK, 0
|
||||
db 33, HYPNO, 0
|
||||
; Silph Co. 6F - cut
|
||||
|
|
@ -665,12 +664,12 @@ CooltrainerMData:
|
|||
; Viridian Gym
|
||||
db 39, MAROWAK, NIDOKING, 0
|
||||
; Victory Road 3F
|
||||
db 43, EXEGGUTOR, CLOYSTER, ARCANINE, 0
|
||||
db 43, KINGLER, TENTACRUEL, BLASTOISE, 0
|
||||
db 50, EXEGGUTOR, CLOYSTER, ARCANINE, 0
|
||||
db 50, KINGLER, TENTACRUEL, BLASTOISE, 0
|
||||
; Silph Gauntlet 5F (Safari Zone)
|
||||
db 60, GOROCHU, VENUSAUR, ESPEON, CHARIZARD, SNORLAX, TOTARTLE, 0
|
||||
; Victory Road 1F
|
||||
db 42, IVYSAUR, WARTORTLE, CHARMELEON, CHARIZARD, 0
|
||||
db 48, FLAREON, VAPOREON, JOLTEON, LEAFEON, 0
|
||||
; Unused
|
||||
db 44, IVYSAUR, WARTORTLE, CHARMELEON, 0
|
||||
db 49, NIDOKING, 0
|
||||
|
|
@ -681,7 +680,7 @@ CooltrainerMData:
|
|||
; Celadon Condominiums Morimoto - Team is LGPE's with +10 Levels each.
|
||||
db 64, KANGASKHAN, FLAREON, VAPOREON, JOLTEON, MACHAMP, DRAGONITE, 0
|
||||
; Brunswick Trail / Glade
|
||||
db 60, RATICATE, POLITOED, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYPERIOR, 0 ; Primo
|
||||
db 60, RATICATE, POLITOED, BUTTERFREE, WIGGLYTUFF, MACHAMP, RHYDON, 0 ; Primo
|
||||
db 57, PIDGEOT, VILEPLUME, GUARDIA, RAPIDASH, SLOWBRO, JOLTEON, 0 ; Trace
|
||||
db 60, EXEGGUTOR, SLOWBRO, JYNX, 0 ; Will
|
||||
|
||||
|
|
@ -690,17 +689,17 @@ CooltrainerFData:
|
|||
; Celadon Gym
|
||||
db 24, CACTORMUS, GLOOM, 0
|
||||
; Victory Road 3F
|
||||
db 43, BELLIGNAN, VICTREEBEL, 0
|
||||
db 43, PARASECT, DEWGONG, CHANSEY, 0
|
||||
db 49, BELLIGNAN, VICTREEBEL, 0
|
||||
db 47, PARASECT, DEWGONG, CHANSEY, 0
|
||||
; Silph Gauntlet 5F (Safari Zone)
|
||||
db 60, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0
|
||||
db 60, CLEFABLE, GENGAR, NINETALES, LEAFEON, GLACEON, BLASTOISE, 0
|
||||
; Victory Road 1F
|
||||
db 44, PERSIAN, NINETALES, BELLOSSOM, 0
|
||||
; Unused - reuse somewhere? celeste, etc?
|
||||
db 48, PERSIAN, NINETALES, BELLOSSOM, 0
|
||||
; Unused
|
||||
; db 45, IVYSAUR, VENUSAUR, 0
|
||||
; db 45, NIDORINA, NIDOQUEEN, 0
|
||||
; db 43, PERSIAN, NINETALES, RAICHU, 0
|
||||
; Brunswick Glade/grotto etc, whatever desired
|
||||
; Brunswick Glade
|
||||
db 60, BLASTOISE, VENUSAUR, CLEFABLE, ESPEON, 0 ; Leaf
|
||||
|
||||
; "Dignified" Pokemon associated with the privileged class.
|
||||
|
|
@ -714,7 +713,7 @@ GentlemanData:
|
|||
db 58, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0
|
||||
; SS Anne 2F Rooms
|
||||
db 17, KOLTA, GROWLITHE, 0
|
||||
; Celeste Hill?
|
||||
; Celeste Hill/Brunswick Trail
|
||||
db 56, NIDOKING, GOLDUCK, GUARDIA, DODRIO, BEEDRILL, 0 ; Fuji
|
||||
db 57, FEAROW, RAPIDASH, GOROCHU, ALAKAZAM, SYLVEON, 0 ; Fan Club chairman
|
||||
|
||||
|
|
@ -766,21 +765,19 @@ StudentData:
|
|||
db 56, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, RAMOOSE, 0 ; all Normal types that Yujirou doesn't use
|
||||
; Celadon University
|
||||
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
|
||||
; Celadon University
|
||||
db 40, VENUSAUR, CHARIZARD, TOTARTLE, 0
|
||||
|
||||
; Mainly Water specialists, but can also use anything else that hits Fire super-effectively
|
||||
FirefighterData:
|
||||
; Cerulean Gym
|
||||
db 15, POLIWAG, CHEEP, SQUIRTLE, 0
|
||||
; Silph Gauntlet 3F (S.S Anne)
|
||||
db 58, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0
|
||||
db 58, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, PENDRAKEN, 0
|
||||
; Cinnabar Volcano
|
||||
db 36, WARTORTLE, MAROWAK, POLITOED, 0
|
||||
db 35, SANDSLASH, OMANYTE, SEAKING, CROAKOZUNA, 0
|
||||
db 38, SEADRA, BLASTOISE, 0
|
||||
|
||||
JuniorData:
|
||||
; to be removed
|
||||
db 5, BULBASAUR, 0
|
||||
|
||||
JackData:
|
||||
; Celadon Mansion Roof House
|
||||
|
|
|
|||
|
|
@ -44,17 +44,17 @@ Green2Data:
|
|||
db $FF, 48, SANDSLASH, 47, EXEGGCUTE, 47, NINETALES, 48, CLOYSTER, 50, ALAKAZAM, 53, GOROCHU, 0
|
||||
|
||||
Green3Data:
|
||||
db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, ARCANINE, 61, EXEGGUTOR, 63, TOTARTLE, 0
|
||||
db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, GYARADOS, 61, ARCANINE, 63, VENUSAUR, 0
|
||||
db $FF, 59, PIDGEOT, 57, ALAKAZAM, 59, RHYPERIOR, 59, EXEGGUTOR, 61, GYARADOS, 63, CHARIZARD, 0
|
||||
db $FF, 59, SANDSLASH, 57, ALAKAZAM, 59, EXEGGUTOR, 59, MAGNEZONE, 61, NINETALES, 63, UMBREON, 0
|
||||
db $FF, 59, SANDSLASH, 57, ALAKAZAM, 59, EXEGGUTOR, 59, NINETALES, 61, CLOYSTER, 63, GOROCHU, 0
|
||||
db $FF, 59, PIDGEOT, 60, ALAKAZAM, 59, RHYPERIOR, 61, ARCANINE, 61, EXEGGUTOR, 63, TOTARTLE, 0
|
||||
db $FF, 59, PIDGEOT, 60, ALAKAZAM, 59, RHYPERIOR, 61, GYARADOS, 61, ARCANINE, 63, VENUSAUR, 0
|
||||
db $FF, 59, PIDGEOT, 60, ALAKAZAM, 59, RHYPERIOR, 61, EXEGGUTOR, 61, GYARADOS, 63, CHARIZARD, 0
|
||||
db $FF, 59, SANDSLASH, 60, ALAKAZAM, 59, EXEGGUTOR, 61, MAGNEZONE, 61, NINETALES, 63, UMBREON, 0
|
||||
db $FF, 59, SANDSLASH, 60, ALAKAZAM, 59, EXEGGUTOR, 61, NINETALES, 61, CLOYSTER, 63, GOROCHU, 0
|
||||
; post-game rematch teams, based on FRLG team
|
||||
db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, ARCANINE, 73, EXEGGUTOR, 75, TOTARTLE, 0
|
||||
db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, GYARADOS, 73, ARCANINE, 75, VENUSAUR, 0
|
||||
db $FF, 72, TRICULES, 73, ALAKAZAM, 72, IGUANARCH, 73, EXEGGUTOR, 73, GYARADOS, 75, CHARIZARD, 0
|
||||
db $FF, 72, GUARDIA, 73, ALAKAZAM, 72, TANGROWTH, 73, MAGNEZONE, 73, NINETALES, 75, UMBREON, 0
|
||||
db $FF, 72, GUARDIA, 73, ALAKAZAM, 72, TANGROWTH, 73, NINETALES, 73, CLOYSTER, 75, GOROCHU, 0
|
||||
db $FF, 82, TRICULES, 83, ALAKAZAM, 82, IGUANARCH, 83, ARCANINE, 83, EXEGGUTOR, 85, TOTARTLE, 0
|
||||
db $FF, 82, TRICULES, 83, ALAKAZAM, 82, IGUANARCH, 83, GYARADOS, 83, ARCANINE, 85, VENUSAUR, 0
|
||||
db $FF, 82, TRICULES, 83, ALAKAZAM, 82, IGUANARCH, 83, EXEGGUTOR, 83, GYARADOS, 85, CHARIZARD, 0
|
||||
db $FF, 82, GUARDIA, 83, ALAKAZAM, 82, TANGROWTH, 83, MAGNEZONE, 83, NINETALES, 85, UMBREON, 0
|
||||
db $FF, 82, GUARDIA, 83, ALAKAZAM, 82, TANGROWTH, 83, NINETALES, 83, CLOYSTER, 85, GOROCHU, 0
|
||||
|
||||
ProfOakData:
|
||||
db $FF, 61, TAUROS, 62, GYARADOS, 63, ARCANINE, 63, EXEGGUTOR, 64, NIDOKING, 65, TOTARTLE, 0
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ BrockData:
|
|||
db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0, ; 4
|
||||
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GAWARHED, 43, STEELIX, 0 ; 5
|
||||
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, GAWARHED, 47, STEELIX, 0 ; 6
|
||||
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, GAWARHED, 48, KLEAVOR, 50, STEELIX, 0 ; 7 (unused)
|
||||
db $FF, 62, GOLEM, 61, GAWARHED, 61, ARCANINE_H, 62, OMASTAR, 62, KABUTOPS, 65, STEELIX, 0 ; 8 (postgame)
|
||||
db $FF, 57, GOLEM, 56, OMASTAR, 56, KABUTOPS, 57, GAWARHED, 57, KLEAVOR, 60, STEELIX, 0 ; 7 (unused)
|
||||
db $FF, 67, GOLEM, 66, GAWARHED, 66, ARCANINE_H, 67, OMASTAR, 67, KABUTOPS, 70, STEELIX, 0 ; 8 (postgame)
|
||||
|
||||
MistyData:
|
||||
db $FF, 11, HORSEA, 12, GOLDEEN, 14, STARMIE, 0 ; 0 badges
|
||||
|
|
@ -20,8 +20,8 @@ MistyData:
|
|||
db $FF, 38, SEADRA, 37, CROAKOZUNA, 37, SEAKING, 38, GOLDUCK, 40, STARMIE, 0 ; 4
|
||||
db $FF, 41, SEADRA, 40, CROAKOZUNA, 40, SEAKING, 41, GOLDUCK, 43, STARMIE, 0 ; 5
|
||||
db $FF, 45, KINGDRA, 44, CROAKOZUNA, 44, SEAKING, 45, GOLDUCK, 47, STARMIE, 0 ; 6
|
||||
db $FF, 47, KINGDRA, 46, CROAKOZUNA, 46, SEAKING, 48, GOLDUCK, 48, VAPOREON, 50, STARMIE, 0 ; 7 (unused)
|
||||
db $FF, 62, KINGDRA, 62, GOLDUCK, 61, TAUROS_PA, 61, VAPOREON, 62, TOTARTLE, 65, STARMIE, 0 ; 8 (postgame)
|
||||
db $FF, 57, KINGDRA, 56, CROAKOZUNA, 56, SEAKING, 57, GOLDUCK, 57, VAPOREON, 60, STARMIE, 0 ; 7 (unused)
|
||||
db $FF, 67, KINGDRA, 67, GOLDUCK, 66, TAUROS_PA, 66, VAPOREON, 67, TOTARTLE, 70, STARMIE, 0 ; 8 (postgame)
|
||||
|
||||
LtSurgeData:
|
||||
db $FF, 11, VOLTORB, 12, PIKACHU, 14, GAOTORA, 0 ; 0 badges
|
||||
|
|
@ -31,8 +31,8 @@ LtSurgeData:
|
|||
db $FF, 38, ELECTRODE, 37, GOROTORA, 37, MAGNETON, 38, ELECTABUZZ, 40, GOROCHU, 0 ; 4
|
||||
db $FF, 41, ELECTRODE, 40, GOROTORA, 40, MAGNETON, 41, ELECTABUZZ, 43, GOROCHU, 0 ; 5
|
||||
db $FF, 45, ELECTRODE, 44, GOROTORA, 44, MAGNEZONE, 45, ELECTIVIRE, 47, GOROCHU, 0 ; 6
|
||||
db $FF, 47, ELECTRODE, 46, GOROTORA, 46, MAGNEZONE, 48, ELECTIVIRE, 48, JOLTEON, 50, GOROCHU, 0 ; 7 (unused)
|
||||
db $FF, 62, GOROTORA, 62, MAGNEZONE, 61, GOLEM_A, 62, ELECTIVIRE, 61, JOLTEON, 65, GOROCHU, 0 ; 8 (postgame)
|
||||
db $FF, 57, ELECTRODE, 56, GOROTORA, 56, MAGNEZONE, 57, ELECTIVIRE, 57, JOLTEON, 60, GOROCHU, 0 ; 7 (unused)
|
||||
db $FF, 67, GOROTORA, 67, MAGNEZONE, 66, GOLEM_A, 67, ELECTIVIRE, 66, JOLTEON, 70, GOROCHU, 0 ; 8 (postgame)
|
||||
|
||||
ErikaData:
|
||||
db $FF, 11, BELLSPROUT, 12, ODDISH, 14, TANGELA, 0 ; 0 badges (unused)
|
||||
|
|
@ -42,8 +42,8 @@ ErikaData:
|
|||
db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTORMUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4
|
||||
db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTORMUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5
|
||||
db $FF, 45, VICTREEBEL, 44, PARASECT, 44, CACTORMUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
|
||||
db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTORMUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0 ; 7 (unused)
|
||||
db $FF, 62, BELLOSSOM, 62, TOEDSCRUEL, 61, ELECTRODE_H, 61, LEAFEON, 62, VENUSAUR, 65, TANGROWTH, 0 ; 8 (postgame)
|
||||
db $FF, 57, VICTREEBEL, 56, PARASECT, 56, CACTORMUS, 57, BELLOSSOM, 57, LEAFEON, 60, TANGROWTH, 0 ; 7 (unused)
|
||||
db $FF, 67, BELLOSSOM, 67, TOEDSCRUEL, 66, ELECTRODE_H, 66, LEAFEON, 67, VENUSAUR, 70, TANGROWTH, 0 ; 8 (postgame)
|
||||
|
||||
KogaData:
|
||||
db $FF, 11, VENONAT, 12, ZUBAT, 14, KOFFING, 0 ; 0 badges (unused)
|
||||
|
|
@ -53,8 +53,8 @@ KogaData:
|
|||
db $FF, 38, VENOMOTH, 37, TENTACRUEL, 37, MUK, 38, WEEZING, 40, CROBAT, 0 ; 4
|
||||
db $FF, 41, VENOMOTH, 40, TENTACRUEL, 40, MUK, 41, WEEZING, 43, CROBAT, 0 ; 5
|
||||
db $FF, 45, VENOMOTH, 44, TENTACRUEL, 44, MUK, 45, WEEZING, 47, CROBAT, 0 ; 6
|
||||
db $FF, 47, VENOMOTH, 46, BELLIGNAN, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
|
||||
db $FF, 62, VENOMOTH, 61, BELLIGNAN, 61, SLOWBRO_G, 62, MUK, 62, WEEZING, 65, CROBAT, 0 ; 8 (postgame)
|
||||
db $FF, 57, VENOMOTH, 56, BELLIGNAN, 56, TENTACRUEL, 57, MUK, 57, WEEZING, 60, CROBAT, 0 ; 7 (unused)
|
||||
db $FF, 67, VENOMOTH, 66, BELLIGNAN, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
|
||||
|
||||
SabrinaData:
|
||||
db $FF, 11, SLOWPOKE, 12, DROWZEE, 14, KADABRA, 0 ; 0 badges (unused)
|
||||
|
|
@ -64,8 +64,8 @@ SabrinaData:
|
|||
db $FF, 38, ESPEON, 37, MR_MIME, 37, SLOWKING, 38, HYPNO, 40, ALAKAZAM, 0 ; 4
|
||||
db $FF, 41, ESPEON, 40, MR_MIME, 40, SLOWKING, 41, HYPNO, 43, ALAKAZAM, 0 ; 5
|
||||
db $FF, 45, ESPEON, 44, MR_MIME, 44, SLOWKING, 45, HYPNO, 47, ALAKAZAM, 0 ; 6
|
||||
db $FF, 47, ESPEON, 46, MR_MIME, 46, SLOWKING, 48, JYNX, 48, HYPNO, 50, ALAKAZAM, 0 ; 7 (unused)
|
||||
db $FF, 62, JYNX, 62, SLOWKING, 61, RAPIDASH_G, 62, HYPNO, 61, ESPEON, 65, ALAKAZAM, 0 ; 8 (postgame)
|
||||
db $FF, 57, ESPEON, 56, MR_MIME, 56, SLOWKING, 57, JYNX, 57, HYPNO, 60, ALAKAZAM, 0 ; 7 (unused)
|
||||
db $FF, 67, JYNX, 67, SLOWKING, 66, RAPIDASH_G, 67, HYPNO, 66, ESPEON, 70, ALAKAZAM, 0 ; 8 (postgame)
|
||||
|
||||
BlaineData:
|
||||
db $FF, 11, VULPIX, 12, GROWLITHE, 14, PONYTA, 0 ; 0 badges (unused)
|
||||
|
|
@ -75,8 +75,8 @@ BlaineData:
|
|||
db $FF, 38, PONYTA, 37, NINETALES, 37, FLAREON, 38, ARCANINE, 40, MAGMORTAR, 0 ; 4
|
||||
db $FF, 41, RAPIDASH, 40, NINETALES, 40, FLAREON, 41, ARCANINE, 43, MAGMORTAR, 0 ; 5
|
||||
db $FF, 45, RAPIDASH, 44, NINETALES, 44, FLAREON, 45, ARCANINE, 47, MAGMORTAR, 0 ; 6
|
||||
db $FF, 47, RAPIDASH, 46, NINETALES, 46, FLAREON, 48, CHARIZARD, 48, ARCANINE, 50, MAGMORTAR, 0 ; 7 (unused)
|
||||
db $FF, 62, RAPIDASH, 62, ARCANINE, 61, TAUROS_PB, 61, FLAREON, 62, CHARIZARD, 65, MAGMORTAR, 0 ; 8 (postgame)
|
||||
db $FF, 57, RAPIDASH, 56, NINETALES, 56, FLAREON, 57, CHARIZARD, 57, ARCANINE, 60, MAGMORTAR, 0 ; 7 (unused)
|
||||
db $FF, 67, RAPIDASH, 67, ARCANINE, 66, TAUROS_PB, 66, FLAREON, 67, CHARIZARD, 70, MAGMORTAR, 0 ; 8 (postgame)
|
||||
|
||||
GiovanniData:
|
||||
; Rocket Hideout B4F
|
||||
|
|
@ -86,26 +86,32 @@ GiovanniData:
|
|||
|
||||
LeaderGiovanniData:
|
||||
db $FF, 47, TRAMPEL, 46, DUGTRIO, 46, GUARDIA, 48, NIDOQUEEN, 48, NIDOKING, 50, RHYPERIOR, 0
|
||||
|
||||
ChiefData:
|
||||
; Silph Gauntlet 7F
|
||||
db $FF, 71, ELECTRODE, 70, LAPRAS, 71, SCIZOR, 70, GENGAR, 73, PORYGONZ, 77, OMEGADGE, 0
|
||||
db $FF, 82, ELECTRODE, 81, LAPRAS, 82, SCIZOR, 81, GENGAR, 84, PORYGONZ, 87, OMEGADGE, 0
|
||||
; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope.
|
||||
|
||||
LoreleiData:
|
||||
db $FF, 51, DEWGONG, 50, CLOYSTER, 50, BUU, 52, JYNX, 52, GLACEON, 54, LAPRAS, 0
|
||||
db $FF, 53, DEWGONG, 54, CLOYSTER, 53, BUU, 55, JYNX, 55, GLACEON, 57, LAPRAS, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 63, DEWGONG, 64, CLOYSTER, 63, NINETALES_A, 64, JYNX, 64, GLACEON, 66, LAPRAS, 0
|
||||
db $FF, 73, DEWGONG, 74, CLOYSTER, 73, NINETALES_A, 74, JYNX, 74, GLACEON, 76, LAPRAS, 0
|
||||
|
||||
BrunoData:
|
||||
db $FF, 53, JABETTA, 52, STEELIX, 52, GORILLAIMO, 54, HITMONCHAN, 56, HITMONLEE, 56, MACHAMP, 0
|
||||
db $FF, 54, JABETTA, 55, STEELIX, 54, GORILLAIMO, 56, HITMONCHAN, 56, HITMONLEE, 58, MACHAMP, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 65, JABETTA, 66, STEELIX, 65, SIRFETCHD, 66, GORILLAIMO, 66, HITMONTOP, 68, MACHAMP, 0
|
||||
db $FF, 75, JABETTA, 76, STEELIX, 75, SIRFETCHD, 76, GORILLAIMO, 76, HITMONTOP, 78, MACHAMP, 0
|
||||
|
||||
AgathaData:
|
||||
db $FF, 55, ANNIHILAPE, 54, CROBAT, 54, GENGAR, 56, ARBOK, 56, UMBREON, 58, GENGAR, 0 ; Agatha has double Gengars in every single battle in the main-series, it's fine here...
|
||||
db $FF, 55, ANNIHILAPE, 56, CROBAT, 55, GENGAR, 57, ARBOK, 57, UMBREON, 59, GENGAR, 0 ; Agatha has double Gengars in every single battle in the main-series, it's fine here...
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 67, ANNIHILAPE, 68, CROBAT, 67, MAROWAK_A, 68, ARBOK, 68, UMBREON, 70, GENGAR, 0
|
||||
db $FF, 77, ANNIHILAPE, 78, CROBAT, 77, MAROWAK_A, 78, ARBOK, 78, UMBREON, 80, GENGAR, 0
|
||||
|
||||
LanceData:
|
||||
db $FF, 57, GAVILLAIN, 56, GYARADOS, 56, KINGDRA, 58, IGUANARCH, 58, AERODACTYL, 60, DRAGONITE, 0
|
||||
db $FF, 56, GAVILLAIN, 57, GYARADOS, 56, KINGDRA, 58, IGUANARCH, 58, AERODACTYL, 60, DRAGONITE, 0
|
||||
; post-game rematch team (currently unused)
|
||||
db $FF, 69, GAVILLAIN, 70, GYARADOS, 69, EXEGGUTOR_A, 70, KINGDRA, 70, IGUANARCH, 72, DRAGONITE, 0
|
||||
db $FF, 79, GAVILLAIN, 80, GYARADOS, 79, EXEGGUTOR_A, 80, KINGDRA, 80, IGUANARCH, 82, DRAGONITE, 0
|
||||
|
||||
YujirouData: ; was unused juggler
|
||||
db $FF, 5, COINPUR, 6, RATTATA, 8, LICKITUNG, 0 ; 0
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
Route23WildMons:
|
||||
def_grass_wildmons 10 ; encounter rate
|
||||
db 41, ARBOK
|
||||
db 40, ARBOK
|
||||
db 40, SANDSLASH
|
||||
db 38, FEAROW
|
||||
db 38, ARBOK
|
||||
db 39, EXEGGCUTE
|
||||
db 38, EXEGGCUTE
|
||||
db 40, PRIMEAPE
|
||||
db 37, EXEGGCUTE
|
||||
db 38, EXEGGCUTE
|
||||
db 38, NIDORINO
|
||||
db 38, NIDORINA
|
||||
db 40, FEAROW
|
||||
db 41, SANDSLASH
|
||||
db 41, PRIMEAPE
|
||||
end_grass_wildmons
|
||||
|
||||
def_water_wildmons 0 ; encounter rate
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
VictoryRoad1FWildMons:
|
||||
def_grass_wildmons 15 ; encounter rate
|
||||
db 39, MACHOKE
|
||||
db 38, ONIX
|
||||
db 39, GOLBAT
|
||||
db 38, GRAVELER
|
||||
db 39, SANDSLASH
|
||||
db 40, GOLBAT
|
||||
db 40, GAVILLAIN
|
||||
db 40, RHYHORN
|
||||
db 40, MAROWAK
|
||||
db 42, HITMONTOP ; LGPE Rare Spawn
|
||||
db 43, MACHOKE
|
||||
db 42, ONIX
|
||||
db 42, GOLBAT
|
||||
db 42, GRAVELER
|
||||
db 43, SANDSLASH
|
||||
db 43, GOLBAT
|
||||
db 44, GAVILLAIN
|
||||
db 44, RHYHORN
|
||||
db 44, MAROWAK
|
||||
db 45, HITMONTOP ; LGPE Rare Spawn
|
||||
end_grass_wildmons
|
||||
|
||||
def_water_wildmons 0 ; encounter rate
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
VictoryRoad2FWildMons:
|
||||
def_grass_wildmons 10 ; encounter rate
|
||||
db 39, MACHOKE
|
||||
db 38, ONIX
|
||||
db 39, GOLBAT
|
||||
db 38, GRAVELER
|
||||
db 39, SANDSLASH
|
||||
db 40, GOLBAT
|
||||
db 40, GAVILLAIN
|
||||
db 40, RHYHORN
|
||||
db 40, VENOMOTH
|
||||
db 42, HITMONLEE ; LGPE Rare Spawn
|
||||
def_grass_wildmons 15 ; encounter rate
|
||||
db 43, MACHOKE
|
||||
db 42, ONIX
|
||||
db 42, GOLBAT
|
||||
db 42, GRAVELER
|
||||
db 43, SANDSLASH
|
||||
db 43, GOLBAT
|
||||
db 44, GAVILLAIN
|
||||
db 44, RHYHORN
|
||||
db 44, VENOMOTH
|
||||
db 45, HITMONLEE ; LGPE Rare Spawn
|
||||
end_grass_wildmons
|
||||
|
||||
def_water_wildmons 0 ; encounter rate
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
VictoryRoad3FWildMons:
|
||||
def_grass_wildmons 15 ; encounter rate
|
||||
db 39, MACHOKE
|
||||
db 38, ONIX
|
||||
db 39, GOLBAT
|
||||
db 38, GRAVELER
|
||||
db 39, RHYHORN
|
||||
db 40, GOLBAT
|
||||
db 40, GAVILLAIN
|
||||
db 40, SANDSLASH
|
||||
db 40, PARASECT
|
||||
db 42, HITMONCHAN ; LGPE Rare Spawn
|
||||
db 43, MACHOKE
|
||||
db 42, ONIX
|
||||
db 42, GOLBAT
|
||||
db 42, GRAVELER
|
||||
db 43, RHYHORN
|
||||
db 43, GOLBAT
|
||||
db 44, GAVILLAIN
|
||||
db 44, SANDSLASH
|
||||
db 44, PARASECT
|
||||
db 45, HITMONCHAN ; LGPE Rare Spawn
|
||||
end_grass_wildmons
|
||||
|
||||
def_water_wildmons 0 ; encounter rate
|
||||
|
|
|
|||
|
|
@ -37,10 +37,19 @@ CeladonUniversityOutsideText1: ; Starter girl
|
|||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
call Delay3
|
||||
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
|
||||
jr nz, .hardmode1
|
||||
ld a, OPP_STUDENT
|
||||
ld [wCurOpponent], a
|
||||
ld a, 4
|
||||
ld [wTrainerNo], a
|
||||
jr .skip1
|
||||
.hardmode1
|
||||
ld a, OPP_STUDENT
|
||||
ld [wCurOpponent], a
|
||||
ld a, 5
|
||||
ld [wTrainerNo], a
|
||||
.skip1
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $2
|
||||
ld [wCeladonUniversityOutsideCurScript], a
|
||||
|
|
@ -77,10 +86,19 @@ CeladonUniversityOutsideText2: ; Porygon guy
|
|||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
call Delay3
|
||||
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
|
||||
jr nz, .hardmode2
|
||||
ld a, OPP_SUPER_NERD
|
||||
ld [wCurOpponent], a
|
||||
ld a, 6
|
||||
ld [wTrainerNo], a
|
||||
jr .skip2
|
||||
.hardmode2
|
||||
ld a, OPP_SUPER_NERD
|
||||
ld [wCurOpponent], a
|
||||
ld a, 13
|
||||
ld [wTrainerNo], a
|
||||
.skip2
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $2
|
||||
ld [wCeladonUniversityOutsideCurScript], a
|
||||
|
|
@ -117,10 +135,19 @@ CeladonUniversityOutsideText3: ; Golem guy
|
|||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
call Delay3
|
||||
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
|
||||
jr nz, .hardmode3
|
||||
ld a, OPP_ENGINEER
|
||||
ld [wCurOpponent], a
|
||||
ld a, 1
|
||||
ld [wTrainerNo], a
|
||||
jr .skip3
|
||||
.hardmode3
|
||||
ld a, OPP_ENGINEER
|
||||
ld [wCurOpponent], a
|
||||
ld a, 5
|
||||
ld [wTrainerNo], a
|
||||
.skip3
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $2
|
||||
ld [wCeladonUniversityOutsideCurScript], a
|
||||
|
|
@ -157,10 +184,19 @@ CeladonUniversityOutsideText4: ; Mt Moon guy
|
|||
set 6, [hl]
|
||||
set 7, [hl]
|
||||
call Delay3
|
||||
CheckEvent EVENT_BEAT_VIRIDIAN_GYM_GIOVANNI
|
||||
jr nz, .hardmode4
|
||||
ld a, OPP_SUPER_NERD
|
||||
ld [wCurOpponent], a
|
||||
ld a, 7
|
||||
ld [wTrainerNo], a
|
||||
jr .skip4
|
||||
.hardmode4
|
||||
ld a, OPP_SUPER_NERD
|
||||
ld [wCurOpponent], a
|
||||
ld a, 14
|
||||
ld [wTrainerNo], a
|
||||
.skip4
|
||||
ld [wIsTrainerBattle], a
|
||||
ld a, $2
|
||||
ld [wCeladonUniversityOutsideCurScript], a
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ _CeladonUniversityOutsideBattleText1::
|
|||
done
|
||||
|
||||
_CeladonUniversityOutsideBattleText2::
|
||||
text "Ok! Go, PORYGON!"
|
||||
text "Let's go!"
|
||||
done
|
||||
|
||||
_CeladonUniversityOutsideBattleText3::
|
||||
|
|
@ -32,9 +32,9 @@ _CeladonUniversityOutsideLoseText1::
|
|||
prompt
|
||||
|
||||
_CeladonUniversityOutsideLoseText2::
|
||||
text "It"
|
||||
line "needs an"
|
||||
cont "UP-GRADE."
|
||||
text "Darn!"
|
||||
line "It must need an"
|
||||
cont "update!"
|
||||
prompt
|
||||
|
||||
_CeladonUniversityOutsideLoseText3::
|
||||
|
|
@ -61,7 +61,7 @@ _CeladonUniversityOutsideAfterBattleText::
|
|||
|
||||
_CeladonUniversityOutsideYesNo2::
|
||||
text "I've been working"
|
||||
line "on a digital"
|
||||
line "on an artificial"
|
||||
cont "#MON."
|
||||
|
||||
para "Want to help me"
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ _SSAnne10EndBattleText2::
|
|||
|
||||
_SSAnne10AfterBattleText2::
|
||||
text "Did you see the"
|
||||
line "FISHING GURU in"
|
||||
cont "VERMILION CITY?"
|
||||
line "FISHING GURU near"
|
||||
cont "CERULEAN CITY?"
|
||||
done
|
||||
|
||||
_SSAnne10BattleText3::
|
||||
|
|
@ -64,7 +64,8 @@ _SSAnne10EndBattleText4::
|
|||
_SSAnne10AfterBattleText4::
|
||||
text "Sea #MON live"
|
||||
line "in deep water."
|
||||
cont "You'll need a ROD!"
|
||||
cont "You'll need a"
|
||||
cont "FISHING ROD!"
|
||||
done
|
||||
|
||||
_SSAnne10BattleText5::
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
_SilphCo1Text1::
|
||||
text "Welcome!"
|
||||
|
||||
para "The PRESIDENT is"
|
||||
line "in the boardroom"
|
||||
cont "on 11F!"
|
||||
para "The CHIEF is in"
|
||||
line "the boardroom on"
|
||||
cont "the top floor!"
|
||||
done
|
||||
|
||||
_SilphCo1Text2::
|
||||
|
|
|
|||
Loading…
Reference in a new issue