thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-01-08 01:59:49 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

The Big One.

Browse source 
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.
This commit is contained in:
Martha Schilling 2023-09-19 23:34:25 +01:00
parent 57186bb2a0
commit 508a4e790e
246 changed files with 2446 additions and 2384 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
README.md
View file

@ -9,10 +9,10 @@ New Pokemon:
The Kanto Expansion Pak's ethos is to add every "Kanto-related" Pokemon to RBY without fundamentally changing the grander metagame. What's defined as "Kanto-related" is a Pokemon that evolves from an existing Kanto Pokemon, made an appearance in a Kanto-based game (LGPE), is a regional variant, or was a Kanto-related Pokemon cut during the development of an official game.
With this criteria, we get:
- The 34 known beta Pokemon that were cut from Red and Green; eg. Gorochu, Deer
- Evolutions or pre-evolutions of a Kanto Pokemon found in a future generation eg. Kleavor, Glaceon, Annihilape
- Evolutions of Kanto Pokemon found in the SpaceWorld '97 demo of Gold and Silver; eg. Madaamu, Purakkusu
- All fully-evolved regional variants of Kanto Pokemon; eg. Hisuian Arcanine, Galarian Slowbro, Paldean Tauros, Alolan Muk
- The 34 known beta Pokemon that were cut from Red and Green; eg. Gorochu, Kotora
- Evolutions or pre-evolutions of a Kanto Pokemon found in a future generation eg. Steelix, Glaceon, Kleavor, Annihilape
- Evolutions of Kanto Pokemon found in the SpaceWorld '97 demo of Gold and Silver; eg. Luxwan, Bellignan
- All fully-evolved regional variants of Kanto Pokemon; eg. Alolan Muk, Galarian Slowbro, Hisuian Arcanine, Paldean Tauros
- Meltan and Melmetal from Let's Go Pikachu and Let's Go Eevee.
- Paradox Pokemon from Scarlet & Violet; Scream Tail and Sandy Shocks.
@ -29,11 +29,15 @@ In general, the following Pokemon are not available;
- Mime Jr.
- Happiny
- Munchlax
- Erebebii (prototype Elekid pre-evoluton in May98 GSC sprite cache)
- Hinaazu (SW97 Baby Doduo)
- Betobebii (SW97 Baby Grimer)
- Pudi (SW97 Baby Growlithe)
- Regional form pre-evolutions (eg. Alolan Vulpix, Galarian Slowpoke)
- Bittybat (prototype Zubat pre-evolution from Red and Green)
- Magnetite (prototype middle stage between Magnemite and Magneton)
- Elebaby (prototype Elekid pre-evolution in May98 GSC sprite cache)
- Burgela (SW97 Baby Tangela)
- Paraspor (SW97 Baby Paras)
- Dodaerie (SW97 Baby Doduo)
- Smujj (SW97 Baby Grimer)
- Pupperon (SW97 Baby Growlithe)
- Regional form pre-evolutions (eg. Alolan Vulpix, Galarian Slowpoke, Hisuian Voltorb)
Mega Evolutions and Gigantamax forms are not in the game mainly by choice. There are no held items and there isn't a special button or anything, so it felt kind of weird to add, would deviate significantly from the RBY experience, and requires a pretty big overhaul to the battle system. It's definitely possible, just not for me.
@ -49,7 +53,7 @@ Changes at a glance:
- Bite is still Normal-type.
- The Clefairy, Mime Jr, and Jigglypuff lines are not Steel or Fairy-type, respectively.
- This (and Bite) was done to ensure the original Kanto Pokemon were unaltered in any way.
- While Magnemite, Magnetite, and Magneton are pure Electric, Magnezone is part-Steel.
- While Magnemite and Magneton are pure Electric, Magnezone is part-Steel.
- Scream Tail remains Fairy/Psychic.
- Fire remains neutral against Ice.
- Bug and Poison remain super effective against each other.
@ -95,7 +99,7 @@ New Areas
- This is a reference to a Magikarp event from July 1998, and includes the lore from it and other areas of Pokemon's early worldbuilding.
- There are features new infinitely re-battleable trainers for grinding money.
- There's a Move Deleter and Move Relearner, allowing for HM deletion and getting back lost moves.
- Citrine City is a new island city that can be accessed in the postgame.
- Citrine City is a new island city that can be accessed in the postgame through a new port in Vermillion.
- There's a house with a Move Tutor that can teach Tradeback moves without the need for GSC's Time Capsule!
- It features a Team Rocket house where they will sell you TMs and Evolution Items, as well as provide a Hyper Training feature to get Max DVs!
- The Battle Tent from the TwitchPlaysPokemon Anniversary hack makes a return, featuring new trainers and Pokemon!
@ -114,8 +118,8 @@ New Areas
New Music
====
- Mewtwo has its own battle theme: A demake of the iconic Stadium track! It features some creative deviations to give it a distinct Game Boy feel while fitting with Mewtwo's mystique. Composed by LuciShrimp.
- Mew and the Kantonian Birds have their own battle theme, a demake of the FireRed/LeafGreen pitch-shifted remix. Not simply pitching it up, percussion elements have been added to give it that rustic FRLG "feel" that distinguishes it from the original games. Composed by LuciShrimp.
- Limited static encounters, such as the Power Plant Voltorb/Electrode, Snorlax, and the restored prototype Omega, also use this theme, much like Let's Go Pikachu and Eevee.
- Mew and the Legendary Birds have their own battle theme, a demake of the FireRed/LeafGreen pitch-shifted remix. Not simply pitching it up, percussion elements have been added to give it that rustic FRLG "feel" that distinguishes it from the original games. Composed by LuciShrimp.
- Limited static encounters, such as the two sleeping Snorlax, and the restored prototype Omega, also use this theme.
- Pokemon Yellow's various tracks have been backported, such as Jessie and James's encounter theme.
- Several pieces of unused music, including Digda01, Victory4, Field6, Kincho01, and Giovanni's theme have been implemented.
- A remix of the unused Koukan (trading) music is also used as a town theme. Composed by BGVC.
@ -158,7 +162,7 @@ QoL Enhancements
- A feminine character option is now available, featuring the sprite from Pokemon Anniversary Red, which is based on Green's manga appearance.
- To accomodate this, Celadon Gym's trainers use their more neutral text from Crystal.
- The protagonist is also referred to in a gender neutral manner. This changes like, 2-3 lines in the whole game.
- All 151 original Pokemon, plus an additional 100, can be obtained without the use of trading or glitches, including Mew!
- All 151 original Pokemon, plus an additional 97, can be obtained without the use of trading or glitches, including Mew!
- Various moves have had their animations altered to be less intensive for photosensitive individuals, including every animation that was dimmed on the 3DS (Most notably Blizzard and Thunderbolt). This was done with the aim of also improving the move's animations overall, so some look a little flashier.
- Full list includes Body Slam, Glare, Disable, Blizzard, BubbleBeam, Confusion, Dream Eater, Explosion, Guillotine, Hyper Beam, Mega Kick, Mega Punch, Psychic, Reflect, Rock Slide, Selfdestruct, Spore, and Thunderbolt.
- PureRGB's AI enhancements are ported over; said hack was made by Vortiene. In general, it isn't as stupid as it was before.
@ -200,8 +204,8 @@ QoL Enhancements
- 3x BAR now gives 400 coins (used to be 100)
- 3x 7s now gives 900 coins (used to be 300)
- Game Corner prizes have been altered;
- Blue's superior prices are used, so Porygon only costs 6500 coins.
- New prizes include: Cubone, Blastyke, and Cactus.
- Prices have been changed, so Porygon doesn't require 9999 coins.
- New prizes include: Cubone, Cactus, and Squeamata
- The Moon Stone is available over TM23 (Dragon Rage). Dragon Rage is still available in Celadon University!
- Spinner tiles move faster.
- Fight Debug now allows moves other than Pound.
@ -254,13 +258,14 @@ Known Bugs
Comprehensive list can be found on Discord.
- Only portions of spinner tiles animate.
- Occasionally, menu text sets itself to scroll.
- Giovanni's Room crashes the game.
- Pokedex does not load a full dex properly due to a soft limit of 248.
- The Tradeback Tutor doesn't work properly with Rhydon for reasons likely related to its index number of 1.
- The Vermilion Passes are very unstable (Faraway warps are weird unless you battle, Citrine outright crashes).
- Fake Tears and Nasty Plot don't quite look right when done from the opponent's side.
- The door mat tiles added recently warp the player when they walk on another (Citrine mats, arrow tiles...)
- James doesn't check for Max DVs when Hyper Training.
- Citrine Dock's warp doesn't work, meaning you have to leave Citrine using Fly
- LAST_MAP isn't updated properly when sailing from Vermilion to Citrine
- After reloading the game after beating the Elite Four, Pallet Town's correct palette isn't loaded in until after leaving the house.
- The Gym Leaders on Floor 6 of Silph Gauntlet don't play the correct music in battle
Evolution Methods for new Pokemon
====
@ -270,16 +275,16 @@ Due to the odd way some new Pokemon evolve, methods are listed here.
- To accomodate new additions and ensure everything makes sense, some Pokemon have also had their methods changed. These situations are usually very extreme.
Changed Methods:
- Shellder -> Cloyster | Use Ice Stone (Accomodating Taaban)
- Shellder -> Cloyster | Use Ice Stone (Accomodating Disturban)
- Gloom -> Vileplume | Use Poison Stone (Accomodating Bellossom)
- Nidorino -> Nidoking | L36 OR use Poison Stone (Level up method from prototype, accomodating Nidoreign)
- Nidorina -> Nidoqueen | L36 OR use Poison Stone (Level up method from prototype, accomodating Nidoreign)
New Pokemon:
- Chansey -> Blissey | L45
- Ditto -> Animon | Use Metal Coat
- Ditto -> Mimmeo | Use Metal Coat
- Electabuzz -> Electivire | Use Thunder Stone
- Farfetch'd -> Madaamu | L24
- Farfetch'd -> Luxwan | L24
- Gloom -> Bellossom | Use Leaf Stone
- Golbat -> Crobat | L44
- Lickitung -> Lickilicky | L32
@ -287,7 +292,7 @@ New Pokemon:
- Magneton -> Magnezone | Use Thunder Stone
- Marowak -> Guardia | Use Heart Stone
- Onix -> Steelix | L38 OR use Metal Coat
- Pinsir -> Purakkusu | L42 OR use Metal Coat
- Pinsir -> Tricules | L42 OR use Metal Coat
- Poliwhirl -> Politoed | Use Heart Stone
- Porygon -> Porygon2 | Use Up-Grade
- Porygon2 -> Porygon-Z | Use Dubious Disc
@ -296,30 +301,28 @@ New Pokemon:
- Scyther -> Scizor | L41 OR use Metal Coat
- Scyther -> Kleavor | Use Black Augurite
- Seadra -> Kingdra | Trade
- Shellder -> Taaban | Use Water Stone
- Shellder -> Disturban | Use Water Stone
- Slowpoke -> Slowking | Use Heart Stone
- Tangela -> Tangrowth | L44
- Weepinbell -> Tsubomitto | Use Poison Stone
- Weepinbell -> Bellignan | Use Poison Stone
Kanto Beta Pokemon:
- Bittybat -> Zubat | L15
- Blastyke -> Blastoise | L36
- Blottle -> Pendraken | L30
- Cheep -> Jabetta | L30
- Decilla -> Gyaoon | L40
- Coinpur -> Meowth | L14
- Decilla -> Gawarhed | L40
- Gyopin -> Goldeen | L16
- Kokana -> Kasanagi | L7
- Kasanagi -> Carapthor | L10
- Konya -> Meowth | L14
- Kokana -> Pupal | L7
- Pupal -> Carapthor | L10
- Kotora -> Gaotora -> Gorotora | L16, L36
- Magnemite -> Magnetite -> Magneton | L20, L30
- Mikon -> Vulpix | L15
- Kolta -> Ponyta | L20
- Nidorino OR Nidorina -> Nidoreign | Moon Stone
- Psyduck -> Weirduck -> Golduck | L22, L33
- Puchikoon -> Ponyta | L20
- Raichu -> Gorochu | Trade
- Ribbito -> Croakozuna | L30
- Skimper -> Bawligua -> Cryithan | L30, L50
- Squeamata -> Ministare -> Iguanarch | L30, L50
- Vulpiii -> Vulpix | L15
- Wartortle -> Totartle | L36, replaces Blastoise
Eeveelutions:
@ -329,24 +332,6 @@ Eeveelutions:
- Glaceon | Ice Stone
- Sylveon | Moon Stone
The Evolution Stone Glitch is being made a feature by moving the Pokemon's constants appropriately. It happens by defeating a Pokemon using a certain Pokemon, while levelling up the respective Pokemon that wants to evolve. Thus, by using a stone, you now have a way to save on them, making all evolutions replicable as long as the Pokemon is kept in possession. We're making each Pokemon that applies to this glitch thematically appropriate.
The following will apply:
- Clefable for Moon Stone
- Electivire for Thunder Stone
- Magmortar for Fire Stone
- Poliwrath for Water Stone
- Politoed for Heart Stone
- Victreebel for Leaf Stone
- Tsubomitto for Poison Stone
- Cloyster for Ice Stone
- Melmetal for Candy Jar
- Kleavor for Black Augurite
- Porygon2 for Up-Grade
- Porygon-Z for Dubious Disc
- Rhyperior for Protector
- Steelix for Metal Coat
Accessing Regional variants
====
Adding regional variants was difficult; we hit the exact Pokemon cap by cutting their pre-evolutions. However, we managed to implement them quite nicely!
@ -377,8 +362,8 @@ KEP spriters hold the policy of requiring sprites to be used with direct credit
If you use our implementations of anything at all, it is encouraged to submit Pull Requests for bug fixes if you find any issues! We very much appreciate them!
* Plague von Karma - Creator of the Showdown Mod, Director, Developer, Scenarios, Balancing, Dialogue, Pokedex entries, Maps (Mt. Moon Crater, Galarian Bird dungeons, Rock Tunnel, Cinnabar Volcano floors, enhanced Diglett's Cave, Shinjuku Jacky's room, and more), Event scripting, Hyper Training, FRLG Tea, post-game rematches, male/female character selection, Meltan implementation, Yellow backports, and occasional spriter (assisting with Tsubomitto, Carapthor)
* Martha's Against Humanity - Developer, Pokémon implementation, Pokedex entries, Event scripting, tweaks of Albatross's sprites, Sylveon, Tsubomitto and Animon sprites, Maps (Citrine City, Cinnabar Volcano, Underwater Tunnel, Silph Gauntlet,), SGB border, new palettes for postgame areas and Game Corner, etc.
* Plague von Karma - Creator of the Showdown Mod, Director, Developer, Scenarios, Balancing, Dialogue, Pokedex entries, Maps (Mt. Moon Crater, Galarian Bird dungeons, Rock Tunnel, Cinnabar Volcano floors, enhanced Diglett's Cave, Shinjuku Jacky's room, and more), Event scripting, Hyper Training, FRLG Tea, post-game rematches, male/female character selection, Meltan implementation, Yellow backports, and occasional spriter (assisting with Bellignan, Carapthor)
* Martha's Against Humanity - Developer, Pokémon implementation, Pokedex entries, Event scripting, tweaks of Albatross's sprites, Sylveon, Bellignan and Mimmeo sprites, Maps (Citrine City, Cinnabar Volcano, Underwater Tunnel, Silph Gauntlet,), SGB border, new palettes for postgame areas and Game Corner, etc.
* Ema Skye - Developer, Maps (Silph Co. and Pokemon Tower shortening), Mt. Moon Crater Guard, Showdown Mod assistance.
* BlueZangoose / Vimescarrot - Pokemon box expansion, Instatext option, general assistance.
* Albatross - Many of the new sprites used in the hack (A significant number of post-Gen 1 evolutions, all regional variants, Meltan and Carapthor lines, etc.)

12
audio/play_battle_music.asm
View file

@ -24,21 +24,17 @@ PlayBattleMusic::
jr z, .legendaryBattle
cp MEW
jr z, .legendaryBattle
cp OMEGA
cp OMEGADGE
jr z, .legendaryBattle
cp SNORLAX ; Just like LGPE. Snorlax is basically a legendary in RBY, so I love this.
jr z, .legendaryBattle
cp VOLTORB ; The way this works makes the wild theme still play when encountering normal Voltorb/Electrode. Convenient and makes it work like LGPE.
jr z, .legendaryBattle
cp ELECTRODE
jr z, .legendaryBattle
cp DRATINI ; In the Tajiri lore, the Dratini family is considered legendary. Also, we have a static Dragonite. I think the appearance of Dratini in the Safari Zone with this theme could also add some reeeeeal nice hype to the whole ordeal.
jr z, .legendaryBattle
cp DRAGONAIR
jr z, .legendaryBattle
cp DRAGONITE
jr z, .legendaryBattle
cp ARTICUNO_G ; Temporary - plans for galar bird themes have been made.
cp ARTICUNO_G
jr z, .legendaryBattle
cp ZAPDOS_G
jr z, .legendaryBattle
@ -56,10 +52,10 @@ PlayBattleMusic::
jr z, .Elite4Battle
cp OPP_LANCE
jr z, .Elite4Battle
cp OPP_PROF_OAK ; could also use the final battle theme, but I think the gym leader/elite 4 theme fits better instead. I'm happy to change this if it isn't well-liked.
jr z, .Elite4Battle
cp OPP_RIVAL3
jr z, .finalBattle
cp OPP_PROF_OAK ; may as well, right?
jr z, .finalBattle
cp OPP_CHIEF
jr z, .finalBattle
jr nz, .normalTrainerBattle

113
constants/event_constants.asm
View file

@ -78,54 +78,6 @@
const EVENT_BEAT_MISTY
const EVENT_GOT_BICYCLE
; Silph Gauntlet events ; Why is there so much free space here, my god
; 1F Trainers
const_next $d1
const EVENT_BEAT_GAUNTLET_YOUNGSTER
const EVENT_BEAT_GAUNTLET_BUG_CATCHER
const EVENT_BEAT_GAUNTLET_STUDENT
const EVENT_BEAT_GAUNTLET_JR_TRAINER_M
const EVENT_BEAT_GAUNTLET_JR_TRAINER_F
const EVENT_BEAT_GAUNTLET_BIRD_KEEPER
; 2F Trainers
const EVENT_BEAT_GAUNTLET_LASS
const EVENT_BEAT_GAUNTLET_JUNIOR
const EVENT_BEAT_GAUNTLET_HIKER
const EVENT_BEAT_GAUNTLET_SUPER_NERD
const EVENT_BEAT_GAUNTLET_POKEMANIAC
const EVENT_BEAT_GAUNTLET_BLACK_BELT
; 3F Trainers
const EVENT_BEAT_GAUNTLET_SAILOR
const EVENT_BEAT_GAUNTLET_FIREFIGHTER
const EVENT_BEAT_GAUNTLET_GENTLEMAN
const EVENT_BEAT_GAUNTLET_ENGINEER
const EVENT_BEAT_GAUNTLET_ROCKER
const EVENT_BEAT_GAUNTLET_FISHER
const EVENT_BEAT_GAUNTLET_BEAUTY
; 4F Trainers
const EVENT_BEAT_GAUNTLET_SCIENTIST
const EVENT_BEAT_GAUNTLET_GAMBLER
const EVENT_BEAT_GAUNTLET_ROCKET
const EVENT_BEAT_GAUNTLET_BIKER
const EVENT_BEAT_GAUNTLET_BURGLAR
const EVENT_BEAT_GAUNTLET_CHANNELER
; 5F Trainers
const EVENT_BEAT_GAUNTLET_JUGGLER
const EVENT_BEAT_GAUNTLET_PSYCHIC
const EVENT_BEAT_GAUNTLET_CUE_BALL
const EVENT_BEAT_GAUNTLET_SWIMMER
const EVENT_BEAT_GAUNTLET_TAMER
const EVENT_BEAT_GAUNTLET_COOLTRAINER_F
const EVENT_BEAT_GAUNTLET_COOLTRAINER_M
; 6F Trainers
const EVENT_BEAT_GAUNTLET_BROCK
const EVENT_BEAT_GAUNTLET_MISTY
const EVENT_BEAT_GAUNTLET_SURGE
const EVENT_BEAT_GAUNTLET_ERIKA
const EVENT_BEAT_GAUNTLET_KOGA
const EVENT_BEAT_GAUNTLET_SABRINA
const EVENT_BEAT_GAUNTLET_BLAINE
; Lavender Town events
const_next $100 - 2
const EVENT_POKEMON_TOWER_RIVAL_ON_LEFT
@ -554,7 +506,7 @@
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_2
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3
const EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4
const EVENT_BEAT_GYAOON
const_skip
const EVENT_VICTORY_ROAD_2_BOULDER_ON_SWITCH2
; Route 24 events
@ -649,8 +601,6 @@
; New static encounter events
const_next $620
const_skip
const EVENT_BEAT_WUGTRIO
const_skip 7
const EVENT_BEAT_MEW
const_skip 7
const EVENT_BEAT_MOLTRES
@ -793,7 +743,7 @@
const EVENT_BEAT_OMEGA ; must be here
const EVENT_SILPH_CO_11_UNLOCKED_DOOR
const EVENT_GOT_CANDY_JAR
const EVENT_BEAT_CHIEF
const_skip
const EVENT_GOT_MASTER_BALL
const_skip
const EVENT_BEAT_SILPH_CO_GIOVANNI
@ -862,6 +812,65 @@ DEF INDIGO_PLATEAU_EVENTS_END EQU const_value - 1
const_skip 4
const EVENT_VICTORY_ROAD_1_BOULDER_ON_SWITCH
; Silph Gauntlet events
const_next $930
DEF SILPH_GAUNTLET_EVENTS_START EQU const_value
; 1F Trainers
const_skip
const EVENT_BEAT_GAUNTLET_YOUNGSTER
const EVENT_BEAT_GAUNTLET_BUG_CATCHER
const EVENT_BEAT_GAUNTLET_STUDENT
const EVENT_BEAT_GAUNTLET_JR_TRAINER_M
const EVENT_BEAT_GAUNTLET_JR_TRAINER_F
const EVENT_BEAT_GAUNTLET_BIRD_KEEPER
; 2F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_LASS
const EVENT_BEAT_GAUNTLET_HIKER
const EVENT_BEAT_GAUNTLET_SUPER_NERD
const EVENT_BEAT_GAUNTLET_POKEMANIAC
const EVENT_BEAT_GAUNTLET_BEAUTY
const EVENT_BEAT_GAUNTLET_BLACK_BELT
; 3F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_SAILOR
const EVENT_BEAT_GAUNTLET_FIREFIGHTER
const EVENT_BEAT_GAUNTLET_GENTLEMAN
const EVENT_BEAT_GAUNTLET_ENGINEER
const EVENT_BEAT_GAUNTLET_ROCKER
const EVENT_BEAT_GAUNTLET_FISHER
; 4F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_SCIENTIST
const EVENT_BEAT_GAUNTLET_GAMBLER
const EVENT_BEAT_GAUNTLET_ROCKET
const EVENT_BEAT_GAUNTLET_BIKER
const EVENT_BEAT_GAUNTLET_BURGLAR
const EVENT_BEAT_GAUNTLET_CHANNELER
; 5F Trainers
const_skip 2
const EVENT_BEAT_GAUNTLET_JUGGLER
const EVENT_BEAT_GAUNTLET_PSYCHIC
const EVENT_BEAT_GAUNTLET_CUE_BALL
const EVENT_BEAT_GAUNTLET_SWIMMER
const EVENT_BEAT_GAUNTLET_TAMER
const EVENT_BEAT_GAUNTLET_COOLTRAINER_F
const EVENT_BEAT_GAUNTLET_COOLTRAINER_M
; 6F Trainers
const_skip
const EVENT_BEAT_GAUNTLET_BROCK
const EVENT_BEAT_GAUNTLET_MISTY
const EVENT_BEAT_GAUNTLET_SURGE
const EVENT_BEAT_GAUNTLET_ERIKA
const EVENT_BEAT_GAUNTLET_KOGA
const EVENT_BEAT_GAUNTLET_SABRINA
const EVENT_BEAT_GAUNTLET_BLAINE
const_skip
const EVENT_BEAT_CHIEF
const_skip 5
const_skip
DEF SILPH_GAUNTLET_EVENTS_END EQU const_value - 1
; Rock Tunnel events
const_next $9B0
const_skip

16
constants/hide_show_constants.asm
View file

@ -105,7 +105,7 @@ DEF SHOW EQU $15
const HS_POWER_PLANT_ITEM_3 ; 5B X
const HS_POWER_PLANT_ITEM_4 ; 5C X
const HS_POWER_PLANT_ITEM_5 ; 5D X
const HS_GYAOON ; 5E X
const HS_VICTORY_ROAD_2F_ITEM_0 ; 5E X
const HS_VICTORY_ROAD_2F_ITEM_1 ; 5F X
const HS_VICTORY_ROAD_2F_ITEM_2 ; 60 X
const HS_VICTORY_ROAD_2F_ITEM_3 ; 61 X
@ -137,7 +137,6 @@ DEF SHOW EQU $15
const HS_SS_ANNE_B1F_ROOMS_ITEM_1 ; 7B X
const HS_SS_ANNE_B1F_ROOMS_ITEM_2 ; 7C X
const HS_SS_ANNE_B1F_ROOMS_ITEM_3 ; 7D X
const HS_WUGTRIO ; 7E X
const HS_VICTORY_ROAD_3F_ITEM_1 ; 7F X
const HS_VICTORY_ROAD_3F_ITEM_2 ; 80 X
const HS_VICTORY_ROAD_3F_BOULDER ; 81
@ -165,12 +164,7 @@ DEF SHOW EQU $15
const HS_SILPH_CO_3F_1 ; 97
const HS_SILPH_CO_3F_2 ; 98
const HS_SILPH_CO_3F_ITEM ; 99 X
const HS_SILPH_CO_4F_1 ; 9A
const HS_SILPH_CO_4F_2 ; 9B
const HS_SILPH_CO_4F_3 ; 9C
const HS_SILPH_CO_4F_ITEM_1 ; 9D X
const HS_SILPH_CO_4F_ITEM_2 ; 9E X
const HS_SILPH_CO_4F_ITEM_3 ; 9F X
const HS_SILPH_CO_5F_1 ; A0
const HS_SILPH_CO_5F_2 ; A1
const HS_SILPH_CO_5F_3 ; A2
@ -178,11 +172,7 @@ DEF SHOW EQU $15
const HS_SILPH_CO_5F_ITEM_1 ; A4 X
const HS_SILPH_CO_5F_ITEM_2 ; A5 X
const HS_SILPH_CO_5F_ITEM_3 ; A6 X
const HS_SILPH_CO_6F_1 ; A7
const HS_SILPH_CO_6F_2 ; A8
const HS_SILPH_CO_6F_3 ; A9
const HS_SILPH_CO_6F_ITEM_1 ; AA X
const HS_SILPH_CO_6F_ITEM_2 ; AB X
const HS_SILPH_CO_7F_1 ; AC
const HS_SILPH_CO_7F_2 ; AE
const HS_SILPH_CO_7F_3 ; AF

10
constants/map_constants.asm
View file

@ -166,8 +166,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const LAVENDER_POKECENTER, 7, 4 ; $8F
map_const POKEMON_TOWER_1F, 10, 9 ; $90
map_const POKEMON_TOWER_2F, 10, 9 ; $91
map_const BRUNSWICK_GROTTO, 15, 12 ; $92
; map_const POKEMON_TOWER_3F, 10, 9 ; $92 - Currently unused
map_const BRUNSWICK_GROTTO, 15, 12 ; $92 - Was Pokemon Tower 3F
map_const POKEMON_TOWER_4F, 10, 9 ; $93 - Currently unused
map_const POKEMON_TOWER_5F, 10, 9 ; $94 - Currently unused
map_const POKEMON_TOWER_6F, 10, 9 ; $95
@ -229,13 +228,12 @@ DEF FIRST_INDOOR_MAP EQU const_value
map_const CITRINE_MART, 4, 4 ; $CD - was UNUSED_MAP_CC
map_const GARNET_CAVERN_1F, 15, 9 ; $CE - was UNUSED_MAP_CD
map_const GARNET_CAVERN_B1F, 15, 9 ; $CF - was UNUSED_MAP_CE
map_const SILPH_CO_2F, 15, 9 ; $D0
map_const VERMILION_FERRY_DOCK, 14, 6 ; $D0 - was SILPH_CO_2F
map_const SILPH_CO_3F, 15, 9 ; $D1
map_const SILPH_CO_4F, 15, 9 ; $D2
map_const CITRINE_FERRY_DOCK, 14, 6 ; $D2 - was SILPH_CO_4F
map_const SILPH_CO_5F, 15, 9 ; $D3
map_const SILPH_CO_6F, 13, 9 ; $D4
map_const SEAGALLOP_FERRY, 5, 4 ; $D4 - was SILPH_CO_6F
map_const SILPH_CO_7F, 13, 9 ; $D5
;map_const SILPH_CO_8F, 13, 9 ; $D6
map_const POKEMON_MANSION_2F, 15, 14 ; $D7
map_const POKEMON_MANSION_3F, 15, 9 ; $D8
map_const POKEMON_MANSION_B1F, 15, 14 ; $D9

385
constants/pokedex_constants.asm
View file

@ -32,7 +32,7 @@
const DEX_PIDGEY ; 16 (026)
const DEX_PIDGEOTTO ; 17 (027)
const DEX_PIDGEOT ; 18 (028)
const DEX_KONYA ; (029) - Route 2 + Viridian Forest
const DEX_COINPUR ; (029) - Route 2 + Viridian Forest
const DEX_MEOWTH ; 52 (030)
const DEX_PERSIAN ; 53 (031)
const DEX_PERSIAN_A ; (032)
@ -44,88 +44,88 @@
const DEX_KAKUNA ; 14 (038)
const DEX_BEEDRILL ; 15 (039)
const DEX_KOKANA ; (040)
const DEX_KASANAGI ; (041)
const DEX_PUPAL ; (041)
const DEX_CARAPTHOR ; (042)
const DEX_SPEAROW ; 21 (043) - Route 3
const DEX_FEAROW ; 22 (044)
const DEX_EKANS ; 23 (045)
const DEX_ARBOK ; 24 (046)
const DEX_SANDSHREW ; 27 (047)
const DEX_SANDSLASH ; 28 (048)
const DEX_SANDSLASH_A ; (049)
const DEX_NIDORAN_F ; 29 (050)
const DEX_NIDORINA ; 30 (051)
const DEX_NIDOQUEEN ; 31 (052)
const DEX_NIDORAN_M ; 32 (053)
const DEX_NIDORINO ; 33 (054)
const DEX_NIDOKING ; 34 (055)
const DEX_NIDOREIGN ; (056)
const DEX_BITTYBAT ; (057) - Mt. Moon
const DEX_ZUBAT ; 41 (058)
const DEX_GOLBAT ; 42 (059)
const DEX_CROBAT ; (060)
const DEX_GEODUDE ; 74 (061)
const DEX_GRAVELER ; 75 (062)
const DEX_GOLEM ; 76 (063)
const DEX_GOLEM_A ; (064)
const DEX_PARAS ; 46 (065)
const DEX_PARASECT ; 47 (066)
const DEX_CLEFAIRY ; 35 (067)
const DEX_CLEFABLE ; 36 (068)
const DEX_JIGGLYPUFF ; 39 (069) - Route 4
const DEX_WIGGLYTUFF ; 40 (070)
const DEX_MIKON ; (071)
const DEX_VULPIX ; 37 (072)
const DEX_NINETALES ; 38 (073)
const DEX_NINETALES_A ; (074)
const DEX_GROWLITHE ; 58 (075)
const DEX_ARCANINE ; 59 (076)
const DEX_ARCANINE_H ; (077)
const DEX_MANKEY ; 56 (078)
const DEX_PRIMEAPE ; 57 (079)
const DEX_ANNIHILAPE ; (080)
const DEX_ODDISH ; 43 (081) - Route 24 + Route 25 + Fishing Rod 1
const DEX_GLOOM ; 44 (082)
const DEX_VILEPLUME ; 45 (083)
const DEX_BELLOSSOM ; (084)
const DEX_BELLSPROUT ; 69 (085)
const DEX_WEEPINBELL ; 70 (086)
const DEX_VICTREEBEL ; 71 (087)
const DEX_TSUBOMITTO ; (088)
const DEX_MAGIKARP ; 129 (089)
const DEX_GYARADOS ; 130 (090)
const DEX_GYOPIN ; (091)
const DEX_GOLDEEN ; 118 (092)
const DEX_SEAKING ; 119 (093)
const DEX_VENONAT ; 48 (094)
const DEX_VENOMOTH ; 49 (095)
const DEX_CHEEP ; (096)
const DEX_JABETTA ; (097)
const DEX_PSYDUCK ; 54 (098)
const DEX_WEIRDUCK ; (099)
const DEX_GOLDUCK ; 55 (100)
const DEX_POLIWAG ; 60 (101)
const DEX_POLIWHIRL ; 61 (102)
const DEX_POLIWRATH ; 62 (103)
const DEX_POLITOED ; (104)
const DEX_ABRA ; 63 (105)
const DEX_KADABRA ; 64 (106)
const DEX_ALAKAZAM ; 65 (107)
const DEX_KOTORA ; (043)
const DEX_GAOTORA ; (044)
const DEX_GOROTORA ; (045)
const DEX_SPEAROW ; 21 (046) - Route 3 + Mt. Moon
const DEX_FEAROW ; 22 (047)
const DEX_NIDORAN_F ; 29 (048)
const DEX_NIDORINA ; 30 (049)
const DEX_NIDOQUEEN ; 31 (050)
const DEX_NIDORAN_M ; 32 (051)
const DEX_NIDORINO ; 33 (052)
const DEX_NIDOKING ; 34 (053)
const DEX_NIDOREIGN ; (054)
const DEX_ZUBAT ; 41 (055)
const DEX_GOLBAT ; 42 (056)
const DEX_CROBAT ; (057)
const DEX_GEODUDE ; 74 (058)
const DEX_GRAVELER ; 75 (059)
const DEX_GOLEM ; 76 (060)
const DEX_GOLEM_A ; (061)
const DEX_PARAS ; 46 (062)
const DEX_PARASECT ; 47 (063)
const DEX_CLEFAIRY ; 35 (064)
const DEX_CLEFABLE ; 36 (065)
const DEX_JIGGLYPUFF ; 39 (066)
const DEX_WIGGLYTUFF ; 40 (067)
const DEX_SANDSHREW ; 27 (068)
const DEX_SANDSLASH ; 28 (069)
const DEX_SANDSLASH_A ; (070)
const DEX_EKANS ; 23 (071) - Route 4
const DEX_ARBOK ; 24 (072)
const DEX_VULPIII ; (073)
const DEX_VULPIX ; 37 (074)
const DEX_NINETALES ; 38 (075)
const DEX_NINETALES_A ; (076)
const DEX_MANKEY ; 56 (077)
const DEX_PRIMEAPE ; 57 (078)
const DEX_ANNIHILAPE ; (079)
const DEX_ODDISH ; 43 (080) - Route 6 + Route 24 + Route 25 + Fishing Rod 1
const DEX_GLOOM ; 44 (081)
const DEX_VILEPLUME ; 45 (082)
const DEX_BELLOSSOM ; (083)
const DEX_BELLSPROUT ; 69 (084)
const DEX_WEEPINBELL ; 70 (085)
const DEX_VICTREEBEL ; 71 (086)
const DEX_BELLIGNAN ; (087)
const DEX_MAGIKARP ; 129 (088)
const DEX_GYARADOS ; 130 (089)
const DEX_ORFRY ; (090)
const DEX_GOLDEEN ; 118 (091)
const DEX_SEAKING ; 119 (092)
const DEX_VENONAT ; 48 (093)
const DEX_VENOMOTH ; 49 (094)
const DEX_PSYDUCK ; 54 (095)
const DEX_WEIRDUCK ; (096)
const DEX_GOLDUCK ; 55 (097)
const DEX_POLIWAG ; 60 (098)
const DEX_POLIWHIRL ; 61 (099)
const DEX_POLIWRATH ; 62 (100)
const DEX_POLITOED ; (101)
const DEX_ABRA ; 63 (102)
const DEX_KADABRA ; 64 (103)
const DEX_ALAKAZAM ; 65 (104)
const DEX_GROWLITHE ; 58 (105)
const DEX_ARCANINE ; 59 (106)
const DEX_ARCANINE_H ; (107)
const DEX_LICKITUNG ; 108 (108) (There's a reason we're keeping Lickitung's number.)
const DEX_LICKILICKY ; (109)
const DEX_DROWZEE ; 96 (110) - Route 11 + Diglett's Cave
const DEX_HYPNO ; 97 (111)
const DEX_DIGLETT ; 50 (112)
const DEX_DUGTRIO ; 51 (113)
const DEX_DUGTRIO_A ; (114)
const DEX_WIGLETT ; (115)
const DEX_WUGTRIO ; (116)
const DEX_ONIX ; 95 (117)
const DEX_STEELIX ; (118)
const DEX_KOTORA ; (119) - Route 10 + Rock Tunnel + Fishing Rod 2
const DEX_GAOTORA ; (120)
const DEX_GOROTORA ; (121)
const DEX_VOLTORB ; 100 (122)
const DEX_FARFETCHD ; 83 (110)
const DEX_LUXWAN ; (111)
const DEX_SIRFETCHD ; (112)
const DEX_DROWZEE ; 96 (113) - Route 11 + Diglett's Cave
const DEX_HYPNO ; 97 (114)
const DEX_DIGLETT ; 50 (115)
const DEX_DUGTRIO ; 51 (116)
const DEX_DUGTRIO_A ; (117)
const DEX_WIGLETT ; (118)
const DEX_WUGTRIO ; (119)
const DEX_ONIX ; 95 (120)
const DEX_STEELIX ; (121)
const DEX_VOLTORB ; 100 (122) - Route 10 + Rock Tunnel + Fishing Rod 2
const DEX_ELECTRODE ; 101 (123)
const DEX_ELECTRODE_H ; (124)
const DEX_TENTACOOL ; 72 (125)
@ -134,16 +134,16 @@
const DEX_TOEDSCRUEL ; (128)
const DEX_BLOTTLE ; (129)
const DEX_PENDRAKEN ; (130)
const DEX_RIBBITO ; (131)
const DEX_CROAKOZUNA ; (132)
const DEX_MAGNEMITE ; 81 (133)
const DEX_MAGNETITE ; (134)
const DEX_MAGNETON ; 82 (135)
const DEX_MAGNEZONE ; (136)
const DEX_MACHOP ; 66 (137)
const DEX_MACHOKE ; 67 (138)
const DEX_MACHAMP ; 68 (139)
const DEX_CROCKY ; (140)
const DEX_MAGNEMITE ; 81 (131)
const DEX_MAGNETON ; 82 (132)
const DEX_MAGNEZONE ; (133)
const DEX_CHEEP ; (134)
const DEX_JABETTA ; (135)
const DEX_RIBBITO ; (136)
const DEX_CROAKOZUNA ; (137)
const DEX_MACHOP ; 66 (138)
const DEX_MACHOKE ; 67 (139)
const DEX_MACHAMP ; 68 (140)
const DEX_KRABBY ; 98 (141)
const DEX_KINGLER ; 99 (142)
const DEX_SLOWPOKE ; 79 (143)
@ -151,109 +151,106 @@
const DEX_SLOWBRO_G ; (145)
const DEX_SLOWKING ; (146)
const DEX_SLOWKING_G ; (147)
const DEX_PUCHIKOON ; (148) - Route 7 + Route 8
const DEX_PONYTA ; 77 (149)
const DEX_RAPIDASH ; 78 (150)
const DEX_RAPIDASH_G ; (151)
const DEX_DEER ; (152)
const DEX_MONJA ; (153)
const DEX_TANGELA ; 114 (154)
const DEX_TANGROWTH ; (155)
const DEX_BARUNDA ; (156)
const DEX_GASTLY ; 92 (157) - Lavender Tower
const DEX_HAUNTER ; 93 (158)
const DEX_GENGAR ; 94 (159)
const DEX_CUBONE ; 104 (160)
const DEX_MAROWAK ; 105 (161)
const DEX_MAROWAK_A ; (162)
const DEX_GUARDIA ; (163)
const DEX_FARFETCHD ; 83 (164) - Routes 13-18
const DEX_MADAAMU ; (165)
const DEX_SIRFETCHD ; (166)
const DEX_DODUO ; 84 (167)
const DEX_DODRIO ; 85 (168)
const DEX_GRIMER ; 88 (169)
const DEX_MUK ; 89 (170)
const DEX_MUK_A ; (171)
const DEX_KOFFING ; 109 (172)
const DEX_WEEZING ; 110 (173)
const DEX_WEEZING_G ; (174)
const DEX_DITTO ; 132 (175)
const DEX_ANIMON ; (176)
const DEX_MR_MIME ; 122 (177)
const DEX_MR_RIME ; (178)
const DEX_CACTUS ; (179)
const DEX_HITMONLEE ; 106 (180) - Saffron City
const DEX_HITMONCHAN ; 107 (181)
const DEX_HITMONTOP ; (182)
const DEX_SHELLDER ; 90 (183) - Surfing, Fishing Rod 3, Seafoam Islands
const DEX_CLOYSTER ; 91 (184)
const DEX_TAABAN ; (185)
const DEX_STARYU ; 120 (186)
const DEX_STARMIE ; 121 (187)
const DEX_SEEL ; 86 (188)
const DEX_DEWGONG ; 87 (189)
const DEX_BLASTYKE ; (190)
const DEX_BLASTOISE ; 9 (191)
const DEX_HORSEA ; 116 (192)
const DEX_SEADRA ; 117 (193)
const DEX_KINGDRA ; (194)
const DEX_JAGG ; (195)
const DEX_EXEGGCUTE ; 102 (196) - Safari Zone
const DEX_EXEGGUTOR ; 103 (197)
const DEX_EXEGGUTOR_A ; (198)
const DEX_RHYHORN ; 111 (199)
const DEX_RHYDON ; 112 (200)
const DEX_RHYPERIOR ; (201)
const DEX_SCYTHER ; 123 (202)
const DEX_SCIZOR ; (203)
const DEX_KLEAVOR ; (204)
const DEX_PINSIR ; 127 (205)
const DEX_PURAKKUSU ; (206)
const DEX_KANGASKHAN ; 115 (207)
const DEX_TRAMPEL ; (208)
const DEX_TAUROS ; 128 (209)
const DEX_TAUROS_P ; (210)
const DEX_TAUROS_PA ; (211)
const DEX_TAUROS_PB ; (212)
const DEX_CHANSEY ; 113 (213)
const DEX_BLISSEY ; (214)
const DEX_SKIMPER ; (215) - Rare/Special Pokemon
const DEX_BAWLIGUA ; (216)
const DEX_CRYITHAN ; (217)
const DEX_JYNX ; 124 (218)
const DEX_BUU ; (219)
const DEX_ELECTABUZZ ; 125 (220)
const DEX_ELECTIVIRE ; (221)
const DEX_MAGMAR ; 126 (222)
const DEX_MAGMORTAR ; (223)
const DEX_LAPRAS ; 131 (224)
const DEX_PORYGON ; 137 (225)
const DEX_PORYGON2 ; (226)
const DEX_PORYGONZ ; (227)
const DEX_OMANYTE ; 138 (228)
const DEX_OMASTAR ; 139 (229)
const DEX_KABUTO ; 140 (230)
const DEX_KABUTOPS ; 141 (231)
const DEX_AERODACTYL ; 142 (232)
const DEX_DECILLA ; (233)
const DEX_GYAOON ; (234)
const DEX_OMEGA ; (235)
const DEX_SNORLAX ; 143 (236)
const DEX_SCREAM_TAIL ; (237) - Paradoxes, Legendary and Mythical Pokemon
const DEX_SANDY_SHOCKS ; (238)
const DEX_DRATINI ; 147 (239)
const DEX_DRAGONAIR ; 148 (240)
const DEX_DRAGONITE ; 149 (241)
const DEX_ARTICUNO ; 144 (242)
const DEX_ARTICUNO_G ; (243)
const DEX_ZAPDOS ; 145 (244)
const DEX_ZAPDOS_G ; (245)
const DEX_MOLTRES ; 146 (246)
const DEX_MOLTRES_G ; (247)
const DEX_MEWTWO ; 150 (248)
const DEX_MEW ; 151 (249)
const DEX_MELTAN ; (250)
const DEX_MELMETAL ; (251)
const DEX_GAVILLAIN ; (148)
const DEX_KOLTA ; (149) - Route 7 + Route 8
const DEX_PONYTA ; 77 (150)
const DEX_RAPIDASH ; 78 (151)
const DEX_RAPIDASH_G ; (152)
const DEX_BALUMBA ; (153)
const DEX_GASTLY ; 92 (154) - Lavender Tower
const DEX_HAUNTER ; 93 (155)
const DEX_GENGAR ; 94 (156)
const DEX_CUBONE ; 104 (157)
const DEX_MAROWAK ; 105 (158)
const DEX_MAROWAK_A ; (159)
const DEX_GUARDIA ; (160)
const DEX_DODUO ; 84 (161) - Route 16 - 19
const DEX_DODRIO ; 85 (162)
const DEX_GRIMER ; 88 (163)
const DEX_MUK ; 89 (164)
const DEX_MUK_A ; (165)
const DEX_KOFFING ; 109 (166)
const DEX_WEEZING ; 110 (167)
const DEX_WEEZING_G ; (168)
const DEX_TANGELA ; 114 (169)
const DEX_TANGROWTH ; (170)
const DEX_RAMOOSE ; (171)
const DEX_HITMONLEE ; 106 (172) - Saffron City
const DEX_HITMONCHAN ; 107 (173)
const DEX_HITMONTOP ; (174)
const DEX_SHELLDER ; 90 (175) - Surfing, Fishing Rod 3, Seafoam Islands
const DEX_CLOYSTER ; 91 (176)
const DEX_DISTURBAN ; (177)
const DEX_STARYU ; 120 (178)
const DEX_STARMIE ; 121 (179)
const DEX_SEEL ; 86 (180)
const DEX_DEWGONG ; 87 (181)
const DEX_HORSEA ; 116 (182)
const DEX_SEADRA ; 117 (183)
const DEX_KINGDRA ; (184)
const DEX_BLASTYKE ; (185)
const DEX_BLASTOISE ; 9 (186)
const DEX_SHARPOON ; (187)
const DEX_EXEGGCUTE ; 102 (188) - Safari Zone
const DEX_EXEGGUTOR ; 103 (189)
const DEX_EXEGGUTOR_A ; (190)
const DEX_RHYHORN ; 111 (191)
const DEX_RHYDON ; 112 (192)
const DEX_RHYPERIOR ; (193)
const DEX_SCYTHER ; 123 (194)
const DEX_SCIZOR ; (195)
const DEX_KLEAVOR ; (196)
const DEX_PINSIR ; 127 (197)
const DEX_TRICULES ; (198)
const DEX_KANGASKHAN ; 115 (199)
const DEX_TRAMPEL ; (200)
const DEX_TAUROS ; 128 (201)
const DEX_TAUROS_P ; (202)
const DEX_TAUROS_PB ; (203)
const DEX_TAUROS_PA ; (204)
const DEX_CHANSEY ; 113 (205)
const DEX_BLISSEY ; (206)
const DEX_CACTORMUS ; (207) - Rare/Special Pokemon
const DEX_MR_MIME ; 122 (208)
const DEX_MR_RIME ; (209)
const DEX_JYNX ; 124 (210)
const DEX_BUU ; (211)
const DEX_ELECTABUZZ ; 125 (212)
const DEX_ELECTIVIRE ; (213)
const DEX_MAGMAR ; 126 (214)
const DEX_MAGMORTAR ; (215)
const DEX_LAPRAS ; 131 (216)
const DEX_DITTO ; 132 (217)
const DEX_MIMMEO ; (218)
const DEX_PORYGON ; 137 (219)
const DEX_PORYGON2 ; (220)
const DEX_PORYGONZ ; (221)
const DEX_OMANYTE ; 138 (222)
const DEX_OMASTAR ; 139 (223)
const DEX_KABUTO ; 140 (224)
const DEX_KABUTOPS ; 141 (225)
const DEX_AERODACTYL ; 142 (226)
const DEX_DECILLA ; (227)
const DEX_GAWARHED ; (228)
const DEX_OMEGADGE ; (229)
const DEX_SNORLAX ; 143 (230)
const DEX_SCREAM_TAIL ; (231) - Paradoxes, (Pseudo-)Legendary and Mythical Pokemon
const DEX_SANDY_SHOCKS ; (232)
const DEX_SQUEAMATA ; (233)
const DEX_MINISTARE ; (234)
const DEX_IGUANARCH ; (235)
const DEX_DRATINI ; 147 (236)
const DEX_DRAGONAIR ; 148 (237)
const DEX_DRAGONITE ; 149 (238)
const DEX_ARTICUNO ; 144 (239)
const DEX_ARTICUNO_G ; (240)
const DEX_ZAPDOS ; 145 (241)
const DEX_ZAPDOS_G ; (242)
const DEX_MOLTRES ; 146 (243)
const DEX_MOLTRES_G ; (244)
const DEX_MEWTWO ; 150 (245)
const DEX_MEW ; 151 (246)
const DEX_MELTAN ; (247)
const DEX_MELMETAL ; (248)
DEF NUM_POKEMON EQU const_value - 1

189
constants/pokemon_constants.asm
View file

@ -16,7 +16,7 @@
const NIDOKING ; $07
const SLOWBRO ; $08
const IVYSAUR ; $09
const EXEGGUTOR ; $0A - Moon Stone (Evo Stone Glitch)
const EXEGGUTOR ; $0A
const LICKITUNG ; $0B
const EXEGGCUTE ; $0C
const GRIMER ; $0D
@ -37,10 +37,10 @@
const BLASTOISE ; $1C
const PINSIR ; $1D
const TANGELA ; $1E
const GYAOON ; $1F (new)
const NIDOREIGN ; $20 (new) Fire Stone (Evo Stone Glitch)
const GROWLITHE ; $21 - Thunderstone (Evo Stone Glitch)
const ONIX ; $22 - Water Stone (Evo Stone Glitch)
const GAWARHED ; $1F (new)
const NIDOREIGN ; $20 (new)
const GROWLITHE ; $21
const ONIX ; $22
const FEAROW ; $23
const PIDGEY ; $24
const SLOWPOKE ; $25
@ -50,58 +50,58 @@
const MACHOKE ; $29
const MR_MIME ; $2A
const HITMONLEE ; $2B
const HITMONCHAN ; $2C - Heart Stone (Evo Stone Glitch)
const HITMONCHAN ; $2C
const ARBOK ; $2D
const PARASECT ; $2E
const PSYDUCK ; $2F - Leaf Stone (Evo Stone Glitch)
const PSYDUCK ; $2F
const DROWZEE ; $30
const GOLEM ; $31
const BARUNDA ; $32 (new)
const BALUMBA ; $32 (new)
const MAGMAR ; $33
const BUU ; $34 (new)
const ELECTABUZZ ; $35
const MAGNETON ; $36
const KOFFING ; $37
const DEER ; $38 (new)
const RAMOOSE ; $38 (new)
const MANKEY ; $39
const SEEL ; $3A
const DIGLETT ; $3B
const TAUROS ; $3C
const TRAMPEL ; $3D (new)
const CROCKY ; $3E (new)
const GAVILLAIN ; $3E (new)
const BLOTTLE ; $3F (new)
const FARFETCHD ; $40
const VENONAT ; $41
const DRAGONITE ; $42
const CACTUS ; $43 (new)
const JAGG ; $44 (new)
const BITTYBAT ; $45 (new)
const CACTORMUS ; $43 (new)
const SHARPOON ; $44 (new)
const WIGLETT ; $45 (new)
const DODUO ; $46
const POLIWAG ; $47
const JYNX ; $48
const MOLTRES ; $49
const ARTICUNO ; $4A
const ZAPDOS ; $4B
const DITTO ; $4C - Candy Jar (Evo Stone Glitch)
const DITTO ; $4C
const MEOWTH ; $4D
const KRABBY ; $4E
const CHEEP ; $4F (new)
const JABETTA ; $50 (new)
const MIKON ; $51 (new)
const VULPIII ; $51 (new)
const VULPIX ; $52
const NINETALES ; $53
const PIKACHU ; $54 - Ice Stone (Evo Stone Glitch)
const RAICHU ; $55 - Protector (Evo Stone Glitch)
const RIBBITO ; $56 (new) Poison Stone (Evo Stone Glitch)
const CROAKOZUNA ; $57 (new) Black Augurite (Evo Stone Glitch)
const DRATINI ; $58 - Dubious Disc (Evo Stone Glitch)
const PIKACHU ; $54
const RAICHU ; $55
const RIBBITO ; $56 (new)
const CROAKOZUNA ; $57 (new)
const DRATINI ; $58
const DRAGONAIR ; $59
const KABUTO ; $5A
const KABUTOPS ; $5B - Up-Grade (Evo Stone Glitch)
const HORSEA ; $5C - Metal Coat (Evo Stone Glitch)
const KABUTOPS ; $5B
const HORSEA ; $5C
const SEADRA ; $5D
const BAWLIGUA ; $5E (new)
const CRYITHAN ; $5F (new)
const MINISTARE ; $5E (new)
const IGUANARCH ; $5F (new)
const SANDSHREW ; $60
const SANDSLASH ; $61
const OMANYTE ; $62
@ -121,13 +121,13 @@
const WEEDLE ; $70
const KAKUNA ; $71
const BEEDRILL ; $72
const MADAAMU ; $73 (new)
const LUXWAN ; $73 (new)
const DODRIO ; $74
const PRIMEAPE ; $75
const DUGTRIO ; $76
const VENOMOTH ; $77
const DEWGONG ; $78
const PURAKKUSU ; $79 (new)
const TRICULES ; $79 (new)
const PENDRAKEN ; $7A (new)
const CATERPIE ; $7B
const METAPOD ; $7C
@ -140,13 +140,13 @@
const MEWTWO ; $83
const SNORLAX ; $84
const MAGIKARP ; $85
const KONYA ; $86 (new)
const OMEGA ; $87 (new)
const COINPUR ; $86 (new)
const OMEGADGE ; $87 (new)
const MUK ; $88
const DECILLA ; $89 (new)
const KINGLER ; $8A
const CLOYSTER ; $8B
const MAGNETITE ; $8C (new)
const WUGTRIO ; $8C (new)
const ELECTRODE ; $8D
const CLEFABLE ; $8E
const WEEZING ; $8F
@ -162,13 +162,13 @@
const BULBASAUR ; $99
const VENUSAUR ; $9A
const TENTACRUEL ; $9B
const GYOPIN ; $9C (new)
const ORFRY ; $9C (new)
const GOLDEEN ; $9D
const SEAKING ; $9E
const KOTORA ; $9F (new)
const GAOTORA ; $A0 (new)
const GOROTORA ; $A1 (new)
const PUCHIKOON ; $A2 (new)
const KOLTA ; $A2 (new)
const PONYTA ; $A3
const RAPIDASH ; $A4
const RATTATA ; $A5
@ -180,7 +180,7 @@
const AERODACTYL ; $AB
const BLASTYKE ; $AC (new)
const MAGNEMITE ; $AD
const SKIMPER ; $AE (new)
const SQUEAMATA ; $AE (new)
const GOROCHU ; $AF (new)
const CHARMANDER ; $B0
const SQUIRTLE ; $B1
@ -197,70 +197,67 @@
const BELLSPROUT ; $BC
const WEEPINBELL ; $BD
const VICTREEBEL ; $BE
const MONJA ; $BF (new pokemon start here)
const SCIZOR ; $C0
const RHYPERIOR ; $C1
const ESPEON ; $C2
const UMBREON ; $C3
const LEAFEON ; $C4
const GLACEON ; $C5
const SYLVEON ; $C6
const LICKILICKY ; $C7
const TANGROWTH ; $C8
const KLEAVOR ; $C9
const TSUBOMITTO ; $CA
const STEELIX ; $CB
const BLISSEY ; $CC
const HITMONTOP ; $CD
const CROBAT ; $CE
const ANIMON ; $CF
const BELLOSSOM ; $D0
const PORYGON2 ; $D1
const KINGDRA ; $D2
const POLITOED ; $D3
const SLOWKING ; $D4
const ELECTIVIRE ; $D5
const MAGMORTAR ; $D6
const TAABAN ; $D7
const KOKANA ; $D8
const KASANAGI ; $D9
const CARAPTHOR ; $DA
const MAGNEZONE ; $DB
const PORYGONZ ; $DC
const ANNIHILAPE ; $DD
const SCREAM_TAIL ; $DE
const SANDY_SHOCKS ; $DF
const WIGLETT ; $E0
const WUGTRIO ; $E1
const TOEDSCOOL ; $E2
const TOEDSCRUEL ; $E3
const PERRSERKER ; $E4
const SIRFETCHD ; $E5
const MR_RIME ; $E6
const MELTAN ; $E7
const MELMETAL ; $E8
const ARCANINE_H ; $E9
const ELECTRODE_H ; $EA
const RATICATE_A ; $EB
const RAICHU_A ; $EC
const SANDSLASH_A ; $ED
const NINETALES_A ; $EE
const DUGTRIO_A ; $EF
const PERSIAN_A ; $F0
const GOLEM_A ; $F1
const RAPIDASH_G ; $F2
const SLOWBRO_G ; $F3
const SLOWKING_G ; $F4
const MUK_A ; $F5
const EXEGGUTOR_A ; $F6
const MAROWAK_A ; $F7
const WEEZING_G ; $F8
const TAUROS_P ; $F9
const TAUROS_PA ; $FA
const TAUROS_PB ; $FB
const FOSSIL_KABUTOPS ; $FC (was B6)
const FOSSIL_AERODACTYL ; $FD (was B7)
const MON_GHOST ; $FE (was B8)
const SCIZOR ; $BF (new pokemon start here)
const RHYPERIOR ; $C0
const ESPEON ; $C1
const UMBREON ; $C2
const LEAFEON ; $C3
const GLACEON ; $C4
const SYLVEON ; $C5
const LICKILICKY ; $C6
const TANGROWTH ; $C7
const KLEAVOR ; $C8
const BELLIGNAN ; $C9
const STEELIX ; $CA
const BLISSEY ; $CB
const HITMONTOP ; $CC
const CROBAT ; $CD
const MIMMEO ; $CE
const BELLOSSOM ; $CF
const PORYGON2 ; $D0
const KINGDRA ; $D1
const POLITOED ; $D2
const SLOWKING ; $D3
const ELECTIVIRE ; $D4
const MAGMORTAR ; $D5
const DISTURBAN ; $D6
const KOKANA ; $D7
const PUPAL ; $D8
const CARAPTHOR ; $D9
const MAGNEZONE ; $DA
const PORYGONZ ; $DB
const ANNIHILAPE ; $DC
const SCREAM_TAIL ; $DD
const SANDY_SHOCKS ; $DE
const TOEDSCOOL ; $DF
const TOEDSCRUEL ; $E0
const PERRSERKER ; $E1
const SIRFETCHD ; $E2
const MR_RIME ; $E3
const MELTAN ; $E4
const MELMETAL ; $E5
const ARCANINE_H ; $E6
const ELECTRODE_H ; $E7
const RATICATE_A ; $E8
const RAICHU_A ; $E9
const SANDSLASH_A ; $EA
const NINETALES_A ; $EB
const DUGTRIO_A ; $EC
const PERSIAN_A ; $ED
const GOLEM_A ; $EE
const RAPIDASH_G ; $EF
const SLOWBRO_G ; $F0
const SLOWKING_G ; $F1
const MUK_A ; $F2
const EXEGGUTOR_A ; $F3
const MAROWAK_A ; $F4
const WEEZING_G ; $F5
const TAUROS_P ; $F6
const TAUROS_PA ; $F7
const TAUROS_PB ; $F8
const FOSSIL_KABUTOPS ; $F9 (was B6)
const FOSSIL_AERODACTYL ; $FA (was B7)
const MON_GHOST ; $FB (was B8)
DEF NUM_POKEMON_INDEXES EQU const_value - 1

100
crysaudio/cry_headers.asm
View file

@ -4,7 +4,7 @@ MACRO mon_cry
ENDM
PokemonCries::
; entries correspond to constants/pokemon_constants.asm
; entries correspond to constants/pokedex_constants.asm
mon_cry CRY_BULBASAUR, 128, 129 ; BULBASAUR
mon_cry CRY_BULBASAUR, 32, 256 ; IVYSAUR
mon_cry CRY_BULBASAUR, 0, 320 ; VENUSAUR
@ -18,7 +18,6 @@ PokemonCries::
mon_cry CRY_RAICHU, 238, 136 ; RAICHU
mon_cry CRY_RAICHU, 238, 136 ; RAICHU_A
mon_cry CRY_GOROCHU, 0, 256 ; GOROCHU
; mon_cry CRY_EKANS, 193, 356 ; (old Gorochu cry)
mon_cry CRY_VENONAT, 136, 224 ; EEVEE
mon_cry CRY_VENONAT, 170, 383 ; VAPOREON
mon_cry CRY_VENONAT, 61, 256 ; JOLTEON
@ -34,7 +33,7 @@ PokemonCries::
mon_cry CRY_PIDGEY, 223, 132 ; PIDGEY
mon_cry CRY_PIDGEOTTO, 40, 320 ; PIDGEOTTO
mon_cry CRY_PIDGEOTTO, 17, 383 ; PIDGEOT
mon_cry CRY_CLEFAIRY, 193, 156 ; KONYA
mon_cry CRY_CLEFAIRY, 193, 156 ; COINPUR
mon_cry CRY_CLEFAIRY, 119, 144 ; MEOWTH
mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN
mon_cry CRY_CLEFAIRY, 153, 383 ; PERSIAN_A
@ -46,15 +45,13 @@ PokemonCries::
mon_cry CRY_BLASTOISE, 255, 129 ; KAKUNA
mon_cry CRY_BLASTOISE, 96, 256 ; BEEDRILL
mon_cry CRY_NIDORAN_M, 0, 0 ; KOKANA (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; KASANAGI (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; PUPAL (incomplete)
mon_cry CRY_NIDORAN_M, 0, 0 ; CARAPTHOR (incomplete)
mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA
mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA
mon_cry CRY_KANGASKHAN, 5, 129 ; GOROTORA
mon_cry CRY_SPEAROW, 0, 256 ; SPEAROW
mon_cry CRY_FEAROW, 64, 288 ; FEAROW
mon_cry CRY_EKANS, 18, 192 ; EKANS
mon_cry CRY_EKANS, 224, 144 ; ARBOK
mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW
mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH
mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH_A
mon_cry CRY_NIDORAN_F, 0, 256 ; NIDORAN_F
mon_cry CRY_NIDORAN_F, 44, 352 ; NIDORINA
mon_cry CRY_NIDOQUEEN, 0, 256 ; NIDOQUEEN
@ -62,7 +59,6 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 44, 320 ; NIDORINO
mon_cry CRY_RAICHU, 0, 256 ; NIDOKING
mon_cry CRY_NIDOQUEEN, 44, 256 ; NIDOREIGN
mon_cry CRY_SQUIRTLE, 180, 206 ; BITTYBAT
mon_cry CRY_SQUIRTLE, 224, 256 ; ZUBAT
mon_cry CRY_SQUIRTLE, 250, 256 ; GOLBAT
mon_cry CRY_SQUIRTLE, -16, 320 ; CROBAT
@ -76,14 +72,15 @@ PokemonCries::
mon_cry CRY_CLEFAIRY, 170, 160 ; CLEFABLE
mon_cry CRY_PIDGEY, 255, 181 ; JIGGLYPUFF
mon_cry CRY_PIDGEY, 104, 224 ; WIGGLYTUFF
mon_cry CRY_PIDGEY, 224, 224 ; MIKON
mon_cry CRY_NIDORAN_M, 32, 192 ; SANDSHREW
mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH
mon_cry CRY_NIDORAN_M, 255, 383 ; SANDSLASH_A
mon_cry CRY_EKANS, 18, 192 ; EKANS
mon_cry CRY_EKANS, 224, 144 ; ARBOK
mon_cry CRY_PIDGEY, 224, 224 ; VULPIII
mon_cry CRY_VULPIX, 79, 144 ; VULPIX
mon_cry CRY_VULPIX, 136, 224 ; NINETALES
mon_cry CRY_VULPIX, 136, 224 ; NINETALES_A
; mon_cry CRY_GROWLITHE, 64, 129 ; PUDI
mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE_H
mon_cry CRY_NIDOQUEEN, 221, 224 ; MANKEY
mon_cry CRY_NIDOQUEEN, 175, 192 ; PRIMEAPE
mon_cry CRY_NIDOQUEEN, -1280, 512 ; ANNIHILAPE
@ -94,16 +91,14 @@ PokemonCries::
mon_cry CRY_PSYDUCK, 85, 129 ; BELLSPROUT
mon_cry CRY_WEEPINBELL, 68, 160 ; WEEPINBELL
mon_cry CRY_WEEPINBELL, 102, 332 ; VICTREEBEL
mon_cry CRY_SLOWKING, 573, 320 ; TSUBOMITTO
mon_cry CRY_SLOWKING, 573, 320 ; BELLIGNAN
mon_cry CRY_EKANS, 128, 128 ; MAGIKARP
mon_cry CRY_EKANS, 0, 256 ; GYARADOS
mon_cry CRY_CATERPIE, 137, 142 ; GYOPIN
mon_cry CRY_CATERPIE, 137, 142 ; ORFRY
mon_cry CRY_CATERPIE, 128, 192 ; GOLDEEN
mon_cry CRY_CATERPIE, 16, 383 ; SEAKING
mon_cry CRY_VENONAT, 68, 192 ; VENONAT
mon_cry CRY_VENONAT, 41, 256 ; VENOMOTH
mon_cry CRY_RATTATA, 255, 192 ; CHEEP
mon_cry CRY_RATTATA, 50, 383 ; JABETTA
mon_cry CRY_PSYDUCK, 32, 224 ; PSYDUCK
mon_cry CRY_PSYDUCK, 147, 208 ; WEIRDUCK
mon_cry CRY_PSYDUCK, 255, 192 ; GOLDUCK
@ -114,8 +109,14 @@ PokemonCries::
mon_cry CRY_METAPOD, 192, 129 ; ABRA
mon_cry CRY_METAPOD, 168, 320 ; KADABRA
mon_cry CRY_METAPOD, 152, 383 ; ALAKAZAM
mon_cry CRY_GROWLITHE, 32, 192 ; GROWLITHE
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE
mon_cry CRY_WEEDLE, 0, 256 ; ARCANINE_H
mon_cry CRY_SEEL, 0, 256 ; LICKITUNG
mon_cry CRY_NIDORAN_M, 0, 0 ; LICKILICKY (incomplete)
mon_cry CRY_SPEAROW, 221, 129 ; FARFETCHD
mon_cry CRY_FEAROW, 25, 383 ; LUXWAN
mon_cry CRY_SPEAROW, -112, 192 ; SIRFETCHD
mon_cry CRY_DROWZEE, 136, 160 ; DROWZEE
mon_cry CRY_DROWZEE, 238, 192 ; HYPNO
mon_cry CRY_DIGLETT, 170, 129 ; DIGLETT
@ -125,9 +126,6 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 0 ; WUGTRIO (incomplete)
mon_cry CRY_EKANS, 255, 320 ; ONIX
mon_cry CRY_TYPHLOSION, 239, 247 ; STEELIX
mon_cry CRY_KANGASKHAN, 163, 129 ; KOTORA
mon_cry CRY_KANGASKHAN, 45, 129 ; GAOTORA
mon_cry CRY_KANGASKHAN, 5, 129 ; GOROTORA
mon_cry CRY_VOLTORB, 237, 256 ; VOLTORB
mon_cry CRY_VOLTORB, 168, 272 ; ELECTRODE
mon_cry CRY_VOLTORB, 168, 272 ; ELECTRODE_H
@ -137,17 +135,16 @@ PokemonCries::
mon_cry CRY_NIDORAN_M, 0, 0 ; TOEDSCRUEL (incomplete)
mon_cry CRY_BLASTOISE, 147, 128 ; BLOTTLE
mon_cry CRY_BLASTOISE, 60, 128 ; PENDRAKEN
mon_cry CRY_GOLEM, 147, 224 ; RIBBITO
mon_cry CRY_GOLEM, 37, 383 ; CROAKOZUNA
mon_cry CRY_METAPOD, 128, 224 ; MAGNEMITE
mon_cry CRY_METAPOD, 177, 272 ; MAGNETITE
mon_cry CRY_METAPOD, 32, 320 ; MAGNETON
mon_cry CRY_NIDORAN_M, 0, 0 ; MAGNEZONE (incomplete)
mon_cry CRY_RATTATA, 255, 192 ; CHEEP
mon_cry CRY_RATTATA, 50, 383 ; JABETTA
mon_cry CRY_GOLEM, 147, 224 ; RIBBITO
mon_cry CRY_GOLEM, 37, 383 ; CROAKOZUNA
mon_cry CRY_GROWLITHE, 238, 129 ; MACHOP
mon_cry CRY_GROWLITHE, 72, 224 ; MACHOKE
mon_cry CRY_GROWLITHE, 8, 320 ; MACHAMP
mon_cry CRY_GOROCHU, 246, 192 ; CROCKY
; mon_cry CRY_METAPOD, 198, 368 ; (old Crocky cry)
mon_cry CRY_KRABBY, 32, 352 ; KRABBY
mon_cry CRY_KRABBY, 238, 352 ; KINGLER
mon_cry CRY_SLOWPOKE, 0, 256 ; SLOWPOKE
@ -155,15 +152,12 @@ PokemonCries::
mon_cry CRY_GROWLITHE, 0, 256 ; SLOWBRO_G
mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING
mon_cry CRY_SLOWKING, 260, 512 ; SLOWKING_G
mon_cry CRY_WEEPINBELL, 55, 144 ; PUCHIKOON
mon_cry CRY_GOROCHU, 246, 192 ; GAVILLAIN
mon_cry CRY_WEEPINBELL, 55, 144 ; KOLTA
mon_cry CRY_WEEPINBELL, 0, 256 ; PONYTA
mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH
mon_cry CRY_WEEPINBELL, 32, 320 ; RAPIDASH_G
mon_cry CRY_WEEDLE, 64, 293 ; DEER
mon_cry CRY_GOLEM, 147, 128 ; MONJA
mon_cry CRY_GOLEM, 0, 256 ; TANGELA
mon_cry CRY_NIDORAN_M, 0, 0 ; TANGROWTH
mon_cry CRY_PIDGEY, 0, 256 ; BARUNDA
mon_cry CRY_PIDGEY, 0, 256 ; BALUMBA
mon_cry CRY_METAPOD, 0, 256 ; GASTLY
mon_cry CRY_METAPOD, 48, 192 ; HAUNTER
mon_cry CRY_MUK, 0, 383 ; GENGAR
@ -171,40 +165,33 @@ PokemonCries::
mon_cry CRY_ODDISH, 79, 224 ; MAROWAK
mon_cry CRY_ODDISH, 79, 224 ; MAROWAK_A
mon_cry CRY_ODDISH, 0, 383 ; GUARDIA
mon_cry CRY_SPEAROW, 221, 129 ; FARFETCHD
mon_cry CRY_FEAROW, 25, 383 ; MADAAMU
mon_cry CRY_SPEAROW, -112, 192 ; SIRFETCHD
mon_cry CRY_DIGLETT, 187, 129 ; DODUO
mon_cry CRY_DIGLETT, 153, 160 ; DODRIO
; mon_cry CRY_GRIMER, 255, 192 ; BETOBEBII
mon_cry CRY_GRIMER, 0, 256 ; GRIMER
mon_cry CRY_MUK, 239, 383 ; MUK
mon_cry CRY_MUK, 239, 383 ; MUK_A
mon_cry CRY_GOLEM, 230, 349 ; KOFFING
mon_cry CRY_GOLEM, 255, 383 ; WEEZING
mon_cry CRY_GOLEM, 255, 383 ; WEEZING_G
mon_cry CRY_PIDGEY, 255, 383 ; DITTO
mon_cry CRY_PIDGEY, 80, 383 ; ANIMON
mon_cry CRY_KRABBY, 8, 192 ; MR_MIME
mon_cry CRY_KRABBY, -256, 232 ; MR_RIME
mon_cry CRY_NIDORAN_M, 128, 144 ; CACTUS
mon_cry CRY_GOLEM, 0, 256 ; TANGELA
mon_cry CRY_NIDORAN_M, 0, 0 ; TANGROWTH
mon_cry CRY_WEEDLE, 64, 293 ; RAMOOSE
mon_cry CRY_GOLEM, 128, 320 ; HITMONLEE
mon_cry CRY_SEEL, 238, 320 ; HITMONCHAN
mon_cry CRY_SLUGMA, 0, 256 ; HITMONTOP
mon_cry CRY_FEAROW, 0, 256 ; SHELLDER
mon_cry CRY_FEAROW, 111, 352 ; CLOYSTER
mon_cry CRY_TOTODILE, 512, 320 ; TAABAN
mon_cry CRY_TOTODILE, 512, 320 ; DISTURBAN
mon_cry CRY_PARAS, 2, 160 ; STARYU
mon_cry CRY_PARAS, 0, 256 ; STARMIE
mon_cry CRY_SEEL, 136, 320 ; SEEL
mon_cry CRY_SEEL, 35, 383 ; DEWGONG
mon_cry CRY_BLASTOISE, 247, 128 ; BLASTYKE
mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE
mon_cry CRY_CLEFAIRY, 153, 144 ; HORSEA
mon_cry CRY_CLEFAIRY, 60, 129 ; SEADRA
mon_cry CRY_SLUGMA, 763, 256 ; KINGDRA
mon_cry CRY_GOROCHU, 16, 272 ; JAGG
; mon_cry CRY_EKANS, 200, 320 ; (old Jagg cry)
mon_cry CRY_BLASTOISE, 247, 128 ; BLASTYKE
mon_cry CRY_BLASTOISE, 0, 256 ; BLASTOISE
mon_cry CRY_GOROCHU, 16, 272 ; SHARPOON
mon_cry CRY_DIGLETT, 0, 256 ; EXEGGCUTE
mon_cry CRY_DROWZEE, 0, 256 ; EXEGGUTOR
mon_cry CRY_DROWZEE, 0, 256 ; EXEGGUTOR_A
@ -215,18 +202,18 @@ PokemonCries::
mon_cry CRY_AMPHAROS, 0, 352 ; SCIZOR
mon_cry CRY_CATERPIE, -512, 383 ; KLEAVOR
mon_cry CRY_PIDGEOTTO, 0, 256 ; PINSIR
mon_cry CRY_RAICHU, 291, 256 ; PURAKKUSU
mon_cry CRY_RAICHU, 291, 256 ; TRICULES
mon_cry CRY_KANGASKHAN, 0, 256 ; KANGASKHAN
mon_cry CRY_KANGASKHAN, 144, 304 ; TRAMPEL
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS_P
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS_PA
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS_PB
mon_cry CRY_SQUIRTLE, 17, 192 ; TAUROS_PA
mon_cry CRY_PIDGEOTTO, 10, 320 ; CHANSEY
mon_cry CRY_SLOWKING, 659, 320 ; BLISSEY
mon_cry CRY_BULBASAUR, 99, 192 ; SKIMPER
mon_cry CRY_BULBASAUR, 64, 320 ; BAWLIGUA
mon_cry CRY_BULBASAUR, 32, 320 ; CRYITHAN
mon_cry CRY_NIDORAN_M, 128, 144 ; CACTORMUS
mon_cry CRY_KRABBY, 8, 192 ; MR_MIME
mon_cry CRY_KRABBY, -256, 232 ; MR_RIME
mon_cry CRY_DROWZEE, 255, 383 ; JYNX
mon_cry CRY_DROWZEE, 46, 352 ; BUU
mon_cry CRY_VOLTORB, 143, 383 ; ELECTABUZZ
@ -234,6 +221,8 @@ PokemonCries::
mon_cry CRY_CHARMANDER, 255, 176 ; MAGMAR
mon_cry CRY_NIDORAN_M, 0, 0 ; MAGMORTAR (incomplete)
mon_cry CRY_LAPRAS, 0, 256 ; LAPRAS
mon_cry CRY_PIDGEY, 255, 383 ; DITTO
mon_cry CRY_PIDGEY, 80, 383 ; MIMMEO
mon_cry CRY_WEEPINBELL, 170, 383 ; PORYGON
mon_cry CRY_GIRAFARIG, 115, 576 ; PORYGON2
mon_cry CRY_PARAS, 287, 519 ; PORYGONZ
@ -243,11 +232,14 @@ PokemonCries::
mon_cry CRY_FEAROW, 238, 129 ; KABUTOPS
mon_cry CRY_VILEPLUME, 32, 368 ; AERODACTYL
mon_cry CRY_BULBASAUR, 64, 256 ; DECILLA
mon_cry CRY_BULBASAUR, 0, 256 ; GYAOON
mon_cry CRY_BLASTOISE, 0, 128 ; OMEGA
mon_cry CRY_BULBASAUR, 0, 256 ; GAWARHED
mon_cry CRY_BLASTOISE, 0, 128 ; OMEGADGE
mon_cry CRY_GRIMER, 85, 129 ; SNORLAX
mon_cry CRY_PIDGEY, 250, 256 ; SCREAM_TAIL
mon_cry CRY_METAPOD, 31, 349 ; SANDY_SHOCKS
mon_cry CRY_BULBASAUR, 99, 192 ; SQUEAMATA
mon_cry CRY_BULBASAUR, 64, 320 ; MINISTARE
mon_cry CRY_BULBASAUR, 32, 320 ; IGUANARCH
mon_cry CRY_BULBASAUR, 96, 192 ; DRATINI
mon_cry CRY_BULBASAUR, 64, 256 ; DRAGONAIR
mon_cry CRY_BULBASAUR, 60, 320 ; DRAGONITE

2
data/credits/credits_mons.asm
View file

@ -15,7 +15,7 @@ CreditsMons:
db VENUSAUR
db CHARIZARD
db TOTARTLE
db OMEGA
db OMEGADGE
db ARTICUNO_G
db ZAPDOS_G
db MOLTRES_G

8
data/events/card_key_coords.asm
View file

@ -5,10 +5,6 @@
; Format: map ID, Y, X, gate ID?
CardKeyTable1:
db SILPH_CO_2F, $04, $04, 0
db SILPH_CO_2F, $04, $05, 1
db SILPH_CO_4F, $0C, $04, 2
db SILPH_CO_4F, $0C, $05, 3
db SILPH_CO_7F, $06, $0A, 4
db SILPH_CO_7F, $06, $0B, 5
db SILPH_CO_9F, $04, $12, 6
@ -22,10 +18,6 @@ CardKeyTable2:
db SILPH_CO_3F, $09, $09, 11
db SILPH_CO_5F, $04, $07, 12
db SILPH_CO_5F, $05, $07, 13
db SILPH_CO_6F, $0C, $05, 14
db SILPH_CO_6F, $0D, $05, 15
;db SILPH_CO_8F, $08, $07, 16
;db SILPH_CO_8F, $09, $07, 17
db SILPH_CO_9F, $08, $03, 18
db SILPH_CO_9F, $09, $03, 19
db -1 ; end

4
data/events/card_key_maps.asm
View file

@ -1,11 +1,7 @@
SilphCoMapList:
db SILPH_CO_2F
db SILPH_CO_3F
db SILPH_CO_4F
db SILPH_CO_5F
db SILPH_CO_6F
db SILPH_CO_7F
;db SILPH_CO_8F
db SILPH_CO_9F
db SILPH_CO_10F
db SILPH_CO_11F

12
data/events/prize_mon_levels.asm
View file

@ -1,9 +1,9 @@
PrizeMonLevelDictionary:
db CUBONE, 12
db BLASTYKE, 12
db CACTUS, 20
db CUBONE, 15
db CACTORMUS, 20
db SQUEAMATA, 20
db SCYTHER, 25
db PINSIR, 25
db PORYGON, 30
db SCYTHER, 25
db PINSIR, 25
db PORYGON, 25

18
data/events/prizes.asm
View file

@ -8,14 +8,14 @@ NoThanksText:
PrizeMenuMon1Entries:
db CUBONE
db BLASTYKE
db CACTUS
db CACTORMUS
db SQUEAMATA
db "@"
PrizeMenuMon1Cost:
bcd2 200
bcd2 700
bcd2 1700
bcd2 500
bcd2 1000
bcd2 2000
db "@"
PrizeMenuMon2Entries:
@ -27,7 +27,7 @@ PrizeMenuMon2Entries:
PrizeMenuMon2Cost:
bcd2 3500
bcd2 3500
bcd2 6500
bcd2 7000
db "@"
PrizeMenuTMsEntries:
@ -37,7 +37,7 @@ PrizeMenuTMsEntries:
db "@"
PrizeMenuTMsCost:
bcd2 3300
bcd2 5500
bcd2 7700
bcd2 3000
bcd2 5000
bcd2 7000
db "@"

22
data/events/trades.asm
View file

@ -2,16 +2,16 @@ TradeMons:
; entries correspond to TRADE_FOR_* constants
table_width 3 + NAME_LENGTH, TradeMons
; give mon, get mon, dialog id, nickname
db POLIWHIRL, JYNX, TRADE_DIALOGSET_CASUAL, "LOLA@@@@@@@" ; Jynx trade replaces the useless Nidorino one
db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@"
db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@"
db HAUNTER, KADABRA, TRADE_DIALOGSET_EVOLUTION, "HARRY@@@@@@" ; New trade to complete the 4 main trade evos
db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@"
db PERSIAN, TAUROS, TRADE_DIALOGSET_CASUAL, "JIMBO@@@@@@" ; From JP Blue
db MACHOKE, HAUNTER, TRADE_DIALOGSET_EVOLUTION, "MICHELLE@@@" ; From JP Blue
db KADABRA, GRAVELER, TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; From JP Blue
db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; From Yellow
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; Celadon Uni Trader
db POLIWHIRL, JYNX, TRADE_DIALOGSET_CASUAL, "LOLA@@@@@@@" ; Cerulean City
db ABRA, MR_MIME, TRADE_DIALOGSET_CASUAL, "MARCEL@@@@@" ; Route 2
db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY, "CHIKUCHIKU@" ; Route 11-12 gate, will be moved to Viridian Forest gate
db RAICHU, KADABRA, TRADE_DIALOGSET_EVOLUTION, "HARRY@@@@@@" ; Citrine City, new trade to complete the 4 main trade evos
db SPEAROW, FARFETCHD, TRADE_DIALOGSET_HAPPY, "DUX@@@@@@@@" ; Vermilion City
db PERSIAN, TAUROS, TRADE_DIALOGSET_CASUAL, "JIMBO@@@@@@" ; Route 17-18 gate, from JP Blue
db MACHOKE, HAUNTER, TRADE_DIALOGSET_EVOLUTION, "MICHELLE@@@" ; Cinnabar Lab, from JP Blue
db KADABRA, GRAVELER, TRADE_DIALOGSET_EVOLUTION, "JENNY@@@@@@" ; Cinnabar Lab, from JP Blue (probably going to move these since you get the Trader here anyway...)
db CUBONE, MACHOKE, TRADE_DIALOGSET_HAPPY, "RICKY@@@@@@" ; Route 5-6 Underground Path, from Yellow
db NO_MON, NO_MON, TRADE_DIALOGSET_SELF, "Unseen@@@@@" ; The Trader
db RATICATE, RATICATE_A, TRADE_DIALOGSET_REGION, "RATICATE@@@" ; Viridian - LGPE trades begin here
db GOLEM, GOLEM_A, TRADE_DIALOGSET_REGION, "GOLEM@@@@@@" ; Pewter
db NINETALES, NINETALES_A, TRADE_DIALOGSET_REGION, "NINETALES@@" ; Cerulean
@ -31,7 +31,7 @@ TradeMons:
db WEEZING, WEEZING_G, TRADE_DIALOGSET_REGION, "WEEZING@@@@"
db MR_MIME, MR_RIME, TRADE_DIALOGSET_CASUAL, "CHURCHILL@@" ; Winston Churchill, notable "city gent"
db PERSIAN, PERRSERKER, TRADE_DIALOGSET_HAPPY, "ERIK@@@@@@@" ; One of the most famous vikings
db MADAAMU, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "LANCELOT@@@" ; Influential knight of the round table
db LUXWAN, SIRFETCHD, TRADE_DIALOGSET_HAPPY, "LANCELOT@@@" ; Influential knight of the round table
db ARCANINE, ARCANINE_H, TRADE_DIALOGSET_BILL, "ARCANINE@@@"
db ELECTRODE, ELECTRODE_H, TRADE_DIALOGSET_GRAMPS, "ELECTRODE@@"
assert_table_length NUM_NPC_TRADES

2
data/items/names.asm
View file

@ -108,6 +108,6 @@ ItemNames::
li "8F"
li "9F"
li "10F"
li "11F"
li "GO HOME" ; dummy text used for the ferry system
li "B4F"
assert_list_length NUM_ITEMS + NUM_FLOORS

5
data/maps/dungeon_maps.asm
View file

@ -16,6 +16,9 @@ DungeonMaps1:
db CELESTE_HILL
db CELESTE_HILL_OUTSIDE
db CELESTE_HILL_CAVE
db GARNET_CAVERN_2F
db GARNET_CAVERN_1F
db GARNET_CAVERN_B1F
db -1 ; end
; GetBattleTransitionID_IsDungeonMap checks if wCurMap
@ -29,7 +32,7 @@ DungeonMaps2:
db LAVENDER_POKECENTER, LAVENDER_CUBONE_HOUSE
; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and
; CERULEAN_CAVE maps, except for SILPH_CO_1F
db SILPH_CO_2F, CERULEAN_CAVE_1F
db SILPH_CO_3F, CERULEAN_CAVE_1F
; SILPH_CO_[9-11]F
db SILPH_CO_9F, SILPH_CO_11F
; SEAFOAM_ISLANDS_[B1F-B4F]

2
data/maps/headers/CitrineFerryDock.asm Normal file
View file

@ -0,0 +1,2 @@
map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SHIP_PORT, 0
end_map_header

2
data/maps/headers/FarawayIslandInside.asm
View file

@ -1,2 +1,2 @@
map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, FOREST, 0
map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, CELESTE, 0
end_map_header

2
data/maps/headers/FarawayIslandOutside.asm
View file

@ -1,2 +1,2 @@
map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, FOREST, 0
map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, CELESTE, 0
end_map_header

2
data/maps/headers/SeagallopFerry.asm Normal file
View file

@ -0,0 +1,2 @@
map_header SeagallopFerry, SEAGALLOP_FERRY, SHIP, 0
end_map_header

2
data/maps/headers/VermilionFerryDock.asm Normal file
View file

@ -0,0 +1,2 @@
map_header VermilionFerryDock, VERMILION_FERRY_DOCK, SHIP_PORT, 0
end_map_header

39
data/maps/hide_show_data.asm
View file

@ -150,8 +150,7 @@ MapHSPointers:
dw NoHS
dw NoHS
dw PokemonTower2FHS
dw BrunswickGrottoHS ; Brunswick Grotto
;dw PokemonTower3FHS
dw BrunswickGrottoHS
dw NoHS ; Pokemon Tower 4F, removed for constant space
dw PokemonTower5FHS
dw PokemonTower6FHS
@ -203,7 +202,7 @@ MapHSPointers:
dw VictoryRoad2FHS
dw NoHS
dw NoHS
dw DiglettsCaveHS
dw NoHS
dw VictoryRoad3FHS
dw RocketHideoutB1FHS
dw RocketHideoutB2FHS
@ -215,9 +214,9 @@ MapHSPointers:
dw GarnetCavernB1FHS
dw NoHS
dw SilphCo3FHS
dw SilphCo4FHS
dw NoHS
dw SilphCo5FHS
dw SilphCo6FHS
dw NoHS
dw SilphCo7FHS
;dw SilphCo8FHS
dw PokemonMansion2FHS
@ -408,7 +407,7 @@ PowerPlantHS:
db POWER_PLANT, $0D, SHOW ; HS_POWER_PLANT_ITEM_4
db POWER_PLANT, $0E, SHOW ; HS_POWER_PLANT_ITEM_5
VictoryRoad2FHS:
db VICTORY_ROAD_2F, $06, SHOW ; HS_GYAOON
db VICTORY_ROAD_2F, $06, SHOW ; HS_VICTORY_ROAD_2F_ITEM_0
db VICTORY_ROAD_2F, $07, SHOW ; HS_VICTORY_ROAD_2F_ITEM_1
db VICTORY_ROAD_2F, $08, SHOW ; HS_VICTORY_ROAD_2F_ITEM_2
db VICTORY_ROAD_2F, $09, SHOW ; HS_VICTORY_ROAD_2F_ITEM_3
@ -448,8 +447,6 @@ SSAnneB1FRoomsHS:
db SS_ANNE_B1F_ROOMS, $09, SHOW ; HS_SS_ANNE_B1F_ROOMS_ITEM_1
db SS_ANNE_B1F_ROOMS, $0A, SHOW ; HS_SS_ANNE_B1F_ROOMS_ITEM_2
db SS_ANNE_B1F_ROOMS, $0B, SHOW ; HS_SS_ANNE_B1F_ROOMS_ITEM_3
DiglettsCaveHS:
db DIGLETTS_CAVE, $01, SHOW ; HS_WUGTRIO
VictoryRoad3FHS:
db VICTORY_ROAD_3F, $05, SHOW ; HS_VICTORY_ROAD_3F_ITEM_1
db VICTORY_ROAD_3F, $06, SHOW ; HS_VICTORY_ROAD_3F_ITEM_2
@ -484,13 +481,13 @@ SilphCo3FHS:
db SILPH_CO_3F, $02, SHOW ; HS_SILPH_CO_3F_1
db SILPH_CO_3F, $03, SHOW ; HS_SILPH_CO_3F_2
db SILPH_CO_3F, $04, SHOW ; HS_SILPH_CO_3F_ITEM
SilphCo4FHS:
db SILPH_CO_4F, $02, SHOW ; HS_SILPH_CO_4F_1
db SILPH_CO_4F, $03, SHOW ; HS_SILPH_CO_4F_2
db SILPH_CO_4F, $04, SHOW ; HS_SILPH_CO_4F_3
db SILPH_CO_4F, $05, SHOW ; HS_SILPH_CO_4F_ITEM_1
db SILPH_CO_4F, $06, SHOW ; HS_SILPH_CO_4F_ITEM_2
db SILPH_CO_4F, $07, SHOW ; HS_SILPH_CO_4F_ITEM_3
;SilphCo4FHS:
; db SILPH_CO_4F, $02, SHOW ; HS_SILPH_CO_4F_1
; db SILPH_CO_4F, $03, SHOW ; HS_SILPH_CO_4F_2
; db SILPH_CO_4F, $04, SHOW ; HS_SILPH_CO_4F_3
; db SILPH_CO_4F, $05, SHOW ; HS_SILPH_CO_4F_ITEM_1
; db SILPH_CO_4F, $06, SHOW ; HS_SILPH_CO_4F_ITEM_2
; db SILPH_CO_4F, $07, SHOW ; HS_SILPH_CO_4F_ITEM_3
SilphCo5FHS:
db SILPH_CO_5F, $02, SHOW ; HS_SILPH_CO_5F_1
db SILPH_CO_5F, $03, SHOW ; HS_SILPH_CO_5F_2
@ -499,12 +496,12 @@ SilphCo5FHS:
db SILPH_CO_5F, $06, SHOW ; HS_SILPH_CO_5F_ITEM_1
db SILPH_CO_5F, $07, SHOW ; HS_SILPH_CO_5F_ITEM_2
db SILPH_CO_5F, $08, SHOW ; HS_SILPH_CO_5F_ITEM_3
SilphCo6FHS:
db SILPH_CO_6F, $06, SHOW ; HS_SILPH_CO_6F_1
db SILPH_CO_6F, $07, SHOW ; HS_SILPH_CO_6F_2
db SILPH_CO_6F, $08, SHOW ; HS_SILPH_CO_6F_3
db SILPH_CO_6F, $09, SHOW ; HS_SILPH_CO_6F_ITEM_1
db SILPH_CO_6F, $0A, SHOW ; HS_SILPH_CO_6F_ITEM_2
;SilphCo6FHS:
; db SILPH_CO_6F, $06, SHOW ; HS_SILPH_CO_6F_1
; db SILPH_CO_6F, $07, SHOW ; HS_SILPH_CO_6F_2
; db SILPH_CO_6F, $08, SHOW ; HS_SILPH_CO_6F_3
; db SILPH_CO_6F, $09, SHOW ; HS_SILPH_CO_6F_ITEM_1
; db SILPH_CO_6F, $0A, SHOW ; HS_SILPH_CO_6F_ITEM_2
SilphCo7FHS:
db SILPH_CO_7F, $05, SHOW ; HS_SILPH_CO_7F_1
db SILPH_CO_7F, $06, SHOW ; HS_SILPH_CO_7F_2

8
data/maps/map_header_banks.asm
View file

@ -149,7 +149,6 @@ MapHeaderBanks::
db BANK(PokemonTower1F_h)
db BANK(PokemonTower2F_h)
db BANK(BrunswickGrotto_h)
;db BANK(PokemonTower3F_h)
db BANK(PokemonTower4F_h)
db BANK(PokemonTower5F_h)
db BANK(PokemonTower6F_h)
@ -211,13 +210,12 @@ MapHeaderBanks::
db BANK(CitrineMart_h) ; was UNUSED_MAP_CC
db BANK(GarnetCavern1F_h) ; was UNUSED_MAP_CD
db BANK(GarnetCavernB1F_h) ; was UNUSED_MAP_CE
db BANK(SilphCo2F_h)
db BANK(VermilionFerryDock_h)
db BANK(SilphCo3F_h)
db BANK(SilphCo4F_h)
db BANK(CitrineFerryDock_h)
db BANK(SilphCo5F_h)
db BANK(SilphCo6F_h)
db BANK(SeagallopFerry_h)
db BANK(SilphCo7F_h)
;db BANK(SilphCo8F_h)
db BANK(PokemonMansion2F_h)
db BANK(PokemonMansion3F_h)
db BANK(PokemonMansionB1F_h)

8
data/maps/map_header_pointers.asm
View file

@ -149,7 +149,6 @@ MapHeaderPointers::
dw PokemonTower1F_h
dw PokemonTower2F_h
dw BrunswickGrotto_h
;dw PokemonTower3F_h
dw PokemonTower4F_h
dw PokemonTower5F_h
dw PokemonTower6F_h
@ -211,13 +210,12 @@ MapHeaderPointers::
dw CitrineMart_h ; UNUSED_MAP_CC
dw GarnetCavern1F_h ; UNUSED_MAP_CD, used hideout elevator
dw GarnetCavernB1F_h ; UNUSED_MAP_CE, used hideout elevator
dw SilphCo2F_h
dw VermilionFerryDock_h
dw SilphCo3F_h
dw SilphCo4F_h
dw CitrineFerryDock_h
dw SilphCo5F_h
dw SilphCo6F_h
dw SeagallopFerry_h
dw SilphCo7F_h
;dw SilphCo8F_h
dw PokemonMansion2F_h
dw PokemonMansion3F_h
dw PokemonMansionB1F_h

4
data/maps/objects/BillsHouse.asm
View file

@ -2,8 +2,8 @@ BillsHouse_Object:
db $d ; border block
def_warp_events
warp_event 2, 7, LAST_MAP, 1
warp_event 3, 7, LAST_MAP, 1
warp_event 2, 7, ROUTE_25, 1
warp_event 3, 7, ROUTE_25, 1
warp_event 11, 0, BILLS_GARDEN, 1
def_bg_events

2
data/maps/objects/BrunswickTrail.asm
View file

@ -8,7 +8,7 @@ BrunswickTrail_Object:
def_bg_events
def_object_events
object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTUS, 60 | OW_POKEMON ; person
object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTORMUS, 60 | OW_POKEMON ; person
object_event 40, 21, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_BIRD_KEEPER, 12 ; person
object_event 29, 14, SPRITE_BEAUTY, STAY, DOWN, 3, OPP_BEAUTY, 16 ; person
object_event 25, 21, SPRITE_FISHER, STAY, DOWN, 4, OPP_FISHER, 13 ; person

10
data/maps/objects/CitrineCity.asm
View file

@ -8,8 +8,8 @@ CitrineCity_Object:
warp_event 15, 27, CITRINE_MART, 1
warp_event 23, 5, CELESTE_HILL_OUTSIDE, 1
warp_event 11, 7, BATTLE_TENT, 1
warp_event 27, 33, VERMILION_CITY, 9
warp_event 26, 33, VERMILION_CITY, 10
warp_event 26, 31, CITRINE_FERRY_DOCK, 1
warp_event 27, 31, CITRINE_FERRY_DOCK, 1
def_bg_events
bg_event 16, 27, 5 ; Citrine Shop
@ -17,14 +17,14 @@ CitrineCity_Object:
bg_event 20, 22, 7 ; Billboard 1
bg_event 5, 18, 8 ; Billboard 2
bg_event 9, 7, 9 ; Battle Tower
bg_event 25, 23, 10 ; City Sign
bg_event 21, 28, 11 ; Directions
bg_event 33, 23, 10 ; City Sign
bg_event 25, 24, 11 ; Directions
bg_event 25, 7, 12 ; Celeste Hill Sign
def_object_events
object_event 12, 18, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
object_event 6, 9, SPRITE_HIKER, WALK, LEFT_RIGHT, 2 ; person
object_event 20, 26, SPRITE_GENTLEMAN, STAY, UP, 3 ; person
object_event 31, 28, SPRITE_ROCKER, WALK, ANY_DIR, 4 ; person
object_event 29, 23, SPRITE_ROCKER, WALK, ANY_DIR, 4 ; person
def_warps_to CITRINE_CITY

12
data/maps/objects/CitrineFerryDock.asm Normal file
View file

@ -0,0 +1,12 @@
CitrineFerryDock_Object:
db $f ; border block
def_warp_events
warp_event 14, 0, CITRINE_CITY, 7
warp_event 14, 2, SEAGALLOP_FERRY, 1
def_bg_events
def_object_events
def_warps_to CITRINE_FERRY_DOCK

4
data/maps/objects/CitrinePokecenter.asm
View file

@ -2,8 +2,8 @@ CitrinePokecenter_Object:
db $0 ; border block
def_warp_events
warp_event 3, 7, LAST_MAP, 3
warp_event 4, 7, LAST_MAP, 3
warp_event 3, 7, CITRINE_CITY, 3
warp_event 4, 7, CITRINE_CITY, 3
def_bg_events

4
data/maps/objects/CitrineTradebackHouse.asm
View file

@ -2,8 +2,8 @@ CitrineTradebackHouse_Object:
db $a ; border block
def_warp_events
warp_event 2, 7, LAST_MAP, 2
warp_event 3, 7, LAST_MAP, 2
warp_event 2, 7, CITRINE_CITY, 2
warp_event 3, 7, CITRINE_CITY, 2
def_bg_events

1
data/maps/objects/DiglettsCave.asm
View file

@ -8,6 +8,5 @@ DiglettsCave_Object:
def_bg_events
def_object_events
object_event 29, 12, SPRITE_BOULDER, STAY, DOWN, 1, WUGTRIO, 28 | OW_POKEMON
def_warps_to DIGLETTS_CAVE

10
data/maps/objects/FarawayIslandOutside.asm
View file

@ -2,13 +2,13 @@ FarawayIslandOutside_Object:
db $2d ; border block
def_warp_events
warp_event 2, 35, VERMILION_CITY, 6
warp_event 3, 35, VERMILION_CITY, 6
warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1
warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2
warp_event 6, 35, SEAGALLOP_FERRY, 1
warp_event 7, 35, SEAGALLOP_FERRY, 1
warp_event 18, 8, FARAWAY_ISLAND_INSIDE, 1
warp_event 19, 8, FARAWAY_ISLAND_INSIDE, 2
def_bg_events
bg_event 2, 28, 1 ; Sign
bg_event 4, 29, 1 ; Sign
def_object_events

1
data/maps/objects/GiovannisRoom.asm
View file

@ -14,6 +14,5 @@ GiovannisRoom_Object:
object_event 8, 16, SPRITE_PAPER, STAY, RIGHT, 4
object_event 17, 22, SPRITE_POKE_BALL, STAY, NONE, 5, TM_EARTHQUAKE
object_event 5, 22, SPRITE_POKE_BALL, STAY, NONE, 6, PROTECTOR
object_event 6, 17, SPRITE_ROCKET, STAY, LEFT, 7, OPP_ROCKET, 8
def_warps_to GIOVANNIS_ROOM

12
data/maps/objects/SeagallopFerry.asm Normal file
View file

@ -0,0 +1,12 @@
SeagallopFerry_Object:
db $c ; border block
def_warp_events
warp_event 5, 1, VERMILION_FERRY_DOCK, 1
def_bg_events
def_object_events
object_event 3, 3, SPRITE_CAPTAIN, STAY, LEFT, 1 ; person
def_warps_to SEAGALLOP_FERRY

4
data/maps/objects/SilphCo11F.asm
View file

@ -16,7 +16,7 @@ SilphCo11F_Object:
object_event 2, 8, SPRITE_JAMES, STAY, UP, 4
object_event 3, 16, SPRITE_ROCKET, STAY, UP, 5, OPP_ROCKET, 41
object_event 3, 8, SPRITE_JESSIE, STAY, UP, 6
object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGA, 40 | OW_POKEMON
object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGA, 65 | OW_POKEMON
object_event 6, 11, SPRITE_MONSTER, STAY, UP, 11, OMEGADGE, 40 | OW_POKEMON
object_event 15, 15, SPRITE_MONSTER, STAY, UP, 12, OMEGADGE, 65 | OW_POKEMON
def_warps_to SILPH_CO_11F

8
data/maps/objects/SilphGauntlet2F.asm
View file

@ -9,10 +9,10 @@ SilphGauntlet2F_Object:
def_object_events
object_event 13, 5, SPRITE_COOLTRAINER_F, STAY, DOWN, 1, OPP_LASS, 19
object_event 21, 9, SPRITE_YOUNGSTER, STAY, UP, 2, OPP_JUNIOR, 1
object_event 24, 13, SPRITE_HIKER, STAY, RIGHT, 3, OPP_HIKER, 15
object_event 23, 19, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_SUPER_NERD, 8
object_event 11, 16, SPRITE_SUPER_NERD, STAY, DOWN, 5, OPP_POKEMANIAC, 8
object_event 21, 9, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 15
object_event 24, 13, SPRITE_SUPER_NERD, STAY, RIGHT, 3, OPP_SUPER_NERD, 8
object_event 23, 19, SPRITE_SUPER_NERD, STAY, UP, 4, OPP_POKEMANIAC, 8
object_event 11, 16, SPRITE_BEAUTY, STAY, DOWN, 5, OPP_BEAUTY, 11
object_event 2, 16, SPRITE_HIKER, STAY, RIGHT, 6, OPP_BLACKBELT, 19
def_warps_to SILPH_GAUNTLET_2F

5
data/maps/objects/SilphGauntlet3F.asm
View file

@ -26,8 +26,7 @@ SilphGauntlet3F_Object:
object_event 12, 23, SPRITE_COOLTRAINER_M, STAY, DOWN, 2, OPP_FIREFIGHTER, 2
object_event 2, 23, SPRITE_GENTLEMAN, STAY, DOWN, 3, OPP_GENTLEMAN, 4
object_event 21, 12, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_ENGINEER, 4
object_event 6, 7, SPRITE_ROCKER, STAY, RIGHT, 5, OPP_ROCKER, 3
object_event 22, 23, SPRITE_FISHER, STAY, DOWN, 6, OPP_FISHER, 12
object_event 30, 23, SPRITE_BEAUTY, STAY, RIGHT, 7, OPP_BEAUTY, 11
object_event 22, 23, SPRITE_ROCKER, STAY, DOWN, 5, OPP_ROCKER, 3
object_event 30, 23, SPRITE_FISHER, STAY, RIGHT, 6, OPP_FISHER, 12
def_warps_to SILPH_GAUNTLET_3F

9
data/maps/objects/SilphGauntlet6F.asm
View file

@ -3,9 +3,16 @@ SilphGauntlet6F_Object:
def_warp_events
warp_event 2, 3, SILPH_GAUNTLET_5F, 2
warp_event 13, 13, SILPH_GAUNTLET_7F, 1
def_bg_events
def_object_events
object_event 12, 4, SPRITE_SUPER_NERD, STAY, DOWN, 1, OPP_BROCK, 9
object_event 21, 6, SPRITE_BRUNETTE_GIRL, STAY, LEFT, 2, OPP_MISTY, 9
object_event 18, 11, SPRITE_ROCKER, STAY, RIGHT, 3, OPP_LT_SURGE, 9
object_event 18, 19, SPRITE_ERIKA, STAY, DOWN, 4, OPP_ERIKA, 9
object_event 13, 18, SPRITE_KOGA, STAY, DOWN, 5, OPP_KOGA, 9
object_event 8, 18, SPRITE_GIRL, STAY, LEFT, 6, OPP_SABRINA, 9
object_event 6, 10, SPRITE_MIDDLE_AGED_MAN, STAY, RIGHT, 7, OPP_BLAINE, 9
def_warps_to SILPH_GAUNTLET_6F

20
data/maps/objects/VermilionCity.asm
View file

@ -10,17 +10,17 @@ VermilionCity_Object:
warp_event 18, 31, VERMILION_DOCK, 1
warp_event 19, 31, VERMILION_DOCK, 1
warp_event 15, 13, VERMILION_TRADE_HOUSE, 1
warp_event 10, 31, FARAWAY_ISLAND_OUTSIDE, 1
warp_event 26, 31, CITRINE_CITY, 7
warp_event 10, 31, VERMILION_FERRY_DOCK, 1
warp_event 11, 31, VERMILION_FERRY_DOCK, 1
def_bg_events
bg_event 27, 3, 11 ; VermilionCityText7
bg_event 37, 13, 12 ; VermilionCityText8
bg_event 24, 13, 13 ; MartSignText
bg_event 12, 3, 14 ; PokeCenterSignText
bg_event 7, 13, 15 ; VermilionCityText11
bg_event 7, 19, 16 ; VermilionCityText12
bg_event 29, 15, 17 ; VermilionCityText13
bg_event 27, 3, 9 ; VermilionCityText7
bg_event 37, 13, 10 ; VermilionCityText8
bg_event 24, 13, 11 ; MartSignText
bg_event 12, 3, 12 ; PokeCenterSignText
bg_event 7, 13, 13 ; VermilionCityText11
bg_event 7, 19, 14 ; VermilionCityText12
bg_event 29, 15, 15 ; VermilionCityText13
def_object_events
object_event 23, 5, SPRITE_BEAUTY, WALK, LEFT_RIGHT, 1 ; person
@ -31,7 +31,5 @@ VermilionCity_Object:
object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
object_event 19, 8, SPRITE_OFFICER_JENNY, STAY, ANY_DIR, 7 ; squirtle event
object_event 12, 13, SPRITE_BEAUTY, STAY, DOWN, 8 ; arc/pers event
object_event 11, 30, SPRITE_SAILOR, STAY, UP, 9 ; person - Faraway Island
object_event 27, 30, SPRITE_SAILOR, STAY, UP, 10 ; person - Citrine City
def_warps_to VERMILION_CITY

12
data/maps/objects/VermilionFerryDock.asm Normal file
View file

@ -0,0 +1,12 @@
VermilionFerryDock_Object:
db $f ; border block
def_warp_events
warp_event 14, 0, LAST_MAP, 9
warp_event 14, 2, SEAGALLOP_FERRY, 1
def_bg_events
def_object_events
def_warps_to VERMILION_FERRY_DOCK

2
data/maps/objects/VictoryRoad2F.asm
View file

@ -18,7 +18,7 @@ VictoryRoad2F_Object:
object_event 19, 8, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_TAMER, 5
object_event 4, 2, SPRITE_SUPER_NERD, STAY, DOWN, 4, OPP_POKEMANIAC, 6
object_event 26, 3, SPRITE_SUPER_NERD, STAY, LEFT, 5, OPP_JUGGLER, 5
object_event 11, 5, SPRITE_MONSTER, STAY, DOWN, 6, GYAOON, 50 | OW_POKEMON
object_event 11, 5, SPRITE_POKE_BALL, STAY, NONE, 6, RARE_CANDY
object_event 27, 5, SPRITE_POKE_BALL, STAY, NONE, 7, TM_SUBMISSION
object_event 18, 9, SPRITE_POKE_BALL, STAY, NONE, 8, FULL_HEAL
object_event 9, 11, SPRITE_POKE_BALL, STAY, NONE, 9, TM_MEGA_KICK

2
data/maps/objects/ViridianCity.asm
View file

@ -7,7 +7,7 @@ ViridianCity_Object:
warp_event 21, 15, VIRIDIAN_SCHOOL_HOUSE, 1
warp_event 21, 9, VIRIDIAN_NICKNAME_HOUSE, 1
warp_event 32, 7, VIRIDIAN_GYM, 1
warp_event 32, 3, ROCKET_HIDEOUT_B1F, 2
warp_event 32, 3, GIOVANNIS_ROOM, 2
warp_event 12, 15, VIRIDIAN_PRE_GYM, 1
def_bg_events

6
data/maps/songs.asm
View file

@ -210,11 +210,11 @@ MapSongBanks::
db MUSIC_POKECENTER, 0 ; CITRINE_MART, was UNUSED_MAP_CC
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_1F, was UNUSED_MAP_CD
db MUSIC_KINCHOU01, 0 ; GARNET_CAVERN_B1F, was UNUSED_MAP_CE
db MUSIC_SILPH_CO, 0 ; SILPH_CO_2F
db MUSIC_VERMILION, 0 ; VERMILION_FERRY_DOCK
db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_4F
db MUSIC_CITRINE, 0 ; CITRINE_FERRY_DOCK
db MUSIC_SILPH_CO, 0 ; SILPH_CO_5F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_6F
db MUSIC_VERMILION, 0 ; SEAGALLOP_FERRY
db MUSIC_SILPH_CO, 0 ; SILPH_CO_7F
;db MUSIC_SILPH_CO, 0 ; SILPH_CO_8F
db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_2F

5
data/maps/town_map_entries.asm
View file

@ -121,6 +121,11 @@ InternalMapEntries:
internal_map ROCKET_HIDEOUT_ELEVATOR, 7, 5, RocketHQName
internal_map CITRINE_MART, 7, 10, CitrineCityName
internal_map GARNET_CAVERN_B1F, 6, 10, GarnetCavernName
internal_map VERMILION_FERRY_DOCK, 10, 9, VermilionCityName
internal_map SILPH_CO_3F, 10, 5, SilphCoName
internal_map CITRINE_FERRY_DOCK, 7, 10, CitrineCityName
internal_map SILPH_CO_5F, 10, 5, SilphCoName
internal_map SEAGALLOP_FERRY, 10, 9, VermilionCityName
internal_map SILPH_CO_7F, 10, 5, SilphCoName
internal_map POKEMON_MANSION_B1F, 2, 15, PokemonMansionName
internal_map SAFARI_ZONE_NORTH_REST_HOUSE, 8, 12, SafariZoneName

93
data/pokemon/base_stats.asm
View file

@ -28,7 +28,7 @@ INCLUDE "data/pokemon/base_stats/raticatea.asm"
INCLUDE "data/pokemon/base_stats/pidgey.asm"
INCLUDE "data/pokemon/base_stats/pidgeotto.asm"
INCLUDE "data/pokemon/base_stats/pidgeot.asm"
INCLUDE "data/pokemon/base_stats/konya.asm"
INCLUDE "data/pokemon/base_stats/coinpur.asm"
INCLUDE "data/pokemon/base_stats/meowth.asm"
INCLUDE "data/pokemon/base_stats/persian.asm"
INCLUDE "data/pokemon/base_stats/persiana.asm"
@ -40,15 +40,13 @@ INCLUDE "data/pokemon/base_stats/weedle.asm"
INCLUDE "data/pokemon/base_stats/kakuna.asm"
INCLUDE "data/pokemon/base_stats/beedrill.asm"
INCLUDE "data/pokemon/base_stats/kokana.asm"
INCLUDE "data/pokemon/base_stats/kasanagi.asm"
INCLUDE "data/pokemon/base_stats/pupal.asm"
INCLUDE "data/pokemon/base_stats/carapthor.asm"
INCLUDE "data/pokemon/base_stats/kotora.asm"
INCLUDE "data/pokemon/base_stats/gaotora.asm"
INCLUDE "data/pokemon/base_stats/gorotora.asm"
INCLUDE "data/pokemon/base_stats/spearow.asm"
INCLUDE "data/pokemon/base_stats/fearow.asm"
INCLUDE "data/pokemon/base_stats/ekans.asm"
INCLUDE "data/pokemon/base_stats/arbok.asm"
INCLUDE "data/pokemon/base_stats/sandshrew.asm"
INCLUDE "data/pokemon/base_stats/sandslash.asm"
INCLUDE "data/pokemon/base_stats/sandslasha.asm"
INCLUDE "data/pokemon/base_stats/nidoranf.asm"
INCLUDE "data/pokemon/base_stats/nidorina.asm"
INCLUDE "data/pokemon/base_stats/nidoqueen.asm"
@ -56,7 +54,6 @@ INCLUDE "data/pokemon/base_stats/nidoranm.asm"
INCLUDE "data/pokemon/base_stats/nidorino.asm"
INCLUDE "data/pokemon/base_stats/nidoking.asm"
INCLUDE "data/pokemon/base_stats/nidoreign.asm"
INCLUDE "data/pokemon/base_stats/bittybat.asm"
INCLUDE "data/pokemon/base_stats/zubat.asm"
INCLUDE "data/pokemon/base_stats/golbat.asm"
INCLUDE "data/pokemon/base_stats/crobat.asm"
@ -70,13 +67,15 @@ INCLUDE "data/pokemon/base_stats/clefairy.asm"
INCLUDE "data/pokemon/base_stats/clefable.asm"
INCLUDE "data/pokemon/base_stats/jigglypuff.asm"
INCLUDE "data/pokemon/base_stats/wigglytuff.asm"
INCLUDE "data/pokemon/base_stats/mikon.asm"
INCLUDE "data/pokemon/base_stats/sandshrew.asm"
INCLUDE "data/pokemon/base_stats/sandslash.asm"
INCLUDE "data/pokemon/base_stats/sandslasha.asm"
INCLUDE "data/pokemon/base_stats/ekans.asm"
INCLUDE "data/pokemon/base_stats/arbok.asm"
INCLUDE "data/pokemon/base_stats/vulpiii.asm"
INCLUDE "data/pokemon/base_stats/vulpix.asm"
INCLUDE "data/pokemon/base_stats/ninetales.asm"
INCLUDE "data/pokemon/base_stats/ninetalesa.asm"
INCLUDE "data/pokemon/base_stats/growlithe.asm"
INCLUDE "data/pokemon/base_stats/arcanine.asm"
INCLUDE "data/pokemon/base_stats/arcanineh.asm"
INCLUDE "data/pokemon/base_stats/mankey.asm"
INCLUDE "data/pokemon/base_stats/primeape.asm"
INCLUDE "data/pokemon/base_stats/annihilape.asm"
@ -87,16 +86,14 @@ INCLUDE "data/pokemon/base_stats/bellossom.asm"
INCLUDE "data/pokemon/base_stats/bellsprout.asm"
INCLUDE "data/pokemon/base_stats/weepinbell.asm"
INCLUDE "data/pokemon/base_stats/victreebel.asm"
INCLUDE "data/pokemon/base_stats/tsubomitto.asm"
INCLUDE "data/pokemon/base_stats/bellignan.asm"
INCLUDE "data/pokemon/base_stats/magikarp.asm"
INCLUDE "data/pokemon/base_stats/gyarados.asm"
INCLUDE "data/pokemon/base_stats/gyopin.asm"
INCLUDE "data/pokemon/base_stats/orfry.asm"
INCLUDE "data/pokemon/base_stats/goldeen.asm"
INCLUDE "data/pokemon/base_stats/seaking.asm"
INCLUDE "data/pokemon/base_stats/venonat.asm"
INCLUDE "data/pokemon/base_stats/venomoth.asm"
INCLUDE "data/pokemon/base_stats/cheep.asm"
INCLUDE "data/pokemon/base_stats/jabetta.asm"
INCLUDE "data/pokemon/base_stats/psyduck.asm"
INCLUDE "data/pokemon/base_stats/weirduck.asm"
INCLUDE "data/pokemon/base_stats/golduck.asm"
@ -107,8 +104,14 @@ INCLUDE "data/pokemon/base_stats/politoed.asm"
INCLUDE "data/pokemon/base_stats/abra.asm"
INCLUDE "data/pokemon/base_stats/kadabra.asm"
INCLUDE "data/pokemon/base_stats/alakazam.asm"
INCLUDE "data/pokemon/base_stats/growlithe.asm"
INCLUDE "data/pokemon/base_stats/arcanine.asm"
INCLUDE "data/pokemon/base_stats/arcanineh.asm"
INCLUDE "data/pokemon/base_stats/lickitung.asm"
INCLUDE "data/pokemon/base_stats/lickilicky.asm"
INCLUDE "data/pokemon/base_stats/farfetchd.asm"
INCLUDE "data/pokemon/base_stats/luxwan.asm"
INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
INCLUDE "data/pokemon/base_stats/drowzee.asm"
INCLUDE "data/pokemon/base_stats/hypno.asm"
INCLUDE "data/pokemon/base_stats/diglett.asm"
@ -118,9 +121,6 @@ INCLUDE "data/pokemon/base_stats/wiglett.asm"
INCLUDE "data/pokemon/base_stats/wugtrio.asm"
INCLUDE "data/pokemon/base_stats/onix.asm"
INCLUDE "data/pokemon/base_stats/steelix.asm"
INCLUDE "data/pokemon/base_stats/kotora.asm"
INCLUDE "data/pokemon/base_stats/gaotora.asm"
INCLUDE "data/pokemon/base_stats/gorotora.asm"
INCLUDE "data/pokemon/base_stats/voltorb.asm"
INCLUDE "data/pokemon/base_stats/electrode.asm"
INCLUDE "data/pokemon/base_stats/electrodeh.asm"
@ -130,16 +130,16 @@ INCLUDE "data/pokemon/base_stats/toedscool.asm"
INCLUDE "data/pokemon/base_stats/toedscruel.asm"
INCLUDE "data/pokemon/base_stats/blottle.asm"
INCLUDE "data/pokemon/base_stats/pendraken.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/magnemite.asm"
INCLUDE "data/pokemon/base_stats/magnetite.asm"
INCLUDE "data/pokemon/base_stats/magneton.asm"
INCLUDE "data/pokemon/base_stats/magnezone.asm"
INCLUDE "data/pokemon/base_stats/cheep.asm"
INCLUDE "data/pokemon/base_stats/jabetta.asm"
INCLUDE "data/pokemon/base_stats/ribbito.asm"
INCLUDE "data/pokemon/base_stats/croakozuna.asm"
INCLUDE "data/pokemon/base_stats/machop.asm"
INCLUDE "data/pokemon/base_stats/machoke.asm"
INCLUDE "data/pokemon/base_stats/machamp.asm"
INCLUDE "data/pokemon/base_stats/crocky.asm"
INCLUDE "data/pokemon/base_stats/krabby.asm"
INCLUDE "data/pokemon/base_stats/kingler.asm"
INCLUDE "data/pokemon/base_stats/slowpoke.asm"
@ -147,15 +147,12 @@ INCLUDE "data/pokemon/base_stats/slowbro.asm"
INCLUDE "data/pokemon/base_stats/slowbrog.asm"
INCLUDE "data/pokemon/base_stats/slowking.asm"
INCLUDE "data/pokemon/base_stats/slowkingg.asm"
INCLUDE "data/pokemon/base_stats/puchikoon.asm"
INCLUDE "data/pokemon/base_stats/gavillain.asm"
INCLUDE "data/pokemon/base_stats/kolta.asm"
INCLUDE "data/pokemon/base_stats/ponyta.asm"
INCLUDE "data/pokemon/base_stats/rapidash.asm"
INCLUDE "data/pokemon/base_stats/rapidashg.asm"
INCLUDE "data/pokemon/base_stats/deer.asm"
INCLUDE "data/pokemon/base_stats/monja.asm"
INCLUDE "data/pokemon/base_stats/tangela.asm"
INCLUDE "data/pokemon/base_stats/tangrowth.asm"
INCLUDE "data/pokemon/base_stats/barunda.asm"
INCLUDE "data/pokemon/base_stats/balumba.asm"
INCLUDE "data/pokemon/base_stats/gastly.asm"
INCLUDE "data/pokemon/base_stats/haunter.asm"
INCLUDE "data/pokemon/base_stats/gengar.asm"
@ -163,9 +160,6 @@ INCLUDE "data/pokemon/base_stats/cubone.asm"
INCLUDE "data/pokemon/base_stats/marowak.asm"
INCLUDE "data/pokemon/base_stats/marowaka.asm"
INCLUDE "data/pokemon/base_stats/guardia.asm"
INCLUDE "data/pokemon/base_stats/farfetchd.asm"
INCLUDE "data/pokemon/base_stats/madaamu.asm"
INCLUDE "data/pokemon/base_stats/sirfetchd.asm"
INCLUDE "data/pokemon/base_stats/doduo.asm"
INCLUDE "data/pokemon/base_stats/dodrio.asm"
INCLUDE "data/pokemon/base_stats/grimer.asm"
@ -174,27 +168,25 @@ INCLUDE "data/pokemon/base_stats/muka.asm"
INCLUDE "data/pokemon/base_stats/koffing.asm"
INCLUDE "data/pokemon/base_stats/weezing.asm"
INCLUDE "data/pokemon/base_stats/weezingg.asm"
INCLUDE "data/pokemon/base_stats/ditto.asm"
INCLUDE "data/pokemon/base_stats/animon.asm"
INCLUDE "data/pokemon/base_stats/mrmime.asm"
INCLUDE "data/pokemon/base_stats/mrrime.asm"
INCLUDE "data/pokemon/base_stats/cactus.asm"
INCLUDE "data/pokemon/base_stats/tangela.asm"
INCLUDE "data/pokemon/base_stats/tangrowth.asm"
INCLUDE "data/pokemon/base_stats/ramoose.asm"
INCLUDE "data/pokemon/base_stats/hitmonlee.asm"
INCLUDE "data/pokemon/base_stats/hitmonchan.asm"
INCLUDE "data/pokemon/base_stats/hitmontop.asm"
INCLUDE "data/pokemon/base_stats/shellder.asm"
INCLUDE "data/pokemon/base_stats/cloyster.asm"
INCLUDE "data/pokemon/base_stats/taaban.asm"
INCLUDE "data/pokemon/base_stats/disturban.asm"
INCLUDE "data/pokemon/base_stats/staryu.asm"
INCLUDE "data/pokemon/base_stats/starmie.asm"
INCLUDE "data/pokemon/base_stats/seel.asm"
INCLUDE "data/pokemon/base_stats/dewgong.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/horsea.asm"
INCLUDE "data/pokemon/base_stats/seadra.asm"
INCLUDE "data/pokemon/base_stats/kingdra.asm"
INCLUDE "data/pokemon/base_stats/jagg.asm"
INCLUDE "data/pokemon/base_stats/blastyke.asm"
INCLUDE "data/pokemon/base_stats/blastoise.asm"
INCLUDE "data/pokemon/base_stats/sharpoon.asm"
INCLUDE "data/pokemon/base_stats/exeggcute.asm"
INCLUDE "data/pokemon/base_stats/exeggutor.asm"
INCLUDE "data/pokemon/base_stats/exeggutora.asm"
@ -205,18 +197,18 @@ INCLUDE "data/pokemon/base_stats/scyther.asm"
INCLUDE "data/pokemon/base_stats/scizor.asm"
INCLUDE "data/pokemon/base_stats/kleavor.asm"
INCLUDE "data/pokemon/base_stats/pinsir.asm"
INCLUDE "data/pokemon/base_stats/purakkusu.asm"
INCLUDE "data/pokemon/base_stats/tricules.asm"
INCLUDE "data/pokemon/base_stats/kangaskhan.asm"
INCLUDE "data/pokemon/base_stats/trampel.asm"
INCLUDE "data/pokemon/base_stats/tauros.asm"
INCLUDE "data/pokemon/base_stats/taurosp.asm"
INCLUDE "data/pokemon/base_stats/taurospa.asm"
INCLUDE "data/pokemon/base_stats/taurospb.asm"
INCLUDE "data/pokemon/base_stats/taurospa.asm"
INCLUDE "data/pokemon/base_stats/chansey.asm"
INCLUDE "data/pokemon/base_stats/blissey.asm"
INCLUDE "data/pokemon/base_stats/skimper.asm"
INCLUDE "data/pokemon/base_stats/bawligua.asm"
INCLUDE "data/pokemon/base_stats/cryithan.asm"
INCLUDE "data/pokemon/base_stats/cactormus.asm"
INCLUDE "data/pokemon/base_stats/mrmime.asm"
INCLUDE "data/pokemon/base_stats/mrrime.asm"
INCLUDE "data/pokemon/base_stats/jynx.asm"
INCLUDE "data/pokemon/base_stats/buu.asm"
INCLUDE "data/pokemon/base_stats/electabuzz.asm"
@ -224,6 +216,8 @@ INCLUDE "data/pokemon/base_stats/electivire.asm"
INCLUDE "data/pokemon/base_stats/magmar.asm"
INCLUDE "data/pokemon/base_stats/magmortar.asm"
INCLUDE "data/pokemon/base_stats/lapras.asm"
INCLUDE "data/pokemon/base_stats/ditto.asm"
INCLUDE "data/pokemon/base_stats/mimmeo.asm"
INCLUDE "data/pokemon/base_stats/porygon.asm"
INCLUDE "data/pokemon/base_stats/porygon2.asm"
INCLUDE "data/pokemon/base_stats/porygonz.asm"
@ -233,11 +227,14 @@ INCLUDE "data/pokemon/base_stats/kabuto.asm"
INCLUDE "data/pokemon/base_stats/kabutops.asm"
INCLUDE "data/pokemon/base_stats/aerodactyl.asm"
INCLUDE "data/pokemon/base_stats/decilla.asm"
INCLUDE "data/pokemon/base_stats/gyaoon.asm"
INCLUDE "data/pokemon/base_stats/omega.asm"
INCLUDE "data/pokemon/base_stats/gawarhed.asm"
INCLUDE "data/pokemon/base_stats/omegadge.asm"
INCLUDE "data/pokemon/base_stats/snorlax.asm"
INCLUDE "data/pokemon/base_stats/screamtail.asm"
INCLUDE "data/pokemon/base_stats/sandyshocks.asm"
INCLUDE "data/pokemon/base_stats/squeamata.asm"
INCLUDE "data/pokemon/base_stats/ministare.asm"
INCLUDE "data/pokemon/base_stats/iguanarch.asm"
INCLUDE "data/pokemon/base_stats/dratini.asm"
INCLUDE "data/pokemon/base_stats/dragonair.asm"
INCLUDE "data/pokemon/base_stats/dragonite.asm"

10
data/pokemon/base_stats/barunda.asm → data/pokemon/base_stats/balumba.asm
View file

@ -1,4 +1,4 @@
db DEX_BARUNDA ; pokedex id
db DEX_BALUMBA ; pokedex id
db 90, 50, 30, 125, 100
; hp atk def spd spc
@ -7,8 +7,8 @@
db 45 ; catch rate
db 137 ; base exp
INCBIN "gfx/pokemon/front/barunda.pic", 0, 1 ; sprite dimensions
dw BarundaPicFront, BarundaPicBack
INCBIN "gfx/pokemon/front/balumba.pic", 0, 1 ; sprite dimensions
dw BalumbaPicFront, BalumbaPicBack
db FAIRY_WIND, GROWL, DRAININGKISS, NO_MOVE ; level 1 learnset
db GROWTH_FAST ; growth rate
@ -22,5 +22,5 @@
FLASH
; end
db BANK(BarundaPicFront)
assert BANK(BarundaPicFront) == BANK(BarundaPicBack)
db BANK(BalumbaPicFront)
assert BANK(BalumbaPicFront) == BANK(BalumbaPicBack)

10
data/pokemon/base_stats/tsubomitto.asm → data/pokemon/base_stats/bellignan.asm
View file

@ -1,4 +1,4 @@
db DEX_TSUBOMITTO ; pokedex id
db DEX_BELLIGNAN ; pokedex id
db 80, 120, 65, 70, 85
; hp atk def spd spc
@ -7,8 +7,8 @@
db 45 ; catch rate
db 191 ; base exp
INCBIN "gfx/pokemon/front/tsubomitto.pic", 0, 1 ; sprite dimensions
dw TsubomittoPicFront, TsubomittoPicBack
INCBIN "gfx/pokemon/front/bellignan.pic", 0, 1 ; sprite dimensions
dw BellignanPicFront, BellignanPicBack
db SLEEP_POWDER, RAZOR_LEAF, LOVELY_KISS, ACID ; level 1 learnset
db GROWTH_MEDIUM_SLOW ; growth rate
@ -20,5 +20,5 @@
CUT
; end
db BANK(TsubomittoPicFront)
assert BANK(TsubomittoPicFront) == BANK(TsubomittoPicBack)
db BANK(BellignanPicFront)
assert BANK(BellignanPicFront) == BANK(BellignanPicBack)

10
data/pokemon/base_stats/cactus.asm → data/pokemon/base_stats/cactormus.asm
View file

@ -1,4 +1,4 @@
db DEX_CACTUS ; pokedex id
db DEX_CACTORMUS ; pokedex id
db 60, 95, 100, 90, 75
; hp atk def spd spc
@ -7,8 +7,8 @@
db 45 ; catch rate
db 177 ; base exp
INCBIN "gfx/pokemon/front/cactus.pic", 0, 1 ; sprite dimensions
dw CactusPicFront, CactusPicBack
INCBIN "gfx/pokemon/front/cactormus.pic", 0, 1 ; sprite dimensions
dw CactormusPicFront, CactormusPicBack
db BARRAGE, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -21,5 +21,5 @@
TRI_ATTACK, SUBSTITUTE
; end
db BANK(CactusPicFront)
assert BANK(CactusPicFront) == BANK(CactusPicBack)
db BANK(CactormusPicFront)
assert BANK(CactormusPicFront) == BANK(CactormusPicBack)

2
data/pokemon/base_stats/clefable.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/clefable.pic", 0, 1 ; sprite dimensions
dw ClefablePicFront, ClefablePicBack
db THUNDER_WAVE, BODY_SLAM, BLIZZARD, THUNDERBOLT ; level 1 learnset - used for trainers
db SING, DOUBLESLAP, MINIMIZE, METRONOME ; level 1 learnset
db GROWTH_FAST ; growth rate
; tm/hm learnset

10
data/pokemon/base_stats/konya.asm → data/pokemon/base_stats/coinpur.asm
View file

@ -1,4 +1,4 @@
db DEX_KONYA ; pokedex id
db DEX_COINPUR ; pokedex id
db 35, 40, 30, 85, 35
; hp atk def spd spc
@ -7,8 +7,8 @@
db 255 ; catch rate
db 53 ; base exp
INCBIN "gfx/pokemon/front/konya.pic", 0, 1 ; sprite dimensions
dw KonyaPicFront, KonyaPicBack
INCBIN "gfx/pokemon/front/coinpur.pic", 0, 1 ; sprite dimensions
dw CoinpurPicFront, CoinpurPicBack
db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -20,5 +20,5 @@
REST, SUBSTITUTE
; end
db BANK(KonyaPicFront)
assert BANK(KonyaPicFront) == BANK(KonyaPicBack)
db BANK(CoinpurPicFront)
assert BANK(CoinpurPicFront) == BANK(CoinpurPicBack)

10
data/pokemon/base_stats/taaban.asm → data/pokemon/base_stats/disturban.asm
View file

@ -1,4 +1,4 @@
db DEX_TAABAN ; pokedex id
db DEX_DISTURBAN ; pokedex id
db 70, 125, 145, 50, 70
; hp atk def spd spc
@ -7,8 +7,8 @@
db 60 ; catch rate
db 203 ; base exp
INCBIN "gfx/pokemon/front/taaban.pic", 0, 1 ; sprite dimensions
dw TaabanPicFront, TaabanPicBack
INCBIN "gfx/pokemon/front/disturban.pic", 0, 1 ; sprite dimensions
dw DisturbanPicFront, DisturbanPicBack
db TACKLE, WITHDRAW, BITE, WATER_GUN ; level 1 learnset
db GROWTH_SLOW ; growth rate
@ -21,5 +21,5 @@
EXPLOSION, TRI_ATTACK, SUBSTITUTE, SURF, STRENGTH
; end
db BANK(TaabanPicFront)
assert BANK(TaabanPicFront) == BANK(TaabanPicBack)
db BANK(DisturbanPicFront)
assert BANK(DisturbanPicFront) == BANK(DisturbanPicBack)

18
data/pokemon/base_stats/crocky.asm → data/pokemon/base_stats/gavillain.asm
View file

@ -1,26 +1,26 @@
db DEX_CROCKY ; pokedex id
db DEX_GAVILLAIN ; pokedex id
db 80, 90, 75, 95, 80
db 80, 80, 75, 95, 90
; hp atk def spd spc
db DRAGON, DRAGON ; type
db DRAGON, ELECTRIC ; type
db 45 ; catch rate
db 167 ; base exp
INCBIN "gfx/pokemon/front/crocky.pic", 0, 1 ; sprite dimensions
dw CrockyPicFront, CrockyPicBack
INCBIN "gfx/pokemon/front/gavillain.pic", 0, 1 ; sprite dimensions
dw GavillainPicFront, GavillainPicBack
db SCRATCH, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_FAST ; growth rate
; tm/hm learnset
tmhm TOXIC, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, \
WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, SUBMISSION, \
COUNTER, SEISMIC_TOSS, RAGE, DRAGON_RAGE, EARTHQUAKE, \
WATER_GUN, HYPER_BEAM, SUBMISSION, COUNTER, SEISMIC_TOSS, \
RAGE, DRAGON_RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, \
FISSURE, DIG, MIMIC, DOUBLE_TEAM, BIDE, \
FIRE_BLAST, SWIFT, SKULL_BASH, REST, ROCK_SLIDE, \
SUBSTITUTE, CUT, FLASH
; end
db BANK(CrockyPicFront)
assert BANK(CrockyPicFront) == BANK(CrockyPicBack)
db BANK(GavillainPicFront)
assert BANK(GavillainPicFront) == BANK(GavillainPicBack)

10
data/pokemon/base_stats/gyaoon.asm → data/pokemon/base_stats/gawarhed.asm
View file

@ -1,4 +1,4 @@
db DEX_GYAOON ; pokedex id
db DEX_GAWARHED ; pokedex id
db 101, 124, 100, 30, 95
; hp atk def spd spc
@ -7,8 +7,8 @@
db 45 ; catch rate
db 204 ; base exp
INCBIN "gfx/pokemon/front/gyaoon.pic", 0, 1 ; sprite dimensions
dw GyaoonPicFront, GyaoonPicBack
INCBIN "gfx/pokemon/front/gawarhed.pic", 0, 1 ; sprite dimensions
dw GawarhedPicFront, GawarhedPicBack
db SUBSTITUTE, GROWL, TACKLE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
@ -22,5 +22,5 @@
ROCK_SLIDE, SUBSTITUTE, SURF, STRENGTH
; end
db BANK(GyaoonPicFront)
assert BANK(GyaoonPicFront) == BANK(GyaoonPicBack)
db BANK(GawarhedPicFront)
assert BANK(GawarhedPicFront) == BANK(GawarhedPicBack)

14
data/pokemon/base_stats/cryithan.asm → data/pokemon/base_stats/iguanarch.asm
View file

@ -1,16 +1,16 @@
db DEX_CRYITHAN ; pokedex id
db DEX_IGUANARCH ; pokedex id
db 92, 93, 76, 108, 121
db 102, 93, 76, 108, 121
; hp atk def spd spc
db DRAGON, DRAGON ; type
db 9 ; catch rate
db 210 ; base exp
INCBIN "gfx/pokemon/front/cryithan.pic", 0, 1 ; sprite dimensions
dw CryithanPicFront, CryithanPicBack
INCBIN "gfx/pokemon/front/iguanarch.pic", 0, 1 ; sprite dimensions
dw IguanarchPicFront, IguanarchPicBack
db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
@ -21,5 +21,5 @@
CUT, SURF, STRENGTH
; end
db BANK(CryithanPicFront)
assert BANK(CryithanPicFront) == BANK(CryithanPicBack)
db BANK(IguanarchPicFront)
assert BANK(IguanarchPicFront) == BANK(IguanarchPicBack)

10
data/pokemon/base_stats/puchikoon.asm → data/pokemon/base_stats/kolta.asm
View file

@ -1,4 +1,4 @@
db DEX_PUCHIKOON ; pokedex id
db DEX_KOLTA ; pokedex id
db 30, 65, 35, 70, 45
; hp atk def spd spc
@ -7,8 +7,8 @@
db 255 ; catch rate
db 88 ; base exp
INCBIN "gfx/pokemon/front/puchikoon.pic", 0, 1 ; sprite dimensions
dw PuchikoonPicFront, PuchikoonPicBack
INCBIN "gfx/pokemon/front/kolta.pic", 0, 1 ; sprite dimensions
dw KoltaPicFront, KoltaPicBack
db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -19,5 +19,5 @@
FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE
; end
db BANK(PuchikoonPicFront)
assert BANK(PuchikoonPicFront) == BANK(PuchikoonPicBack)
db BANK(KoltaPicFront)
assert BANK(KoltaPicFront) == BANK(KoltaPicBack)

10
data/pokemon/base_stats/madaamu.asm → data/pokemon/base_stats/luxwan.asm
View file

@ -1,4 +1,4 @@
db DEX_MADAAMU ; pokedex id
db DEX_LUXWAN ; pokedex id
db 72, 105, 75, 70, 63
; hp atk def spd spc
@ -7,8 +7,8 @@
db 25 ; catch rate
db 196 ; base exp
INCBIN "gfx/pokemon/front/madaamu.pic", 0, 1 ; sprite dimensions
dw MadaamuPicFront, MadaamuPicBack
INCBIN "gfx/pokemon/front/luxwan.pic", 0, 1 ; sprite dimensions
dw LuxwanPicFront, LuxwanPicBack
db PECK, SAND_ATTACK, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -21,5 +21,5 @@
FLY
; end
db BANK(MadaamuPicFront)
assert BANK(MadaamuPicFront) == BANK(MadaamuPicBack)
db BANK(LuxwanPicFront)
assert BANK(LuxwanPicFront) == BANK(LuxwanPicBack)

10
data/pokemon/base_stats/animon.asm → data/pokemon/base_stats/mimmeo.asm
View file

@ -1,4 +1,4 @@
db DEX_ANIMON ; pokedex id
db DEX_MIMMEO ; pokedex id
db 100, 55, 50, 150, 50
; hp atk def spd spc
@ -7,8 +7,8 @@
db 35 ; catch rate
db 161 ; base exp
INCBIN "gfx/pokemon/front/animon.pic", 0, 1 ; sprite dimensions
dw AnimonPicFront, AnimonPicBack
INCBIN "gfx/pokemon/front/mimmeo.pic", 0, 1 ; sprite dimensions
dw MimmeoPicFront, MimmeoPicBack
db TRANSFORM, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -17,5 +17,5 @@
tmhm
; end
db BANK(AnimonPicFront)
assert BANK(AnimonPicFront) == BANK(AnimonPicBack)
db BANK(MimmeoPicFront)
assert BANK(MimmeoPicFront) == BANK(MimmeoPicBack)

12
data/pokemon/base_stats/bawligua.asm → data/pokemon/base_stats/ministare.asm
View file

@ -1,4 +1,4 @@
db DEX_BAWLIGUA ; pokedex id
db DEX_MINISTARE ; pokedex id
db 72, 53, 46, 98, 81
; hp atk def spd spc
@ -7,10 +7,10 @@
db 45 ; catch rate
db 144 ; base exp
INCBIN "gfx/pokemon/front/bawligua.pic", 0, 1 ; sprite dimensions
dw BawliguaPicFront, BawliguaPicBack
INCBIN "gfx/pokemon/front/ministare.pic", 0, 1 ; sprite dimensions
dw MinistarePicFront, MinistarePicBack
db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
@ -21,5 +21,5 @@
SURF, STRENGTH
; end
db BANK(BawliguaPicFront)
assert BANK(BawliguaPicFront) == BANK(BawliguaPicBack)
db BANK(MinistarePicFront)
assert BANK(MinistarePicFront) == BANK(MinistarePicBack)

10
data/pokemon/base_stats/omega.asm → data/pokemon/base_stats/omegadge.asm
View file

@ -1,4 +1,4 @@
db DEX_OMEGA ; pokedex id
db DEX_OMEGADGE ; pokedex id
db 101, 106, 120, 25, 95
; hp atk def spd spc
@ -7,8 +7,8 @@
db 25 ; catch rate
db 204 ; base exp
INCBIN "gfx/pokemon/front/omega.pic", 0, 1 ; sprite dimensions
dw OmegaPicFront, OmegaPicBack
INCBIN "gfx/pokemon/front/omegadge.pic", 0, 1 ; sprite dimensions
dw OmegadgePicFront, OmegadgePicBack
db SUPERSONIC, METAL_SOUND, TACKLE, MAGNET_BOMB ; level 1 learnset
db GROWTH_SLOW ; growth rate
@ -22,5 +22,5 @@
TRI_ATTACK, SUBSTITUTE, STRENGTH, FLASH
; end
db BANK(OmegaPicFront)
assert BANK(OmegaPicFront) == BANK(OmegaPicBack)
db BANK(OmegadgePicFront)
assert BANK(OmegadgePicFront) == BANK(OmegadgePicBack)

10
data/pokemon/base_stats/gyopin.asm → data/pokemon/base_stats/orfry.asm
View file

@ -1,4 +1,4 @@
db DEX_GYOPIN ; pokedex id
db DEX_ORFRY ; pokedex id
db 35, 57, 50, 53, 40
; hp atk def spd spc
@ -7,8 +7,8 @@
db 255 ; catch rate
db 57 ; base exp
INCBIN "gfx/pokemon/front/gyopin.pic", 0, 1 ; sprite dimensions
dw GyopinPicFront, GyopinPicBack
INCBIN "gfx/pokemon/front/orfry.pic", 0, 1 ; sprite dimensions
dw OrfryPicFront, OrfryPicBack
db PECK, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -20,5 +20,5 @@
SUBSTITUTE, SURF
; end
db BANK(GyopinPicFront)
assert BANK(GyopinPicFront) == BANK(GyopinPicBack)
db BANK(OrfryPicFront)
assert BANK(OrfryPicFront) == BANK(OrfryPicBack)

10
data/pokemon/base_stats/kasanagi.asm → data/pokemon/base_stats/pupal.asm
View file

@ -1,4 +1,4 @@
db DEX_KASANAGI ; pokedex id
db DEX_PUPAL ; pokedex id
db 45, 20, 50, 40, 30
; hp atk def spd spc
@ -7,8 +7,8 @@
db 120 ; catch rate
db 73 ; base exp
INCBIN "gfx/pokemon/front/kasanagi.pic", 0, 1 ; sprite dimensions
dw KasanagiPicFront, KasanagiPicBack
INCBIN "gfx/pokemon/front/pupal.pic", 0, 1 ; sprite dimensions
dw PupalPicFront, PupalPicBack
db HARDEN, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -17,5 +17,5 @@
tmhm
; end
db BANK(KasanagiPicFront)
assert BANK(KasanagiPicFront) == BANK(KasanagiPicBack)
db BANK(PupalPicFront)
assert BANK(PupalPicFront) == BANK(PupalPicBack)

10
data/pokemon/base_stats/deer.asm → data/pokemon/base_stats/ramoose.asm
View file

@ -1,4 +1,4 @@
db DEX_DEER ; pokedex id
db DEX_RAMOOSE ; pokedex id
db 85, 110, 85, 60, 90
; hp atk def spd spc
@ -7,8 +7,8 @@
db 45 ; catch rate
db 165 ; base exp
INCBIN "gfx/pokemon/front/deer.pic", 0, 1 ; sprite dimensions
dw DeerPicFront, DeerPicBack
INCBIN "gfx/pokemon/front/ramoose.pic", 0, 1 ; sprite dimensions
dw RamoosePicFront, RamoosePicBack
db TACKLE, NO_MOVE, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
@ -21,5 +21,5 @@
FLASH
; end
db BANK(DeerPicFront)
assert BANK(DeerPicFront) == BANK(DeerPicBack)
db BANK(RamoosePicFront)
assert BANK(RamoosePicFront) == BANK(RamoosePicBack)

10
data/pokemon/base_stats/jagg.asm → data/pokemon/base_stats/sharpoon.asm
View file

@ -1,4 +1,4 @@
db DEX_JAGG ; pokedex id
db DEX_SHARPOON ; pokedex id
db 80, 115, 100, 60, 85
; hp atk def spd spc
@ -7,8 +7,8 @@
db 45 ; catch rate
db 204 ; base exp
INCBIN "gfx/pokemon/front/jagg.pic", 0, 1 ; sprite dimensions
dw JaggPicFront, JaggPicBack
INCBIN "gfx/pokemon/front/sharpoon.pic", 0, 1 ; sprite dimensions
dw SharpoonPicFront, SharpoonPicBack
db BITE, LEER, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
@ -20,5 +20,5 @@
BIDE, SKULL_BASH, REST, SUBSTITUTE, SURF
; end
db BANK(JaggPicFront)
assert BANK(JaggPicFront) == BANK(JaggPicBack)
db BANK(SharpoonPicFront)
assert BANK(SharpoonPicFront) == BANK(SharpoonPicBack)

12
data/pokemon/base_stats/skimper.asm → data/pokemon/base_stats/squeamata.asm
View file

@ -1,4 +1,4 @@
db DEX_SKIMPER ; pokedex id
db DEX_SQUEAMATA ; pokedex id
db 62, 43, 36, 88, 71
; hp atk def spd spc
@ -7,10 +7,10 @@
db 60 ; catch rate
db 67 ; base exp
INCBIN "gfx/pokemon/front/skimper.pic", 0, 1 ; sprite dimensions
dw SkimperPicFront, SkimperPicBack
INCBIN "gfx/pokemon/front/squeamata.pic", 0, 1 ; sprite dimensions
dw SqueamataPicFront, SqueamataPicBack
db SCRATCH, GROWL, NO_MOVE, NO_MOVE ; level 1 learnset
db SCRATCH, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
@ -21,5 +21,5 @@
SURF
; end
db BANK(SkimperPicFront)
assert BANK(SkimperPicFront) == BANK(SkimperPicBack)
db BANK(SqueamataPicFront)
assert BANK(SqueamataPicFront) == BANK(SqueamataPicBack)

10
data/pokemon/base_stats/purakkusu.asm → data/pokemon/base_stats/tricules.asm
View file

@ -1,4 +1,4 @@
db DEX_PURAKKUSU ; pokedex id
db DEX_TRICULES ; pokedex id
db 65, 125, 140, 85, 55
; hp atk def spd spc
@ -7,8 +7,8 @@
db 25 ; catch rate
db 209 ; base exp
INCBIN "gfx/pokemon/front/purakkusu.pic", 0, 1 ; sprite dimensions
dw PurakkusuPicFront, PurakkusuPicBack
INCBIN "gfx/pokemon/front/tricules.pic", 0, 1 ; sprite dimensions
dw TriculesPicFront, TriculesPicBack
db VICEGRIP, HARDEN, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_SLOW ; growth rate
@ -20,5 +20,5 @@
REST, SUBSTITUTE, CUT, STRENGTH
; end
db BANK(PurakkusuPicFront)
assert BANK(PurakkusuPicFront) == BANK(PurakkusuPicBack)
db BANK(TriculesPicFront)
assert BANK(TriculesPicFront) == BANK(TriculesPicBack)

0
data/pokemon/base_stats/betobebii.asm → data/pokemon/base_stats/unused/betobebii.asm
View file

0
data/pokemon/base_stats/bittybat.asm → data/pokemon/base_stats/unused/bittybat.asm
View file

0
data/pokemon/base_stats/hinaazu.asm → data/pokemon/base_stats/unused/hinaazu.asm
View file

0
data/pokemon/base_stats/magnetite.asm → data/pokemon/base_stats/unused/magnetite.asm
View file

0
data/pokemon/base_stats/monja.asm → data/pokemon/base_stats/unused/monja.asm
View file

0
data/pokemon/base_stats/pudi.asm → data/pokemon/base_stats/unused/pudi.asm
View file

10
data/pokemon/base_stats/mikon.asm → data/pokemon/base_stats/vulpiii.asm
View file

@ -1,4 +1,4 @@
db DEX_MIKON ; pokedex id
db DEX_VULPIII ; pokedex id
db 28, 31, 30, 60, 60
; hp atk def spd spc
@ -7,8 +7,8 @@
db 255 ; catch rate
db 53 ; base exp
INCBIN "gfx/pokemon/front/mikon.pic", 0, 1 ; sprite dimensions
dw MikonPicFront, MikonPicBack
INCBIN "gfx/pokemon/front/vulpiii.pic", 0, 1 ; sprite dimensions
dw VulpiiiPicFront, VulpiiiPicBack
db EMBER, TAIL_WHIP, NO_MOVE, NO_MOVE ; level 1 learnset
db GROWTH_MEDIUM_FAST ; growth rate
@ -19,5 +19,5 @@
FIRE_BLAST, SWIFT, SKULL_BASH, REST, SUBSTITUTE
; end
db BANK(MikonPicFront)
assert BANK(MikonPicFront) == BANK(MikonPicBack)
db BANK(VulpiiiPicFront)
assert BANK(VulpiiiPicFront) == BANK(VulpiiiPicBack)

2
data/pokemon/base_stats/wigglytuff.asm
View file

@ -10,7 +10,7 @@
INCBIN "gfx/pokemon/front/wigglytuff.pic", 0, 1 ; sprite dimensions
dw WigglytuffPicFront, WigglytuffPicBack
db SING, BODY_SLAM, HYPER_BEAM, BUBBLEBEAM ; level 1 learnset - used for trainers
db SING, DISABLE, DEFENSE_CURL, DOUBLESLAP ; level 1 learnset
db GROWTH_FAST ; growth rate
; tm/hm learnset

6
data/pokemon/cries.asm
View file

@ -4,6 +4,8 @@ MACRO mon_cry
db \2, \3
ENDM
; THIS FILE IS NOW UNUSED DUE TO THE CRYSAUDIO PATCH USING A DIFFERENT SYSTEM
CryData::
table_width 3, CryData
; base cry, pitch, length
@ -197,7 +199,7 @@ CryData::
mon_cry SFX_CRY_21, $55, $01 ; Bellsprout
mon_cry SFX_CRY_25, $44, $20 ; Weepinbell
mon_cry SFX_CRY_25, $66, $CC ; Victreebel
mon_cry SFX_CRY_12, $93, $00 ; Monja
; mon_cry SFX_CRY_12, $93, $00 ; Monja
mon_cry SFX_CRY_1F, $40, $01 ; Pudi
mon_cry SFX_CRY_00, $00, $00 ; Scizor
mon_cry SFX_CRY_00, $00, $00 ; Rhyperior
@ -231,8 +233,6 @@ CryData::
mon_cry SFX_CRY_20, $00, $1C ; Annihilape
mon_cry SFX_CRY_0E, $FA, $80 ; Scream Tail
mon_cry SFX_CRY_1C, $1F, $DD ; Sandy Shocks
mon_cry SFX_CRY_00, $00, $00 ; Wiglett
mon_cry SFX_CRY_00, $00, $00 ; Wugtrio
mon_cry SFX_CRY_00, $00, $00 ; Toedscool
mon_cry SFX_CRY_00, $00, $00 ; Toedscruel
mon_cry SFX_CRY_19, $1A, $40 ; Perrserker

179
data/pokemon/dex_entries.asm
View file

@ -30,7 +30,7 @@ PokedexEntryPointers:
dw BlastoiseDexEntry
dw PinsirDexEntry
dw TangelaDexEntry
dw GyaoonDexEntry
dw GawarhedDexEntry
dw NidoreignDexEntry
dw GrowlitheDexEntry
dw OnixDexEntry
@ -49,26 +49,26 @@ PokedexEntryPointers:
dw PsyduckDexEntry
dw DrowzeeDexEntry
dw GolemDexEntry
dw BarundaDexEntry
dw BalumbaDexEntry
dw MagmarDexEntry
dw BuuDexEntry
dw ElectabuzzDexEntry
dw MagnetonDexEntry
dw KoffingDexEntry
dw DeerDexEntry
dw RamooseDexEntry
dw MankeyDexEntry
dw SeelDexEntry
dw DiglettDexEntry
dw TaurosDexEntry
dw TrampelDexEntry
dw CrockyDexEntry
dw GavillainDexEntry
dw BlottleDexEntry
dw FarfetchdDexEntry
dw VenonatDexEntry
dw DragoniteDexEntry
dw CactusDexEntry
dw JaggDexEntry
dw BittybatDexEntry
dw CactormusDexEntry
dw SharpoonDexEntry
dw WiglettDexEntry
dw DoduoDexEntry
dw PoliwagDexEntry
dw JynxDexEntry
@ -80,7 +80,7 @@ PokedexEntryPointers:
dw KrabbyDexEntry
dw CheepDexEntry
dw JabettaDexEntry
dw MikonDexEntry
dw VulpiiiDexEntry
dw VulpixDexEntry
dw NinetalesDexEntry
dw PikachuDexEntry
@ -93,8 +93,8 @@ PokedexEntryPointers:
dw KabutopsDexEntry
dw HorseaDexEntry
dw SeadraDexEntry
dw BawliguaDexEntry
dw CryithanDexEntry
dw MinistareDexEntry
dw IguanarchDexEntry
dw SandshrewDexEntry
dw SandslashDexEntry
dw OmanyteDexEntry
@ -114,13 +114,13 @@ PokedexEntryPointers:
dw WeedleDexEntry
dw KakunaDexEntry
dw BeedrillDexEntry
dw MadaamuDexEntry
dw LuxwanDexEntry
dw DodrioDexEntry
dw PrimeapeDexEntry
dw DugtrioDexEntry
dw VenomothDexEntry
dw DewgongDexEntry
dw PurakkusuDexEntry
dw TriculesDexEntry
dw PendrakenDexEntry
dw CaterpieDexEntry
dw MetapodDexEntry
@ -133,13 +133,13 @@ PokedexEntryPointers:
dw MewtwoDexEntry
dw SnorlaxDexEntry
dw MagikarpDexEntry
dw KonyaDexEntry
dw OmegaDexEntry
dw CoinpurDexEntry
dw OmegadgeDexEntry
dw MukDexEntry
dw DecillaDexEntry
dw KinglerDexEntry
dw CloysterDexEntry
dw MagnetiteDexEntry
dw WugtrioDexEntry
dw ElectrodeDexEntry
dw ClefableDexEntry
dw WeezingDexEntry
@ -155,13 +155,13 @@ PokedexEntryPointers:
dw BulbasaurDexEntry
dw VenusaurDexEntry
dw TentacruelDexEntry
dw GyopinDexEntry
dw OrfryDexEntry
dw GoldeenDexEntry
dw SeakingDexEntry
dw KotoraDexEntry
dw GaotoraDexEntry
dw GorotoraDexEntry
dw PuchikoonDexEntry
dw KoltaDexEntry
dw PonytaDexEntry
dw RapidashDexEntry
dw RattataDexEntry
@ -173,7 +173,7 @@ PokedexEntryPointers:
dw AerodactylDexEntry
dw BlastykeDexEntry
dw MagnemiteDexEntry
dw SkimperDexEntry
dw SqueamataDexEntry
dw GorochuDexEntry
dw CharmanderDexEntry
dw SquirtleDexEntry
@ -190,7 +190,6 @@ PokedexEntryPointers:
dw BellsproutDexEntry
dw WeepinbellDexEntry
dw VictreebelDexEntry
dw MonjaDexEntry
dw ScizorDexEntry
dw RhyperiorDexEntry
dw EspeonDexEntry
@ -201,12 +200,12 @@ PokedexEntryPointers:
dw LickilickyDexEntry
dw TangrowthDexEntry
dw KleavorDexEntry
dw TsubomittoDexEntry
dw BellignanDexEntry
dw SteelixDexEntry
dw BlisseyDexEntry
dw HitmontopDexEntry
dw CrobatDexEntry
dw AnimonDexEntry
dw MimmeoDexEntry
dw BellossomDexEntry
dw Porygon2DexEntry
dw KingdraDexEntry
@ -214,17 +213,15 @@ PokedexEntryPointers:
dw SlowkingDexEntry
dw ElectivireDexEntry
dw MagmortarDexEntry
dw TaabanDexEntry
dw DisturbanDexEntry
dw KokanaDexEntry
dw KasanagiDexEntry
dw PupalDexEntry
dw CarapthorDexEntry
dw MagnezoneDexEntry
dw PorygonZDexEntry
dw AnnihilapeDexEntry
dw ScreamTailDexEntry
dw SandyShocksDexEntry
dw WiglettDexEntry
dw WugtrioDexEntry
dw ToedscoolDexEntry
dw ToedscruelDexEntry
dw PerrserkerDexEntry
@ -1325,11 +1322,11 @@ MissingNoDexEntry:
text_far _MissingNoDexEntry
text_end
GyaoonDexEntry:
GawarhedDexEntry:
db "CALAMITY@"
db 8,2
dw 6900
text_far _GyaoonDexEntry
text_far _GawarhedDexEntry
text_end
GuardiaDexEntry:
@ -1339,18 +1336,18 @@ GuardiaDexEntry:
text_far _GuardiaDexEntry
text_end
DeerDexEntry:
RamooseDexEntry:
db "BIG HORN@"
db 4,11
dw 1230
text_far _DeerDexEntry
text_far _RamooseDexEntry
text_end
MadaamuDexEntry:
db "WILD DUCK@"
LuxwanDexEntry:
db "MASQUERADE@" ; changed from Wild Duck since it's more closely based on a mute swan
db 3,11
dw 590
text_far _MadaamuDexEntry
text_far _LuxwanDexEntry
text_end
DecillaDexEntry:
@ -1374,11 +1371,11 @@ KotoraDexEntry:
text_far _KotoraDexEntry
text_end
JaggDexEntry:
SharpoonDexEntry:
db "IRON HORN@"
db 11,2
dw 4220
text_far _JaggDexEntry
text_far _SharpoonDexEntry
text_end
JabettaDexEntry:
@ -1395,26 +1392,26 @@ GaotoraDexEntry:
text_far _GaotoraDexEntry
text_end
CactusDexEntry:
CactormusDexEntry:
db "NEEDLE@"
db 2,11
dw 520
text_far _CactusDexEntry
text_far _CactormusDexEntry
text_end
KonyaDexEntry:
CoinpurDexEntry:
db "KITTEN@"
db 1,0
dw 60
text_far _KonyaDexEntry
text_far _CoinpurDexEntry
text_end
BittybatDexEntry:
db "TINY BAT@"
db 1,0
dw 80
text_far _BittybatDexEntry
text_end
;BittybatDexEntry:
; db "TINY BAT@"
; db 1,0
; dw 80
; text_far _BittybatDexEntry
; text_end
RibbitoDexEntry:
db "SUMO@"
@ -1423,11 +1420,11 @@ RibbitoDexEntry:
text_far _RibbitoDexEntry
text_end
CryithanDexEntry:
db "WEEPING@"
db 7,3
IguanarchDexEntry:
db "HOSTILE@"
db 8,6
dw 3130
text_far _CryithanDexEntry
text_far _IguanarchDexEntry
text_end
BlastykeDexEntry:
@ -1444,32 +1441,32 @@ BuuDexEntry:
text_far _BuuDexEntry
text_end
SkimperDexEntry:
db "TIMID@"
db 1,4
dw 90
text_far _SkimperDexEntry
SqueamataDexEntry:
db "IGUANA@"
db 2,0
dw 120
text_far _SqueamataDexEntry
text_end
BawliguaDexEntry:
db "TIMID@"
db 3,7
MinistareDexEntry:
db "IGUANA@"
db 4,7
dw 550
text_far _BawliguaDexEntry
text_far _MinistareDexEntry
text_end
PuchikoonDexEntry:
KoltaDexEntry:
db "FIRE HORSE@"
db 1,4
dw 280
text_far _PuchikoonDexEntry
text_far _KoltaDexEntry
text_end
GyopinDexEntry:
OrfryDexEntry:
db "GOLDFISH@"
db 0,8
dw 50
text_far _GyopinDexEntry
text_far _OrfryDexEntry
text_end
GorochuDexEntry:
@ -1479,11 +1476,11 @@ GorochuDexEntry:
text_far _GorochuDexEntry
text_end
MikonDexEntry:
VulpiiiDexEntry:
db "FOX@"
db 1,4
dw 120
text_far _MikonDexEntry
text_far _VulpiiiDexEntry
text_end
CheepDexEntry:
@ -1521,11 +1518,11 @@ GorotoraDexEntry:
text_far _GorotoraDexEntry
text_end
OmegaDexEntry:
OmegadgeDexEntry:
db "ARTIFICIAL@"
db 8,6
dw 8260
text_far _OmegaDexEntry
text_far _OmegadgeDexEntry
text_end
NidoreignDexEntry:
@ -1542,11 +1539,11 @@ TrampelDexEntry:
text_far _TrampelDexEntry
text_end
CrockyDexEntry:
GavillainDexEntry:
db "GLARING@"
db 2,11
dw 520
text_far _CrockyDexEntry
text_far _GavillainDexEntry
text_end
PendrakenDexEntry:
@ -1556,39 +1553,39 @@ PendrakenDexEntry:
text_far _PendrakenDexEntry
text_end
MagnetiteDexEntry:
db "MAGNET@"
db 2,4
dw 400
text_far _MagnetiteDexEntry
text_end
;MagnetiteDexEntry:
; db "MAGNET@"
; db 2,4
; dw 400
; text_far _MagnetiteDexEntry
; text_end
PurakkusuDexEntry:
TriculesDexEntry:
db "BIG HORN@"
db 5,11
dw 2540
text_far _PurakkusuDexEntry
text_far _TriculesDexEntry
text_end
BarundaDexEntry:
BalumbaDexEntry:
db "BALLOON@"
db 1,4
dw 10
text_far _BarundaDexEntry
text_far _BalumbaDexEntry
text_end
TsubomittoDexEntry:
BellignanDexEntry:
db "SPROUT@"
db 4,3
dw 160
text_far _TsubomittoDexEntry
text_far _BellignanDexEntry
text_end
AnimonDexEntry:
MimmeoDexEntry:
db "TRANSFORM@"
db 2,0
dw 360
text_far _AnimonDexEntry
text_far _MimmeoDexEntry
text_end
BellossomDexEntry:
@ -1668,12 +1665,12 @@ KleavorDexEntry:
text_far _KleavorDexEntry
text_end
MonjaDexEntry:
db "VINE@"
db 1,4
dw 330
text_far _MonjaDexEntry
text_end
;MonjaDexEntry:
; db "VINE@"
; db 1,4
; dw 330
; text_far _MonjaDexEntry
; text_end
SteelixDexEntry:
db "IRON SNAKE@"
@ -1745,11 +1742,11 @@ MagmortarDexEntry:
text_far _MagmortarDexEntry
text_end
TaabanDexEntry:
DisturbanDexEntry:
db "SPIRAL@"
db 4,3
dw 1530
text_far _TaabanDexEntry
text_far _DisturbanDexEntry
text_end
KokanaDexEntry:
@ -1759,11 +1756,11 @@ KokanaDexEntry:
text_far _KokanaDexEntry
text_end
KasanagiDexEntry:
PupalDexEntry:
db "PUPA@"
db 2,7
dw 220
text_far _KasanagiDexEntry
text_far _PupalDexEntry
text_end
CarapthorDexEntry:

47
data/pokemon/dex_order.asm
View file

@ -30,7 +30,7 @@ PokedexOrder:
db DEX_BLASTOISE
db DEX_PINSIR
db DEX_TANGELA
db DEX_GYAOON
db DEX_GAWARHED
db DEX_NIDOREIGN
db DEX_GROWLITHE
db DEX_ONIX
@ -49,26 +49,26 @@ PokedexOrder:
db DEX_PSYDUCK
db DEX_DROWZEE
db DEX_GOLEM
db DEX_BARUNDA
db DEX_BALUMBA
db DEX_MAGMAR
db DEX_BUU
db DEX_ELECTABUZZ
db DEX_MAGNETON
db DEX_KOFFING
db DEX_DEER
db DEX_RAMOOSE
db DEX_MANKEY
db DEX_SEEL
db DEX_DIGLETT
db DEX_TAUROS
db DEX_TRAMPEL
db DEX_CROCKY
db DEX_GAVILLAIN
db DEX_BLOTTLE
db DEX_FARFETCHD
db DEX_VENONAT
db DEX_DRAGONITE
db DEX_CACTUS
db DEX_JAGG
db DEX_BITTYBAT
db DEX_CACTORMUS
db DEX_SHARPOON
db DEX_WIGLETT
db DEX_DODUO
db DEX_POLIWAG
db DEX_JYNX
@ -80,7 +80,7 @@ PokedexOrder:
db DEX_KRABBY
db DEX_CHEEP
db DEX_JABETTA
db DEX_MIKON
db DEX_VULPIII
db DEX_VULPIX
db DEX_NINETALES
db DEX_PIKACHU
@ -93,8 +93,8 @@ PokedexOrder:
db DEX_KABUTOPS
db DEX_HORSEA
db DEX_SEADRA
db DEX_BAWLIGUA
db DEX_CRYITHAN
db DEX_MINISTARE
db DEX_IGUANARCH
db DEX_SANDSHREW
db DEX_SANDSLASH
db DEX_OMANYTE
@ -114,13 +114,13 @@ PokedexOrder:
db DEX_WEEDLE
db DEX_KAKUNA
db DEX_BEEDRILL
db DEX_MADAAMU
db DEX_LUXWAN
db DEX_DODRIO
db DEX_PRIMEAPE
db DEX_DUGTRIO
db DEX_VENOMOTH
db DEX_DEWGONG
db DEX_PURAKKUSU
db DEX_TRICULES
db DEX_PENDRAKEN
db DEX_CATERPIE
db DEX_METAPOD
@ -133,13 +133,13 @@ PokedexOrder:
db DEX_MEWTWO
db DEX_SNORLAX
db DEX_MAGIKARP
db DEX_KONYA
db DEX_OMEGA
db DEX_COINPUR
db DEX_OMEGADGE
db DEX_MUK
db DEX_DECILLA
db DEX_KINGLER
db DEX_CLOYSTER
db DEX_MAGNETITE
db DEX_WUGTRIO
db DEX_ELECTRODE
db DEX_CLEFABLE
db DEX_WEEZING
@ -155,13 +155,13 @@ PokedexOrder:
db DEX_BULBASAUR
db DEX_VENUSAUR
db DEX_TENTACRUEL
db DEX_GYOPIN
db DEX_ORFRY
db DEX_GOLDEEN
db DEX_SEAKING
db DEX_KOTORA
db DEX_GAOTORA
db DEX_GOROTORA
db DEX_PUCHIKOON
db DEX_KOLTA
db DEX_PONYTA
db DEX_RAPIDASH
db DEX_RATTATA
@ -173,7 +173,7 @@ PokedexOrder:
db DEX_AERODACTYL
db DEX_BLASTYKE
db DEX_MAGNEMITE
db DEX_SKIMPER
db DEX_SQUEAMATA
db DEX_GOROCHU
db DEX_CHARMANDER
db DEX_SQUIRTLE
@ -190,7 +190,6 @@ PokedexOrder:
db DEX_BELLSPROUT
db DEX_WEEPINBELL
db DEX_VICTREEBEL
db DEX_MONJA
db DEX_SCIZOR
db DEX_RHYPERIOR
db DEX_ESPEON
@ -201,12 +200,12 @@ PokedexOrder:
db DEX_LICKILICKY
db DEX_TANGROWTH
db DEX_KLEAVOR
db DEX_TSUBOMITTO
db DEX_BELLIGNAN
db DEX_STEELIX
db DEX_BLISSEY
db DEX_HITMONTOP
db DEX_CROBAT
db DEX_ANIMON
db DEX_MIMMEO
db DEX_BELLOSSOM
db DEX_PORYGON2
db DEX_KINGDRA
@ -214,17 +213,15 @@ PokedexOrder:
db DEX_SLOWKING
db DEX_ELECTIVIRE
db DEX_MAGMORTAR
db DEX_TAABAN
db DEX_DISTURBAN
db DEX_KOKANA
db DEX_KASANAGI
db DEX_PUPAL
db DEX_CARAPTHOR
db DEX_MAGNEZONE
db DEX_PORYGONZ
db DEX_ANNIHILAPE
db DEX_SCREAM_TAIL
db DEX_SANDY_SHOCKS
db DEX_WIGLETT
db DEX_WUGTRIO
db DEX_TOEDSCOOL
db DEX_TOEDSCRUEL
db DEX_PERRSERKER

209
data/pokemon/evos_moves.asm
View file

@ -42,7 +42,7 @@ EvosMovesPointerTable:
dw BlastoiseEvosMoves
dw PinsirEvosMoves
dw TangelaEvosMoves
dw GyaoonEvosMoves
dw GawarhedEvosMoves
dw NidoreignEvosMoves
dw GrowlitheEvosMoves
dw OnixEvosMoves
@ -61,26 +61,26 @@ EvosMovesPointerTable:
dw PsyduckEvosMoves
dw DrowzeeEvosMoves
dw GolemEvosMoves
dw BarundaEvosMoves
dw BalumbaEvosMoves
dw MagmarEvosMoves
dw BuuEvosMoves
dw ElectabuzzEvosMoves
dw MagnetonEvosMoves
dw KoffingEvosMoves
dw DeerEvosMoves
dw RamooseEvosMoves
dw MankeyEvosMoves
dw SeelEvosMoves
dw DiglettEvosMoves
dw TaurosEvosMoves
dw TrampelEvosMoves
dw CrockyEvosMoves
dw GavillainEvosMoves
dw BlottleEvosMoves
dw FarfetchdEvosMoves
dw VenonatEvosMoves
dw DragoniteEvosMoves
dw CactusEvosMoves
dw JaggEvosMoves
dw BittybatEvosMoves
dw CactormusEvosMoves
dw SharpoonEvosMoves
dw WiglettEvosMoves
dw DoduoEvosMoves
dw PoliwagEvosMoves
dw JynxEvosMoves
@ -92,7 +92,7 @@ EvosMovesPointerTable:
dw KrabbyEvosMoves
dw CheepEvosMoves
dw JabettaEvosMoves
dw MikonEvosMoves
dw VulpiiiEvosMoves
dw VulpixEvosMoves
dw NinetalesEvosMoves
dw PikachuEvosMoves
@ -105,8 +105,8 @@ EvosMovesPointerTable:
dw KabutopsEvosMoves
dw HorseaEvosMoves
dw SeadraEvosMoves
dw BawliguaEvosMoves
dw CryithanEvosMoves
dw MinistareEvosMoves
dw IguanarchEvosMoves
dw SandshrewEvosMoves
dw SandslashEvosMoves
dw OmanyteEvosMoves
@ -126,13 +126,13 @@ EvosMovesPointerTable:
dw WeedleEvosMoves
dw KakunaEvosMoves
dw BeedrillEvosMoves
dw MadaamuEvosMoves
dw LuxwanEvosMoves
dw DodrioEvosMoves
dw PrimeapeEvosMoves
dw DugtrioEvosMoves
dw VenomothEvosMoves
dw DewgongEvosMoves
dw PurakkusuEvosMoves
dw TriculesEvosMoves
dw PendrakenEvosMoves
dw CaterpieEvosMoves
dw MetapodEvosMoves
@ -145,13 +145,13 @@ EvosMovesPointerTable:
dw MewtwoEvosMoves
dw SnorlaxEvosMoves
dw MagikarpEvosMoves
dw KonyaEvosMoves
dw OmegaEvosMoves
dw CoinpurEvosMoves
dw OmegadgeEvosMoves
dw MukEvosMoves
dw DecillaEvosMoves
dw KinglerEvosMoves
dw CloysterEvosMoves
dw MagnetiteEvosMoves
dw WugtrioEvosMoves
dw ElectrodeEvosMoves
dw ClefableEvosMoves
dw WeezingEvosMoves
@ -167,13 +167,13 @@ EvosMovesPointerTable:
dw BulbasaurEvosMoves
dw VenusaurEvosMoves
dw TentacruelEvosMoves
dw GyopinEvosMoves
dw OrfryEvosMoves
dw GoldeenEvosMoves
dw SeakingEvosMoves
dw KotoraEvosMoves
dw GaotoraEvosMoves
dw GorotoraEvosMoves
dw PuchikoonEvosMoves
dw KoltaEvosMoves
dw PonytaEvosMoves
dw RapidashEvosMoves
dw RattataEvosMoves
@ -185,7 +185,7 @@ EvosMovesPointerTable:
dw AerodactylEvosMoves
dw BlastykeEvosMoves
dw MagnemiteEvosMoves
dw SkimperEvosMoves
dw SqueamataEvosMoves
dw GorochuEvosMoves
dw CharmanderEvosMoves
dw SquirtleEvosMoves
@ -202,7 +202,6 @@ EvosMovesPointerTable:
dw BellsproutEvosMoves
dw WeepinbellEvosMoves
dw VictreebelEvosMoves
dw MonjaEvosMoves
dw ScizorEvosMoves
dw RhyperiorEvosMoves
dw EspeonEvosMoves
@ -213,12 +212,12 @@ EvosMovesPointerTable:
dw LickilickyEvosMoves
dw TangrowthEvosMoves
dw KleavorEvosMoves
dw TsubomittoEvosMoves
dw BellignanEvosMoves
dw SteelixEvosMoves
dw BlisseyEvosMoves
dw HitmontopEvosMoves
dw CrobatEvosMoves
dw AnimonEvosMoves
dw MimmeoEvosMoves
dw BellossomEvosMoves
dw Porygon2EvosMoves
dw KingdraEvosMoves
@ -226,17 +225,15 @@ EvosMovesPointerTable:
dw SlowkingEvosMoves
dw ElectivireEvosMoves
dw MagmortarEvosMoves
dw TaabanEvosMoves
dw DisturbanEvosMoves
dw KokanaEvosMoves
dw KasanagiEvosMoves
dw PupalEvosMoves
dw CarapthorEvosMoves
dw MagnezoneEvosMoves
dw PorygonZEvosMoves
dw AnnihilapeEvosMoves
dw ScreamTailEvosMoves
dw SandyShocksEvosMoves
dw WiglettEvosMoves
dw WugtrioEvosMoves
dw SandyShocksEvosMoves
dw ToedscoolEvosMoves
dw ToedscruelEvosMoves
dw PerrserkerEvosMoves
@ -522,7 +519,7 @@ GyaradosEvosMoves:
ShellderEvosMoves:
; Evolutions
db EV_ITEM, WATER_STONE, 1, TAABAN
db EV_ITEM, WATER_STONE, 1, DISTURBAN
db EV_ITEM, ICE_STONE, 1, CLOYSTER
db 0
; Learnset
@ -601,8 +598,8 @@ BlastoiseEvosMoves:
PinsirEvosMoves:
; Evolutions
db EV_ITEM, METAL_COAT, 1, PURAKKUSU
db EV_LEVEL, 42, PURAKKUSU
db EV_ITEM, METAL_COAT, 1, TRICULES
db EV_LEVEL, 42, TRICULES
db 0
; Learnset
db 21, BIND
@ -629,7 +626,7 @@ TangelaEvosMoves:
db 48, GROWTH
db 0
GyaoonEvosMoves:
GawarhedEvosMoves:
; Evolutions
db 0
; Learnset
@ -854,7 +851,7 @@ GolemEvosMoves:
db 43, EXPLOSION
db 0
BarundaEvosMoves:
BalumbaEvosMoves:
; Evolutions
db 0
; Learnset
@ -926,7 +923,7 @@ KoffingEvosMoves:
db 48, EXPLOSION
db 0
DeerEvosMoves:
RamooseEvosMoves:
; Evolutions
db 0
; Learnset
@ -1003,7 +1000,7 @@ TrampelEvosMoves:
db 50, ROAR
db 0
CrockyEvosMoves:
GavillainEvosMoves:
; Evolutions
db 0
; Learnset
@ -1033,8 +1030,7 @@ BlottleEvosMoves:
FarfetchdEvosMoves:
; Evolutions
db EV_LEVEL, 24, MADAAMU
;db EV_ITEM, HEART_STONE, 1, SIRFETCHD
db EV_LEVEL, 24, LUXWAN
db 0
; Learnset
db 7, LEER
@ -1070,7 +1066,7 @@ DragoniteEvosMoves:
db 60, HYPER_BEAM
db 0
CactusEvosMoves:
CactormusEvosMoves:
; Evolutions
db 0
; Learnset
@ -1084,7 +1080,7 @@ CactusEvosMoves:
db 50, EXPLOSION
db 0
JaggEvosMoves:
SharpoonEvosMoves:
; Evolutions
db 0
; Learnset
@ -1098,19 +1094,19 @@ JaggEvosMoves:
db 55, HORN_DRILL
db 0
BittybatEvosMoves:
;BittybatEvosMoves:
; Evolutions
db EV_LEVEL, 15, ZUBAT
db 0
; db EV_LEVEL, 15, ZUBAT
; db 0
; Learnset
db 7, WING_ATTACK
db 14, GUST
db 18, CONFUSE_RAY
db 22, BITE
db 26, TACKLE
db 30, DISABLE
db 34, HAZE
db 0
; db 7, WING_ATTACK
; db 14, GUST
; db 18, CONFUSE_RAY
; db 22, BITE
; db 26, TACKLE
; db 30, DISABLE
; db 34, HAZE
; db 0
DoduoEvosMoves:
; Evolutions
@ -1179,7 +1175,7 @@ ZapdosEvosMoves:
DittoEvosMoves:
; Evolutions
db EV_ITEM, METAL_COAT, 1, ANIMON
db EV_ITEM, METAL_COAT, 1, MIMMEO
db 0
; Learnset
db 0
@ -1237,7 +1233,7 @@ JabettaEvosMoves:
db 48, HYDRO_PUMP
db 0
MikonEvosMoves:
VulpiiiEvosMoves:
; Evolutions
db EV_LEVEL, 15, VULPIX
db 0
@ -1388,27 +1384,27 @@ SeadraEvosMoves:
db 52, HYDRO_PUMP
db 0
BawliguaEvosMoves:
MinistareEvosMoves:
; Evolutions
db EV_LEVEL, 50, CRYITHAN
db EV_LEVEL, 50, IGUANARCH
db 0
; Learnset
db 10, GLARE
db 20, WATER_GUN
db 30, SLASH
db 10, LEER
db 20, BITE
db 30, GLARE
db 40, DRAGON_RAGE
db 50, HYDRO_PUMP
db 50, SLASH
db 0
CryithanEvosMoves:
IguanarchEvosMoves:
; Evolutions
db 0
; Learnset
db 10, GLARE
db 20, WATER_GUN
db 30, SLASH
db 10, LEER
db 20, BITE
db 30, GLARE
db 40, DRAGON_RAGE
db 50, HYDRO_PUMP
db 50, SLASH
db 0
SandshrewEvosMoves:
@ -1634,7 +1630,7 @@ BeedrillEvosMoves:
db 35, AGILITY
db 0
MadaamuEvosMoves:
LuxwanEvosMoves:
; Evolutions
db 0
; Learnset
@ -1669,8 +1665,8 @@ PrimeapeEvosMoves:
db 27, FOCUS_ENERGY
db 28, RAGE
db 37, SEISMIC_TOSS
db 46, THRASH
db 45, SCREECH
db 46, THRASH
db 0
DugtrioEvosMoves:
@ -1707,7 +1703,7 @@ DewgongEvosMoves:
db 56, ICE_BEAM
db 0
PurakkusuEvosMoves:
TriculesEvosMoves:
; Evolutions
db 0
; Learnset
@ -1852,7 +1848,7 @@ MagikarpEvosMoves:
db 15, TACKLE
db 0
KonyaEvosMoves:
CoinpurEvosMoves:
; Evolutions
db EV_LEVEL, 14, MEOWTH
db 0
@ -1866,7 +1862,7 @@ KonyaEvosMoves:
db 35, SLASH
db 0
OmegaEvosMoves:
OmegadgeEvosMoves:
; Evolutions
db 0
; Learnset
@ -1889,7 +1885,7 @@ MukEvosMoves:
DecillaEvosMoves:
; Evolutions
db EV_LEVEL, 40, GYAOON
db EV_LEVEL, 40, GAWARHED
db 0
; Learnset
db 35, SCREECH
@ -1916,18 +1912,18 @@ CloysterEvosMoves:
db 50, SPIKE_CANNON
db 0
MagnetiteEvosMoves:
;MagnetiteEvosMoves:
; Evolutions
db EV_LEVEL, 30, MAGNETON
db 0
; db EV_LEVEL, 30, MAGNETON
; db 0
; Learnset
db 21, SONICBOOM
db 25, THUNDERSHOCK
db 29, SUPERSONIC
db 35, THUNDER_WAVE
db 41, SWIFT
db 47, SCREECH
db 0
; db 21, SONICBOOM
; db 25, THUNDERSHOCK
; db 29, SUPERSONIC
; db 35, THUNDER_WAVE
; db 41, SWIFT
; db 47, SCREECH
; db 0
ElectrodeEvosMoves:
; Evolutions
@ -2094,7 +2090,7 @@ TentacruelEvosMoves:
db 50, HYDRO_PUMP
db 0
GyopinEvosMoves:
OrfryEvosMoves:
; Evolutions
db EV_LEVEL, 16, GOLDEEN
db 0
@ -2150,6 +2146,7 @@ GaotoraEvosMoves:
db EV_LEVEL, 36, GOROTORA
db 0
; Learnset
db 9, LEER
db 14, ROAR
db 23, QUICK_ATTACK
db 30, BITE
@ -2161,13 +2158,15 @@ GorotoraEvosMoves:
; Evolutions
db 0
; Learnset
db 16, LEER
db 21, ROAR
db 30, QUICK_ATTACK
db 34, BITE
db 40, THUNDER
db 48, AGILITY
db 0
PuchikoonEvosMoves:
KoltaEvosMoves:
; Evolutions
db EV_LEVEL, 20, PONYTA
db 0
@ -2305,7 +2304,7 @@ BlastykeEvosMoves:
MagnemiteEvosMoves:
; Evolutions
db EV_LEVEL, 20, MAGNETITE
db EV_LEVEL, 30, MAGNETON
db 0
; Learnset
db 21, SONICBOOM
@ -2316,16 +2315,16 @@ MagnemiteEvosMoves:
db 47, SCREECH
db 0
SkimperEvosMoves:
SqueamataEvosMoves:
; Evolutions
db EV_LEVEL, 30, BAWLIGUA
db EV_LEVEL, 30, MINISTARE
db 0
; Learnset
db 10, GLARE
db 20, WATER_GUN
db 30, SLASH
db 10, LEER
db 20, BITE
db 30, GLARE
db 40, DRAGON_RAGE
db 50, HYDRO_PUMP
db 50, SLASH
db 0
GorochuEvosMoves:
@ -2510,7 +2509,7 @@ BellsproutEvosMoves:
WeepinbellEvosMoves:
; Evolutions
db EV_ITEM, LEAF_STONE, 1, VICTREEBEL
db EV_ITEM, POISON_STONE, 1, TSUBOMITTO
db EV_ITEM, POISON_STONE, 1, BELLIGNAN
db 0
; Learnset
db 13, WRAP
@ -2531,21 +2530,21 @@ VictreebelEvosMoves:
db 18, SLEEP_POWDER
db 0
MonjaEvosMoves:
;MonjaEvosMoves:
; Evolutions
db EV_LEVEL, 22, TANGELA
db 0
; db EV_LEVEL, 22, TANGELA
; db 0
; Learnset
db 5, BIND
db 9, ABSORB
db 13, VINE_WHIP
db 19, POISONPOWDER
db 22, STUN_SPORE
db 25, SLEEP_POWDER
db 29, SLAM
db 35, GROWTH
db 40, NIGHT_SHADE
db 0
; db 5, BIND
; db 9, ABSORB
; db 13, VINE_WHIP
; db 19, POISONPOWDER
; db 22, STUN_SPORE
; db 25, SLEEP_POWDER
; db 29, SLAM
; db 35, GROWTH
; db 40, NIGHT_SHADE
; db 0
;PudiEvosMoves:
; Evolutions
@ -2688,7 +2687,7 @@ KleavorEvosMoves:
db 50, ROCK_SLIDE
db 0
TsubomittoEvosMoves:
BellignanEvosMoves:
; Evolutions
db 0
; Learnset
@ -2749,7 +2748,7 @@ CrobatEvosMoves:
db 50, AGILITY
db 0
AnimonEvosMoves:
MimmeoEvosMoves:
; Evolutions
db 0
; Learnset
@ -2834,7 +2833,7 @@ MagmortarEvosMoves:
db 55, FLAMETHROWER
db 0
TaabanEvosMoves:
DisturbanEvosMoves:
; Evolutions
db 0
; Learnset
@ -2843,12 +2842,12 @@ TaabanEvosMoves:
KokanaEvosMoves:
; Evolutions
db EV_LEVEL, 7, KASANAGI
db EV_LEVEL, 7, PUPAL
db 0
; Learnset
db 0
KasanagiEvosMoves:
PupalEvosMoves:
; Evolutions
db EV_LEVEL, 10, CARAPTHOR
db 0

113
data/pokemon/menu_icons.asm
View file

@ -13,22 +13,22 @@ MonPartyData:
nybble ICON_PIKACHU ; Raichu
nybble ICON_PIKACHU ; Raichu-A
nybble ICON_PIKACHU ; Gorochu
nybble ICON_QUADRUPED ; Eevee
nybble ICON_QUADRUPED ; Vaporeon
nybble ICON_QUADRUPED ; Jolteon
nybble ICON_QUADRUPED ; Flareon
nybble ICON_QUADRUPED ; Espeon
nybble ICON_QUADRUPED ; Umbreon
nybble ICON_QUADRUPED ; Leafeon
nybble ICON_QUADRUPED ; Glaceon
nybble ICON_QUADRUPED ; Sylveon
nybble ICON_CAT ; Eevee - The Eeveelutions were designed to have vulpine, canine and feline traits, so I think the cat icon makes the most sense.
nybble ICON_CAT ; Vaporeon
nybble ICON_CAT ; Jolteon
nybble ICON_CAT ; Flareon
nybble ICON_CAT ; Espeon
nybble ICON_CAT ; Umbreon
nybble ICON_CAT ; Leafeon
nybble ICON_CAT ; Glaceon
nybble ICON_CAT ; Sylveon
nybble ICON_QUADRUPED ; Rattata
nybble ICON_QUADRUPED ; Raticate
nybble ICON_QUADRUPED ; Raticate-A
nybble ICON_SMALL_BIRD ; Pidgey
nybble ICON_SMALL_BIRD ; Pidgeotto
nybble ICON_BIRD ; Pidgeot
nybble ICON_CAT ; Konya
nybble ICON_CAT ; Coinpur
nybble ICON_CAT ; Meowth
nybble ICON_CAT ; Persian
nybble ICON_CAT ; Persian-A
@ -40,15 +40,13 @@ MonPartyData:
nybble ICON_BUG ; Kakuna
nybble ICON_BUG ; Beedrill
nybble ICON_BUG ; Kokana
nybble ICON_BUG ; Kasanagi
nybble ICON_BUG ; Pupal
nybble ICON_BUG ; Carapthor
nybble ICON_CAT ; Kotora
nybble ICON_CAT ; Gaotora
nybble ICON_CAT ; Gorotora
nybble ICON_SMALL_BIRD ; Spearow
nybble ICON_BIRD ; Fearow
nybble ICON_SNAKE ; Ekans
nybble ICON_SNAKE ; Arbok
nybble ICON_MON ; Sandshrew
nybble ICON_MON ; Sandslash
nybble ICON_MON ; Sandslash-A
nybble ICON_MON ; NidoranF
nybble ICON_MON ; Nidorina
nybble ICON_MON ; Nidoqueen
@ -56,7 +54,6 @@ MonPartyData:
nybble ICON_MON ; Nidorino
nybble ICON_MON ; Nidoking
nybble ICON_MON ; Nidoreign
nybble ICON_MON ; Bittybat
nybble ICON_MON ; Zubat
nybble ICON_MON ; Golbat
nybble ICON_MON ; Crobat
@ -70,13 +67,15 @@ MonPartyData:
nybble ICON_FAIRY ; Clefable
nybble ICON_FAIRY ; Jigglypuff
nybble ICON_FAIRY ; Wigglytuff
nybble ICON_QUADRUPED ; Mikon
nybble ICON_MON ; Sandshrew
nybble ICON_MON ; Sandslash
nybble ICON_MON ; Sandslash-A
nybble ICON_SNAKE ; Ekans
nybble ICON_SNAKE ; Arbok
nybble ICON_QUADRUPED ; Vulpiii
nybble ICON_QUADRUPED ; Vulpix
nybble ICON_QUADRUPED ; Ninetales
nybble ICON_QUADRUPED ; Ninetales-A
nybble ICON_QUADRUPED ; Growlithe
nybble ICON_QUADRUPED ; Arcanine
nybble ICON_QUADRUPED ; Arcanine-H
nybble ICON_MON ; Mankey
nybble ICON_MON ; Primeape
nybble ICON_MON ; Annihilape
@ -87,16 +86,14 @@ MonPartyData:
nybble ICON_GRASS ; Bellsprout
nybble ICON_GRASS ; Weepinbell
nybble ICON_GRASS ; Victreebel
nybble ICON_GRASS ; Tsubomitto
nybble ICON_GRASS ; Bellignan
nybble ICON_WATER ; Magikarp
nybble ICON_SNAKE ; Gyarados
nybble ICON_WATER ; Gyopin
nybble ICON_WATER ; Orfry
nybble ICON_WATER ; Goldeen
nybble ICON_WATER ; Seaking
nybble ICON_BUG ; Venonat
nybble ICON_BUG ; Venomoth
nybble ICON_WATER ; Cheep
nybble ICON_WATER ; Jabetta
nybble ICON_MON ; Psyduck
nybble ICON_MON ; Weirduck
nybble ICON_MON ; Golduck
@ -107,8 +104,14 @@ MonPartyData:
nybble ICON_MON ; Abra
nybble ICON_MON ; Kadabra
nybble ICON_MON ; Alakazam
nybble ICON_QUADRUPED ; Growlithe
nybble ICON_QUADRUPED ; Arcanine
nybble ICON_QUADRUPED ; Arcanine-H
nybble ICON_MON ; Lickitung
nybble ICON_MON ; Lickilicky
nybble ICON_SMALL_BIRD ; Farfetch'd
nybble ICON_BIRD ; Madaamu
nybble ICON_SMALL_BIRD ; Sirfetch'd
nybble ICON_MON ; Drowzee
nybble ICON_MON ; Hypno
nybble ICON_MON ; Diglett
@ -118,9 +121,6 @@ MonPartyData:
nybble ICON_WATER ; Wugtrio
nybble ICON_SNAKE ; Onix
nybble ICON_SNAKE ; Steelix
nybble ICON_CAT ; Kotora
nybble ICON_CAT ; Gaotora
nybble ICON_CAT ; Gorotora - unsure about how fitting this is but they ARE tigers, so...
nybble ICON_BALL ; Voltorb
nybble ICON_BALL ; Electrode
nybble ICON_BALL ; Electrode-H
@ -130,16 +130,16 @@ MonPartyData:
nybble ICON_GRASS ; Toedscruel
nybble ICON_WATER ; Blottle
nybble ICON_WATER ; Pendraken
nybble ICON_MON ; Ribbito
nybble ICON_MON ; Croakozuna
nybble ICON_BALL ; Magnemite
nybble ICON_BALL ; Magnetite
nybble ICON_BALL ; Magneton
nybble ICON_BALL ; Magnezone
nybble ICON_WATER ; Cheep
nybble ICON_WATER ; Jabetta
nybble ICON_MON ; Ribbito
nybble ICON_MON ; Croakozuna
nybble ICON_MON ; Machop
nybble ICON_MON ; Machoke
nybble ICON_MON ; Machamp
nybble ICON_MON ; Crocky
nybble ICON_WATER ; Krabby
nybble ICON_WATER ; Kingler
nybble ICON_QUADRUPED ; Slowpoke
@ -147,15 +147,12 @@ MonPartyData:
nybble ICON_MON ; Slowbro-G
nybble ICON_MON ; Slowking
nybble ICON_MON ; Slowking-G
nybble ICON_QUADRUPED ; Puchikoon
nybble ICON_MON ; Gavillain
nybble ICON_QUADRUPED ; Kolta
nybble ICON_QUADRUPED ; Ponyta
nybble ICON_QUADRUPED ; Rapidash
nybble ICON_QUADRUPED ; Rapidash-G
nybble ICON_QUADRUPED ; Deer
nybble ICON_GRASS ; Monja
nybble ICON_GRASS ; Tangela
nybble ICON_GRASS ; Tangrowth
nybble ICON_BALL ; Barunda
nybble ICON_BALL ; Balumba
nybble ICON_MON ; Gastly
nybble ICON_MON ; Haunter
nybble ICON_MON ; Gengar
@ -163,10 +160,7 @@ MonPartyData:
nybble ICON_MON ; Marowak
nybble ICON_MON ; Marowak-A
nybble ICON_MON ; Guardia
nybble ICON_SMALL_BIRD ; Farfetch'd
nybble ICON_BIRD ; Madaamu
nybble ICON_BIRD ; Sirfetch'd
nybble ICON_BIRD ; Doduo - it's flightless, so the current sprite fits better.
nybble ICON_SMALL_BIRD ; Doduo
nybble ICON_BIRD ; Dodrio
nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk
@ -174,27 +168,25 @@ MonPartyData:
nybble ICON_MON ; Koffing
nybble ICON_MON ; Weezing
nybble ICON_MON ; Weezing-G
nybble ICON_MON ; Ditto
nybble ICON_MON ; Animon
nybble ICON_MON ; Mr.Mime
nybble ICON_MON ; Mr.Rime
nybble ICON_GRASS ; Cactus
nybble ICON_GRASS ; Tangela
nybble ICON_GRASS ; Tangrowth
nybble ICON_QUADRUPED ; Ramoose
nybble ICON_MON ; Hitmonlee
nybble ICON_MON ; Hitmonchan
nybble ICON_MON ; Hitmontop
nybble ICON_HELIX ; Shellder
nybble ICON_HELIX ; Cloyster
nybble ICON_HELIX ; Taaban
nybble ICON_HELIX ; Disturban
nybble ICON_HELIX ; Staryu
nybble ICON_HELIX ; Starmie
nybble ICON_WATER ; Seel
nybble ICON_WATER ; Dewgong
nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise
nybble ICON_WATER ; Horsea
nybble ICON_WATER ; Seadra
nybble ICON_WATER ; Kingdra
nybble ICON_WATER ; Jagg
nybble ICON_WATER ; Blastyke
nybble ICON_WATER ; Blastoise
nybble ICON_WATER ; Sharpoon
nybble ICON_GRASS ; Exeggcute
nybble ICON_GRASS ; Exeggutor
nybble ICON_GRASS ; Exeggutor-A
@ -205,18 +197,18 @@ MonPartyData:
nybble ICON_BUG ; Scizor
nybble ICON_BUG ; Kleavor
nybble ICON_BUG ; Pinsir
nybble ICON_BUG ; Purakkusu
nybble ICON_BUG ; Tricules
nybble ICON_MON ; Kangaskhan
nybble ICON_MON ; Trampel
nybble ICON_QUADRUPED ; Tauros
nybble ICON_QUADRUPED ; Tauros-P
nybble ICON_QUADRUPED ; Tauros-PA
nybble ICON_QUADRUPED ; Tauros-PB
nybble ICON_QUADRUPED ; Tauros-PA
nybble ICON_FAIRY ; Chansey
nybble ICON_FAIRY ; Blissey
nybble ICON_MON ; Skimper
nybble ICON_MON ; Bawligua
nybble ICON_MON ; Cryithan
nybble ICON_GRASS ; Cactormus
nybble ICON_MON ; Mr.Mime
nybble ICON_MON ; Mr.Rime
nybble ICON_MON ; Jynx
nybble ICON_MON ; Buu
nybble ICON_MON ; Electabuzz
@ -224,6 +216,8 @@ MonPartyData:
nybble ICON_MON ; Magmar
nybble ICON_MON ; Magmortar
nybble ICON_WATER ; Lapras
nybble ICON_MON ; Ditto
nybble ICON_MON ; Mimmeo
nybble ICON_BALL ; Porygon
nybble ICON_BALL ; Porygon2
nybble ICON_BALL ; Porygon-Z
@ -233,11 +227,14 @@ MonPartyData:
nybble ICON_HELIX ; Kabutops
nybble ICON_BIRD ; Aerodactyl
nybble ICON_MON ; Decilla
nybble ICON_MON ; Gyaoon
nybble ICON_MON ; Omega
nybble ICON_MON ; Gawarhed
nybble ICON_MON ; Omegadge
nybble ICON_MON ; Snorlax
nybble ICON_FAIRY ; Scream Tail
nybble ICON_BALL ; Sandy Shocks
nybble ICON_MON ; Squeamata
nybble ICON_MON ; Ministare
nybble ICON_MON ; Iguanarch
nybble ICON_SNAKE ; Dratini
nybble ICON_SNAKE ; Dragonair
nybble ICON_SNAKE ; Dragonite

7
data/pokemon/names.asm
View file

@ -68,7 +68,7 @@ MonsterNames::
db "DRAGONITE@"
db "CACTORMUS@"
db "SHARPOON@@"
db "BITTYBAT@@"
db "WIGLETT@@@"
db "DODUO@@@@@"
db "POLIWAG@@@"
db "JYNX@@@@@@"
@ -139,7 +139,7 @@ MonsterNames::
db "DECILLA@@@"
db "KINGLER@@@"
db "CLOYSTER@@"
db "MAGNETITE@"
db "WUGTRIO@@@"
db "ELECTRODE@"
db "CLEFABLE@@"
db "WEEZING@@@"
@ -190,7 +190,6 @@ MonsterNames::
db "BELLSPROUT"
db "WEEPINBELL"
db "VICTREEBEL"
db "BURGELA@@@" ; changing Monja's even though it's on the chopping block anyway
db "SCIZOR@@@@"
db "RHYPERIOR@"
db "ESPEON@@@@"
@ -223,8 +222,6 @@ MonsterNames::
db "ANNIHILAPE"
db "SCREAMTAIL"
db "SANDY SHOX"
db "WIGLETT@@@"
db "WUGTRIO@@@"
db "TOEDSCOOL@"
db "TOEDSCRUEL"
db "PERRSERKER"

144
data/pokemon/new_dex_text.asm
View file

@ -1,4 +1,4 @@
_GyaoonDexEntry:: ; Changed to past tense to be more consistent with other fossil entries
_GawarhedDexEntry:: ; Changed to past tense to be more consistent with other fossil entries
text "Very dangerous"
next "and frequently"
next "rampaged wildly."
@ -18,7 +18,7 @@ _GuardiaDexEntry:: ; Cubone gets a happy ending!
next "ready to evolve"
dex
_DeerDexEntry::
_RamooseDexEntry::
text "It wildly swings"
next "its huge antlers"
next "to deter threats."
@ -28,7 +28,7 @@ _DeerDexEntry::
next "prized by hunters"
dex
_MadaamuDexEntry:: ; Official entry from GS beta, reworded
_LuxwanDexEntry:: ; Official entry from GS beta, reworded
text "A species that is"
next "rarely seen. It"
next "always holds a"
@ -68,7 +68,7 @@ _KotoraDexEntry::
next "pet regardless"
dex
_JaggDexEntry::
_SharpoonDexEntry::
text "Also known as the"
next "Sailor's Scourge,"
next "SHARPOON rams its"
@ -98,7 +98,7 @@ _GaotoraDexEntry:: ; references real tiger hunting
next "tough fangs"
dex
_CactusDexEntry::
_CactormusDexEntry::
text "Found in arid"
next "regions. Its legs"
next "are adapted for"
@ -108,7 +108,7 @@ _CactusDexEntry::
next "rocky terrain"
dex
_KonyaDexEntry::
_CoinpurDexEntry::
text "Its eyesight is"
next "still developing,"
next "so it cannot see"
@ -118,7 +118,7 @@ _KonyaDexEntry::
next "hoard small coins"
dex
_BittybatDexEntry::
_BittybatDexEntry:: ; unused
text "Flits about in"
next "dark caves. A"
next "swarm of BITTYBAT"
@ -138,7 +138,7 @@ _RibbitoDexEntry::
next "appear larger"
dex
_CryithanDexEntry::
_IguanarchDexEntry::
text "Highly aggressive,"
next "it drives other"
next "#MON away with"
@ -168,7 +168,7 @@ _BuuDexEntry::
next "in the tundra"
dex
_SkimperDexEntry::
_SqueamataDexEntry::
text "Incredibly timid,"
next "it flees at the"
next "smallest sign of"
@ -178,7 +178,7 @@ _SkimperDexEntry::
next "difficult task"
dex
_BawliguaDexEntry::
_MinistareDexEntry::
text "Often climbs atop"
next "branches to feast"
next "on foliage. When"
@ -188,7 +188,7 @@ _BawliguaDexEntry::
next "unnerving GLARE"
dex
_PuchikoonDexEntry:: ; referenced from various Ponyta entries. Funny how both Vulpix and Ponyta do this...
_KoltaDexEntry:: ; referenced from various Ponyta entries. Funny how both Vulpix and Ponyta do this...
text "A weak runner that"
next "gradually becomes"
next "faster by chasing"
@ -198,7 +198,7 @@ _PuchikoonDexEntry:: ; referenced from various Ponyta entries. Funny how both V
next "hot to touch"
dex
_GyopinDexEntry:: ; reworked, thank you Ness :3 ~M
_OrfryDexEntry:: ; reworked, thank you Ness :3 ~Martha
text "Its tiny fins make"
next "it an unskilled"
next "swimmer. It fends"
@ -218,7 +218,7 @@ _GorochuDexEntry::
next "physical strength"
dex
_MikonDexEntry::
_VulpiiiDexEntry::
text "While young, it"
next "has three soft,"
next "gorgeous tails."
@ -278,7 +278,7 @@ _GorotoraDexEntry::
next "#MON trainers"
dex
_OmegaDexEntry::
_OmegadgeDexEntry::
text "A recent creation"
next "by SILPH CO."
next "Modeled after the"
@ -288,7 +288,7 @@ _OmegaDexEntry::
next "devastating power"
dex
_PurakkusuDexEntry:: ; Official entry from GS beta, reworded
_TriculesDexEntry:: ; Official entry from GS beta, reworded
text "Withstands foes'"
next "attacks with its"
next "sturdy body, then"
@ -308,7 +308,7 @@ _TrampelDexEntry::
next "using its trunk"
dex
_CrockyDexEntry::
_GavillainDexEntry::
text "Its huge eyes can"
next "glow to brighten"
next "its surroundings."
@ -328,7 +328,7 @@ _PendrakenDexEntry::
next "before attacking"
dex
_MagnetiteDexEntry::
_MagnetiteDexEntry:: ; unused
text "Occasionally, it"
next "attracts so much"
next "metal to itself"
@ -348,7 +348,7 @@ _NidoreignDexEntry::
next "and NIDORINO"
dex
_BarundaDexEntry::
_BalumbaDexEntry::
text "Often mistaken"
next "for an ordinary"
next "balloon. If its"
@ -358,7 +358,7 @@ _BarundaDexEntry::
next "shrill screech"
dex
_TsubomittoDexEntry:: ; references Sprout Tower in Johto
_BellignanDexEntry:: ; references Sprout Tower in Johto
text "A plant #MON"
next "that's revered in"
next "another region."
@ -368,7 +368,7 @@ _TsubomittoDexEntry:: ; references Sprout Tower in Johto
next "found in soil"
dex
_AnimonDexEntry::
_MimmeoDexEntry::
text "A sudden mutation"
next "of DITTO, its"
next "mimicry skills"
@ -378,7 +378,7 @@ _AnimonDexEntry::
next "in an instant"
dex
_MonjaDexEntry::
_MonjaDexEntry:: ; unused
text "As it runs about,"
next "the vines on its"
next "head may obscure"
@ -388,7 +388,7 @@ _MonjaDexEntry::
next "trip and fall"
dex
_TaabanDexEntry::
_DisturbanDexEntry::
text "It evolved after"
next "biting a SLOWPOKE."
next "While draining its"
@ -408,7 +408,7 @@ _KokanaDexEntry::
next "their roots"
dex
_KasanagiDexEntry::
_PupalDexEntry::
text "While awaiting"
next "evolution, it"
next "barely moves. If"
@ -419,8 +419,8 @@ _KasanagiDexEntry::
dex
_CarapthorDexEntry::
text "Often called the"
next "Forest Gent,"
text "It's often called"
next "the Forest Gent."
next "CARAPTHOR strolls"
page "around forests"
@ -434,7 +434,7 @@ _ScizorDexEntry::
next "objects with ease."
page "Battles between it"
next "and PURAKKUSU are"
next "and TRICULES are"
next "a sight to behold"
dex
@ -649,23 +649,23 @@ _PorygonZDexEntry::
dex
_KleavorDexEntry::
text "The axes on its"
next "forearms are not"
next "only tough, but"
text "Capable of cutting"
next "down a fully-grown"
next "tree in one slice,"
page "sharp enough to"
next "fall huge trees"
next "in a single slice"
page "thanks to the two"
next "sharp stone axes"
next "that it wields"
dex
_AnnihilapeDexEntry::
text "Fuelled by a new,"
next "spirit-like power,"
next "ANNIHILAPE's blows"
next "its punches have"
page "break the minds"
next "and bones of its"
next "opponents"
page "enough power to"
next "shatter both minds"
next "and bones alike"
dex
_WiglettDexEntry::
@ -689,13 +689,13 @@ _WugtrioDexEntry::
dex
_ToedscoolDexEntry::
text "Looks similar to"
next "TENTACOOL, but it"
next "is a completely"
text "It scatters spores"
next "as it runs around."
next "The flaps that can"
page "different species."
next "It scatters spores"
next "as it runs around"
page "fall from its body"
next "are chewy, and are"
next "used in recipes"
dex
_ToedscruelDexEntry::
@ -709,23 +709,23 @@ _ToedscruelDexEntry::
dex
_ScreamTailDexEntry::
text "It matches the"
next "description of"
next "an ancient"
text "It resembles a"
next "creature depicted"
next "in a strange book,"
page "JIGGLYPUFF that"
next "was found in a"
next "strange book"
page "believed to be a"
next "JIGGLYPUFF from"
next "ancient times"
dex
_SandyShocksDexEntry::
text "Greatly resembles"
next "MAGNETON. Some"
next "speculate that"
text "Shares many traits"
next "with an ancient"
next "MAGNETON described"
page "MAGNETON looked"
next "like this over"
next "10,000 years ago"
page "in a mysterious"
next "book, but little"
next "else is known"
dex
_MeltanDexEntry::
@ -815,7 +815,7 @@ _ArcanineHDexEntry::
page "its foe before"
next "biting it in a"
next "vicious rage" ; reference to Raging Fury, its signature move.
next "vicious rage" ; reference to Raging Fury
dex
_ElectrodeHDexEntry::
@ -868,7 +868,7 @@ _NinetalesADexEntry::
next "from its home"
dex
_DugtrioADexEntry:: ; revised to add more info
_DugtrioADexEntry::
text "The metal whiskers"
next "on its heads help"
next "protect it from"
@ -946,7 +946,7 @@ _ExeggutorADexEntry::
page "However, as a"
next "result, its PSI"
next "has weakened"
dex ; consider revising
dex
_MarowakADexEntry::
text "While dancing in"
@ -969,33 +969,33 @@ _WeezingGDexEntry::
dex
_TaurosPDexEntry::
text "Known as the"
next "Combat Breed,"
next "this TAUROS uses"
text "The Combat Breed"
next "of this variant of"
next "TAUROS uses its"
page "its short horns to"
page "short horns to"
next "target its foe's"
next "weak points"
dex
_TaurosPBDexEntry::
text "Known as the"
next "Blaze Breed,"
next "this TAUROS can"
text "People often call"
next "this TAUROS the"
next "Blaze Breed, due"
page "expel hot air from"
next "its nostrils and"
page "to its ability to"
next "heat up its horns"
next "and expel hot air"
dex
_TaurosPADexEntry::
text "Known as the"
next "Aqua Breed,"
next "this TAUROS can"
text "Known as the Aqua"
next "Breed, this form"
next "of TAUROS shoots"
page "shoot water at"
next "high pressure from"
next "its horns"
page "high-pressure jets"
next "of water from the"
next "tips of its horns"
dex
_MissingNoDexEntry::

93
data/pokemon/palettes.asm
View file

@ -29,7 +29,7 @@ MonsterPalettes:
db PAL_BROWNMON ; PIDGEY
db PAL_BROWNMON ; PIDGEOTTO
db PAL_BROWNMON ; PIDGEOT
db PAL_YELLOWMON ; KONYA
db PAL_YELLOWMON ; COINPUR
db PAL_YELLOWMON ; MEOWTH
db PAL_YELLOWMON ; PERSIAN
db PAL_CYANMON ; PERSIAN_A
@ -41,15 +41,13 @@ MonsterPalettes:
db PAL_YELLOWMON ; KAKUNA
db PAL_YELLOWMON ; BEEDRILL
db PAL_YELLOWMON ; KOKANA
db PAL_YELLOWMON ; KASANAGI
db PAL_YELLOWMON ; PUPAL
db PAL_YELLOWMON ; CARAPTHOR
db PAL_YELLOWMON ; KOTORA
db PAL_YELLOWMON ; GAOTORA
db PAL_YELLOWMON ; GOROTORA
db PAL_BROWNMON ; SPEAROW
db PAL_BROWNMON ; FEAROW
db PAL_PURPLEMON ; EKANS
db PAL_PURPLEMON ; ARBOK
db PAL_BROWNMON ; SANDSHREW
db PAL_BROWNMON ; SANDSLASH
db PAL_CYANMON ; SANDSLASH_A
db PAL_BLUEMON ; NIDORAN_F
db PAL_BLUEMON ; NIDORINA
db PAL_BLUEMON ; NIDOQUEEN
@ -57,7 +55,6 @@ MonsterPalettes:
db PAL_PURPLEMON ; NIDORINO
db PAL_PURPLEMON ; NIDOKING
db PAL_GREYMON ; NIDOREIGN
db PAL_BLUEMON ; BITTYBAT
db PAL_BLUEMON ; ZUBAT
db PAL_BLUEMON ; GOLBAT
db PAL_PURPLEMON ; CROBAT
@ -71,13 +68,15 @@ MonsterPalettes:
db PAL_PINKMON ; CLEFABLE
db PAL_PINKMON ; JIGGLYPUFF
db PAL_PINKMON ; WIGGLYTUFF
db PAL_REDMON ; MIKON
db PAL_BROWNMON ; SANDSHREW
db PAL_BROWNMON ; SANDSLASH
db PAL_CYANMON ; SANDSLASH_A
db PAL_PURPLEMON ; EKANS
db PAL_PURPLEMON ; ARBOK
db PAL_REDMON ; VULPIII
db PAL_REDMON ; VULPIX
db PAL_YELLOWMON ; NINETALES
db PAL_CYANMON ; NINETALES_A
db PAL_REDMON ; GROWLITHE
db PAL_REDMON ; ARCANINE
db PAL_REDMON ; ARCANINE_A
db PAL_BROWNMON ; MANKEY
db PAL_BROWNMON ; PRIMEAPE
db PAL_GREYMON ; ANNIHILAPE
@ -88,16 +87,14 @@ MonsterPalettes:
db PAL_GREENMON ; BELLSPROUT
db PAL_GREENMON ; WEEPINBELL
db PAL_GREENMON ; VICTREEBEL
db PAL_GREENMON ; TSUBOMITTO
db PAL_GREENMON ; BELLIGNAN
db PAL_REDMON ; MAGIKARP
db PAL_BLUEMON ; GYARADOS
db PAL_REDMON ; GYOPIN
db PAL_REDMON ; ORFRY
db PAL_REDMON ; GOLDEEN
db PAL_REDMON ; SEAKING
db PAL_PURPLEMON ; VENONAT
db PAL_PURPLEMON ; VENOMOTH
db PAL_PURPLEMON ; CHEEP
db PAL_PURPLEMON ; JABETTA
db PAL_YELLOWMON ; PSYDUCK
db PAL_GREENMON ; WEIRDUCK
db PAL_CYANMON ; GOLDUCK
@ -108,8 +105,14 @@ MonsterPalettes:
db PAL_YELLOWMON ; ABRA
db PAL_YELLOWMON ; KADABRA
db PAL_YELLOWMON ; ALAKAZAM
db PAL_REDMON ; GROWLITHE
db PAL_REDMON ; ARCANINE
db PAL_REDMON ; ARCANINE_H
db PAL_PINKMON ; LICKITUNG
db PAL_PINKMON ; LICKILICKY
db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; LUXWAN
db PAL_BROWNMON ; SIRFETCHD
db PAL_YELLOWMON ; DROWZEE
db PAL_YELLOWMON ; HYPNO
db PAL_BROWNMON ; DIGLETT
@ -119,9 +122,6 @@ MonsterPalettes:
db PAL_PINKMON ; WUGTRIO
db PAL_GREYMON ; ONIX
db PAL_GREYMON ; STEELIX
db PAL_YELLOWMON ; KOTORA
db PAL_YELLOWMON ; GAOTORA
db PAL_YELLOWMON ; GOROTORA
db PAL_REDMON ; VOLTORB
db PAL_REDMON ; ELECTRODE
db PAL_REDMON ; ELECTRODE_H
@ -131,16 +131,16 @@ MonsterPalettes:
db PAL_YELLOWMON ; TOEDSCRUEL
db PAL_MEWMON ; BLOTTLE
db PAL_MEWMON ; PENDRAKEN
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_GREYMON ; MAGNEMITE
db PAL_GREYMON ; MAGNETITE
db PAL_GREYMON ; MAGNETON
db PAL_GREYMON ; MAGNEZONE
db PAL_PURPLEMON ; CHEEP
db PAL_PURPLEMON ; JABETTA
db PAL_GREENMON ; RIBBITO
db PAL_GREENMON ; CROAKOZUNA
db PAL_GREYMON ; MACHOP
db PAL_GREYMON ; MACHOKE
db PAL_GREYMON ; MACHAMP
db PAL_GREENMON ; CROCKY
db PAL_REDMON ; KRABBY
db PAL_REDMON ; KINGLER
db PAL_PINKMON ; SLOWPOKE
@ -148,15 +148,12 @@ MonsterPalettes:
db PAL_PURPLEMON ; SLOWBRO_G
db PAL_PINKMON ; SLOWKING
db PAL_PURPLEMON ; SLOWKING_G
db PAL_REDMON ; PUCHIKOON
db PAL_GREENMON ; GAVILLAIN
db PAL_REDMON ; KOLTA
db PAL_REDMON ; PONYTA
db PAL_REDMON ; RAPIDASH
db PAL_PURPLEMON ; RAPIDASH_G
db PAL_BROWNMON ; DEER
db PAL_BLUEMON ; MONJA
db PAL_BLUEMON ; TANGELA
db PAL_CYANMON ; TANGROWTH
db PAL_PINKMON ; BARUNDA
db PAL_PINKMON ; BALUMBA
db PAL_PURPLEMON ; GASTLY
db PAL_PURPLEMON ; HAUNTER
db PAL_PURPLEMON ; GENGAR
@ -164,9 +161,6 @@ MonsterPalettes:
db PAL_BROWNMON ; MAROWAK
db PAL_PURPLEMON ; MAROWAK_A
db PAL_BROWNMON ; GUARDIA
db PAL_BROWNMON ; FARFETCHD
db PAL_BROWNMON ; MADAAMU
db PAL_BROWNMON ; SIRFETCHD
db PAL_BROWNMON ; DODUO
db PAL_BROWNMON ; DODRIO
db PAL_PURPLEMON ; GRIMER
@ -175,27 +169,25 @@ MonsterPalettes:
db PAL_PURPLEMON ; KOFFING
db PAL_PURPLEMON ; WEEZING
db PAL_GREYMON ; WEEZING_G
db PAL_PURPLEMON ; DITTO
db PAL_PURPLEMON ; ANIMON
db PAL_PINKMON ; MR_MIME
db PAL_CYANMON ; MR_RIME
db PAL_GREENMON ; CACTUS
db PAL_BLUEMON ; TANGELA
db PAL_CYANMON ; TANGROWTH
db PAL_BROWNMON ; RAMOOSE
db PAL_BROWNMON ; HITMONLEE
db PAL_BROWNMON ; HITMONCHAN
db PAL_BROWNMON ; HITMONTOP
db PAL_PURPLEMON ; SHELLDER
db PAL_PURPLEMON ; CLOYSTER
db PAL_GREYMON ; TAABAN
db PAL_GREYMON ; DISTURBAN
db PAL_REDMON ; STARYU
db PAL_PURPLEMON ; STARMIE
db PAL_BLUEMON ; SEEL
db PAL_BLUEMON ; DEWGONG
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_CYANMON ; HORSEA
db PAL_CYANMON ; SEADRA
db PAL_CYANMON ; KINGDRA
db PAL_BLUEMON ; JAGG
db PAL_CYANMON ; BLASTYKE
db PAL_CYANMON ; BLASTOISE
db PAL_BLUEMON ; SHARPOON
db PAL_PINKMON ; EXEGGCUTE
db PAL_GREENMON ; EXEGGUTOR
db PAL_GREENMON ; EXEGGUTOR_A
@ -206,18 +198,18 @@ MonsterPalettes:
db PAL_REDMON ; SCIZOR
db PAL_BROWNMON ; KLEAVOR
db PAL_BROWNMON ; PINSIR
db PAL_BROWNMON ; PURAKKUSU
db PAL_BROWNMON ; TRICULES
db PAL_BROWNMON ; KANGASKHAN
db PAL_GREYMON ; TRAMPEL
db PAL_BROWNMON ; TAUROS
db PAL_GREYMON ; TAUROS_P
db PAL_CYANMON ; TAUROS_PA
db PAL_REDMON ; TAUROS_PB
db PAL_CYANMON ; TAUROS_PA
db PAL_PINKMON ; CHANSEY
db PAL_PINKMON ; BLISSEY
db PAL_GREENMON ; SKIMPER
db PAL_GREENMON ; BAWLIGUA
db PAL_GREENMON ; CRYITHAN
db PAL_GREENMON ; CACTORMUS
db PAL_PINKMON ; MR_MIME
db PAL_CYANMON ; MR_RIME
db PAL_REDBAR ; JYNX
db PAL_BLUEMON ; BUU
db PAL_YELLOWMON ; ELECTABUZZ
@ -225,6 +217,8 @@ MonsterPalettes:
db PAL_REDMON ; MAGMAR
db PAL_REDMON ; MAGMORTAR
db PAL_CYANMON ; LAPRAS
db PAL_PURPLEMON ; DITTO
db PAL_PURPLEMON ; MIMMEO
db PAL_MEWMON ; PORYGON
db PAL_MEWMON ; PORYGON2
db PAL_MEWMON ; PORYGONZ
@ -234,11 +228,14 @@ MonsterPalettes:
db PAL_BROWNMON ; KABUTOPS
db PAL_GREYMON ; AERODACTYL
db PAL_GREENMON ; DECILLA
db PAL_GREENMON ; GYAOON
db PAL_GREYMON ; OMEGA
db PAL_GREENMON ; GAWARHED
db PAL_GREYMON ; OMEGADGE
db PAL_MEWMON ; SNORLAX
db PAL_PINKMON ; SCREAM_TAIL
db PAL_GREYMON ; SANDY_SHOCKS
db PAL_GREENMON ; SQUEAMATA
db PAL_GREENMON ; MINISTARE
db PAL_GREENMON ; IGUANARCH
db PAL_BLUEMON ; DRATINI
db PAL_BLUEMON ; DRAGONAIR
db PAL_BROWNMON ; DRAGONITE

12
data/pokemon/title_mons.asm
View file

@ -3,11 +3,11 @@ TitleMons:
db TOTARTLE ; New Starters
db GOROCHU
db SYLVEON
db CROCKY ; RG Betas
db JAGG
db GYAOON
db TSUBOMITTO ; GS Betas
db MADAAMU
db GAVILLAIN ; RG Betas
db SHARPOON
db GAWARHED
db BELLIGNAN ; GS Betas
db LUXWAN
db PORYGON2 ; Post-Gen 1 Evos
db MAGNEZONE
db ANNIHILAPE
@ -15,4 +15,4 @@ TitleMons:
db WUGTRIO
db MELTAN
db EXEGGUTOR_A ; Regional Variants
db TAUROS_PA
db TAUROS_PB

141
data/pokemon/tradeback_moves.asm
View file

@ -35,7 +35,7 @@ TradebackMovesPointerTable:
dw BlastoiseTradebackMoves
dw PinsirTradebackMoves
dw TangelaTradebackMoves
dw GyaoonTradebackMoves
dw GawarhedTradebackMoves
dw NidoreignTradebackMoves
dw GrowlitheTradebackMoves
dw OnixTradebackMoves
@ -54,26 +54,26 @@ TradebackMovesPointerTable:
dw PsyduckTradebackMoves
dw DrowzeeTradebackMoves
dw GolemTradebackMoves
dw BarundaTradebackMoves
dw BalumbaTradebackMoves
dw MagmarTradebackMoves
dw BuuTradebackMoves
dw ElectabuzzTradebackMoves
dw MagnetonTradebackMoves
dw KoffingTradebackMoves
dw DeerTradebackMoves
dw RamooseTradebackMoves
dw MankeyTradebackMoves
dw SeelTradebackMoves
dw DiglettTradebackMoves
dw TaurosTradebackMoves
dw TrampelTradebackMoves
dw CrockyTradebackMoves
dw GavillainTradebackMoves
dw BlottleTradebackMoves
dw FarfetchdTradebackMoves
dw VenonatTradebackMoves
dw DragoniteTradebackMoves
dw CactusTradebackMoves
dw JaggTradebackMoves
dw BittybatTradebackMoves
dw CactormusTradebackMoves
dw SharpoonTradebackMoves
dw WiglettTradebackMoves
dw DoduoTradebackMoves
dw PoliwagTradebackMoves
dw JynxTradebackMoves
@ -85,7 +85,7 @@ TradebackMovesPointerTable:
dw KrabbyTradebackMoves
dw CheepTradebackMoves
dw JabettaTradebackMoves
dw MikonTradebackMoves
dw VulpiiiTradebackMoves
dw VulpixTradebackMoves
dw NinetalesTradebackMoves
dw PikachuTradebackMoves
@ -98,8 +98,8 @@ TradebackMovesPointerTable:
dw KabutopsTradebackMoves
dw HorseaTradebackMoves
dw SeadraTradebackMoves
dw BawliguaTradebackMoves
dw CryithanTradebackMoves
dw MinistareTradebackMoves
dw IguanarchTradebackMoves
dw SandshrewTradebackMoves
dw SandslashTradebackMoves
dw OmanyteTradebackMoves
@ -119,13 +119,13 @@ TradebackMovesPointerTable:
dw WeedleTradebackMoves
dw KakunaTradebackMoves
dw BeedrillTradebackMoves
dw MadaamuTradebackMoves
dw LuxwanTradebackMoves
dw DodrioTradebackMoves
dw PrimeapeTradebackMoves
dw DugtrioTradebackMoves
dw VenomothTradebackMoves
dw DewgongTradebackMoves
dw PurakkusuTradebackMoves
dw TriculesTradebackMoves
dw PendrakenTradebackMoves
dw CaterpieTradebackMoves
dw MetapodTradebackMoves
@ -138,13 +138,13 @@ TradebackMovesPointerTable:
dw MewtwoTradebackMoves
dw SnorlaxTradebackMoves
dw MagikarpTradebackMoves
dw KonyaTradebackMoves
dw OmegaTradebackMoves
dw CoinpurTradebackMoves
dw OmegadgeTradebackMoves
dw MukTradebackMoves
dw DecillaTradebackMoves
dw KinglerTradebackMoves
dw CloysterTradebackMoves
dw MagnetiteTradebackMoves
dw WugtrioTradebackMoves
dw ElectrodeTradebackMoves
dw ClefableTradebackMoves
dw WeezingTradebackMoves
@ -160,13 +160,13 @@ TradebackMovesPointerTable:
dw BulbasaurTradebackMoves
dw VenusaurTradebackMoves
dw TentacruelTradebackMoves
dw GyopinTradebackMoves
dw OrfryTradebackMoves
dw GoldeenTradebackMoves
dw SeakingTradebackMoves
dw KotoraTradebackMoves
dw GaotoraTradebackMoves
dw GorotoraTradebackMoves
dw PuchikoonTradebackMoves
dw KoltaTradebackMoves
dw PonytaTradebackMoves
dw RapidashTradebackMoves
dw RattataTradebackMoves
@ -178,7 +178,7 @@ TradebackMovesPointerTable:
dw AerodactylTradebackMoves
dw BlastykeTradebackMoves
dw MagnemiteTradebackMoves
dw SkimperTradebackMoves
dw SqueamataTradebackMoves
dw GorochuTradebackMoves
dw CharmanderTradebackMoves
dw SquirtleTradebackMoves
@ -195,7 +195,6 @@ TradebackMovesPointerTable:
dw BellsproutTradebackMoves
dw WeepinbellTradebackMoves
dw VictreebelTradebackMoves
dw MonjaTradebackMoves
dw ScizorTradebackMoves
dw RhyperiorTradebackMoves
dw EspeonTradebackMoves
@ -206,7 +205,7 @@ TradebackMovesPointerTable:
dw LickilickyTradebackMoves
dw TangrowthTradebackMoves
dw KleavorTradebackMoves
dw TsubomittoTradebackMoves
dw BellignanTradebackMoves
dw SteelixTradebackMoves
dw BlisseyTradebackMoves
dw HitmontopTradebackMoves
@ -219,17 +218,15 @@ TradebackMovesPointerTable:
dw SlowkingTradebackMoves
dw ElectivireTradebackMoves
dw MagmortarTradebackMoves
dw TaabanTradebackMoves
dw DisturbanTradebackMoves
dw KokanaTradebackMoves
dw KasanagiTradebackMoves
dw PupalTradebackMoves
dw CarapthorTradebackMoves
dw MagnezoneTradebackMoves
dw PorygonZTradebackMoves
dw AnnihilapeTradebackMoves
dw ScreamTailTradebackMoves
dw SandyShocksTradebackMoves
dw WiglettTradebackMoves
dw WugtrioTradebackMoves
dw SandyShocksTradebackMoves
dw ToedscoolTradebackMoves
dw ToedscruelTradebackMoves
dw PerrserkerTradebackMoves
@ -523,7 +520,7 @@ TangelaTradebackMoves:
db 1, REFLECT
db 0
GyaoonTradebackMoves:
GawarhedTradebackMoves:
db 1, HEADBUTT ; TM
db 1, DEFENSE_CURL ; TM
db 1, ICE_PUNCH ; TM
@ -678,7 +675,7 @@ GolemTradebackMoves:
db 1, FLAMETHROWER
db 0
BarundaTradebackMoves:
BalumbaTradebackMoves:
db 1, HEADBUTT ; TM
db 1, DEFENSE_CURL ; TM
db 1, PSYBEAM ; Egg Move from Psychic-types.
@ -729,7 +726,7 @@ KoffingTradebackMoves:
db 1, SCREECH
db 0
DeerTradebackMoves:
RamooseTradebackMoves:
db 1, HEADBUTT ; TM, oh boy
db 1, ROAR ; TM
db 1, QUICK_ATTACK ; Egg Move
@ -775,7 +772,7 @@ TrampelTradebackMoves:
db 1, THRASH ; Egg Move
db 0
CrockyTradebackMoves:
GavillainTradebackMoves:
db 1, HEADBUTT ; TM
db 1, GROWL ; New Level-Up Move
db 1, FIRE_PUNCH ; TM
@ -819,14 +816,14 @@ DragoniteTradebackMoves:
db 1, HYDRO_PUMP
db 0
CactusTradebackMoves:
CactormusTradebackMoves:
db 1, HEADBUTT ; TM
db 1, DEFENSE_CURL ; TM
db 1, SWORDS_DANCE ; Egg Move
db 1, LEECH_SEED ; Egg Move
db 0
JaggTradebackMoves:
SharpoonTradebackMoves:
db 1, HEADBUTT ; TM
db 1, ROAR ; TM
db 1, SHARPEN ; NYPC-like Event
@ -834,9 +831,9 @@ JaggTradebackMoves:
db 1, AGILITY ; Egg Move
db 0
BittybatTradebackMoves:
db 1, QUICK_ATTACK
db 0
;BittybatTradebackMoves:
; db 1, QUICK_ATTACK
; db 0
DoduoTradebackMoves:
db 1, SWIFT
@ -885,7 +882,6 @@ ZapdosTradebackMoves:
db 0
DittoTradebackMoves:
db 0
MeowthTradebackMoves:
@ -908,6 +904,8 @@ CheepTradebackMoves:
db 1, WATERFALL ; HM
db 1, DOUBLE_KICK ; Egg Move
db 1, WING_ATTACK ; Egg Move (from Sato?)
db 1, AURORA_BEAM ; Egg Move
db 1, AGILITY ; Egg Move
db 0
JabettaTradebackMoves:
@ -921,7 +919,7 @@ JabettaTradebackMoves:
db 1, AGILITY ; Egg Move
db 0
MikonTradebackMoves:
VulpiiiTradebackMoves:
db 1, HEADBUTT
db 1, DISABLE
db 1, HYPNOSIS
@ -1036,19 +1034,19 @@ SeadraTradebackMoves:
db 1, HAZE
db 0
BawliguaTradebackMoves:
MinistareTradebackMoves:
db 1, HEADBUTT ; TM
db 1, THRASH ; Egg Move from Totodile
db 1, MIST ; Egg Move from Squirtle, interesting but not good Gen 1 applications, being a screen and all. Also, a pun on "misting" terrariums.
db 1, QUICK_ATTACK ; Egg Move, but will need to figure out a route in the Monster Egg Group; alternatively, Monster/Field, so Ponyta could pass it down.
db 0
CryithanTradebackMoves:
IguanarchTradebackMoves:
db 1, HEADBUTT ; TM
db 1, ROAR ; TM
db 1, THRASH ; Egg Move from Totodile
db 1, MIST ; Egg Move from Squirtle, interesting but not good Gen 1 applications, being a screen and all. Also, a pun on "misting" terrariums.
db 1, QUICK_ATTACK ; Egg Move, but will need to figure out a route in the Monster Egg Group; alternatively, Monster/Field, so Ponyta could pass it down.
db 1, MIST ; Egg Move from Squirtle
db 1, QUICK_ATTACK ; Egg Move
db 0
SandshrewTradebackMoves:
@ -1188,18 +1186,15 @@ PoliwrathTradebackMoves:
db 0
WeedleTradebackMoves:
db 0
KakunaTradebackMoves:
db 0
BeedrillTradebackMoves:
db 0
MadaamuTradebackMoves:
LuxwanTradebackMoves:
db 1, HEADBUTT
db 1, GUST
db 1, MIRROR_MOVE
@ -1242,7 +1237,7 @@ DewgongTradebackMoves:
db 1, SLAM
db 0
PurakkusuTradebackMoves:
TriculesTradebackMoves:
db 1, HEADBUTT
db 1, FURY_ATTACK
db 1, ROCK_THROW
@ -1257,15 +1252,12 @@ PendrakenTradebackMoves:
db 0
CaterpieTradebackMoves:
db 0
MetapodTradebackMoves:
db 0
ButterfreeTradebackMoves:
db 0
MachampTradebackMoves:
@ -1350,7 +1342,7 @@ MagikarpTradebackMoves:
db 1, BUBBLE
db 0
KonyaTradebackMoves:
CoinpurTradebackMoves:
db 1, DEFENSE_CURL
db 1, DREAM_EATER
db 1, HEADBUTT
@ -1358,8 +1350,8 @@ KonyaTradebackMoves:
db 1, HYPNOSIS
db 0
; Omegedge will be unable to breed.
OmegaTradebackMoves:
; Omegadge will be unable to breed.
OmegadgeTradebackMoves:
db 1, HEADBUTT ; TM
db 1, ROAR ; TM
db 1, THUNDERPUNCH ; TM
@ -1401,9 +1393,9 @@ CloysterTradebackMoves:
db 1, SCREECH
db 0
MagnetiteTradebackMoves:
db 1, AGILITY
db 0
;MagnetiteTradebackMoves:
; db 1, AGILITY
; db 0
ElectrodeTradebackMoves:
db 1, HEADBUTT
@ -1523,7 +1515,7 @@ TentacruelTradebackMoves:
db 1, CONFUSE_RAY
db 0
GyopinTradebackMoves:
OrfryTradebackMoves:
db 1, HAZE
db 1, HYDRO_PUMP
db 1, PSYBEAM
@ -1556,7 +1548,7 @@ KotoraTradebackMoves:
GaotoraTradebackMoves:
db 1, HEADBUTT ; TM
db 1, DEFENSE_CURL ; TM
db 1, SCREECH ; Egg Move, likely from Persian.
db 1, SCREECH ; Egg Move
db 1, CHARM ; Egg Move
db 1, THRASH ; Egg Move
db 0
@ -1564,12 +1556,12 @@ GaotoraTradebackMoves:
GorotoraTradebackMoves:
db 1, HEADBUTT ; TM
db 1, DEFENSE_CURL ; TM
db 1, SCREECH ; Egg Move, likely from Persian.
db 1, SCREECH ; Egg Move
db 1, CHARM ; Egg Move
db 1, THRASH ; Egg Move
db 0
PuchikoonTradebackMoves:
KoltaTradebackMoves:
db 1, TACKLE
db 1, HEADBUTT
db 1, FLAMETHROWER
@ -1679,11 +1671,11 @@ MagnemiteTradebackMoves:
db 1, AGILITY
db 0
SkimperTradebackMoves:
SqueamataTradebackMoves:
db 1, HEADBUTT ; TM
db 1, THRASH ; Egg Move from Totodile
db 1, MIST ; Egg Move from Squirtle, interesting but not good Gen 1 applications, being a screen and all. Also, a pun on "misting" terrariums.
db 1, QUICK_ATTACK ; Egg Move, but will need to figure out a route in the Monster Egg Group; alternatively, Monster/Field, so Ponyta could pass it down.
db 1, MIST ; Egg Move from Squirtle
db 1, QUICK_ATTACK ; Egg Move
db 0
GorochuTradebackMoves:
@ -1805,13 +1797,13 @@ VictreebelTradebackMoves:
db 1, LEECH_LIFE
db 0
MonjaTradebackMoves:
db 1, FLASH
db 1, HEADBUTT
db 1, AMNESIA
db 1, CONFUSION
db 1, REFLECT
db 0
;MonjaTradebackMoves:
; db 1, FLASH
; db 1, HEADBUTT
; db 1, AMNESIA
; db 1, CONFUSION
; db 1, REFLECT
; db 0
ScizorTradebackMoves:
db 1, HEADBUTT
@ -1887,7 +1879,7 @@ KleavorTradebackMoves:
db 1, SONICBOOM
db 0
TsubomittoTradebackMoves:
BellignanTradebackMoves:
db 1, FLASH
db 1, LEECH_LIFE
db 0
@ -1917,7 +1909,6 @@ CrobatTradebackMoves:
db 0
AnimonTradebackMoves:
db 0
BellossomTradebackMoves:
@ -1981,22 +1972,19 @@ MagmortarTradebackMoves:
db 1, SCREECH
db 0
TaabanTradebackMoves:
DisturbanTradebackMoves:
db 1, BARRIER
db 1, SCREECH
db 0
KokanaTradebackMoves:
db 0
KasanagiTradebackMoves:
PupalTradebackMoves:
db 0
CarapthorTradebackMoves:
db 1, HEADBUTT ; TM
db 1, ABSORB ; Egg Move from Parasect
db 0
MagnezoneTradebackMoves:
@ -2237,13 +2225,10 @@ TaurosPBTradebackMoves:
db 0
FossilKabutopsTradebackMoves:
db 0
FossilAerodactylTradebackMoves:
db 0
MonGhostTradebackMoves:
db 0

14
data/text/text_2.asm
View file

@ -592,8 +592,8 @@ _Route15UpstairsBinocularsText::
_AerodactylFossilText::
text "AERODACTYL Fossil"
line "It can be found"
cont "in WING FOSSILS."
line "A primitive and"
cont "rare #MON."
done
_KabutopsFossilText::
@ -603,15 +603,15 @@ _KabutopsFossilText::
done
_ScarletBook1::
text "SCREAM TAIL"
line "A screaming,"
cont "JIGGLYPUFF-like"
cont "#MON."
text "SCREAM TAIL"
line "A JIGGLYPUFF-like"
cont "#MON with a"
cont "savage nature."
done
_ScarletBook2::
text "SANDY SHOCKS"
text "SANDY SHOCKS"
line "A theropod-like"
cont "relative of"
cont "MAGNETON."

2
data/tilesets/warp_tile_ids.asm
View file

@ -56,7 +56,7 @@ ENDM
warp_tiles $5E
.ForestWarpTileIDs:
warp_tiles $5A, $5C, $3A, $30, $50, $51 ; $30, $50, and $51 are for Faraway Island, intended for the upward ($58) and downward ($59) blocks we use to signify warps. - PvK
warp_tiles $5A, $5C, $3A
.DojoWarpTileIDs:
.GymWarpTileIDs:

96
data/trainers/parties.asm
View file

@ -70,7 +70,7 @@ YoungsterData:
db 11, RATTATA, EKANS, 0
db 14, SPEAROW, 0
; Mt. Moon 1F
db 10, RATTATA, SPEAROW, BITTYBAT, 0
db 10, RATTATA, SPEAROW, ZUBAT, 0
; Route 24
db 14, RATTATA, EKANS, ZUBAT, 0
; Route 25
@ -94,22 +94,22 @@ BugCatcherData:
db 7, CATERPIE, KAKUNA, KOKANA, 0
db 9, VENONAT, 0
; Route 3
db 10, KOKANA, KASANAGI, 0 ; trimmed down to create counterpart trainers
db 10, KOKANA, PUPAL, 0 ; trimmed down to create counterpart trainers
db 10, WEEDLE, KAKUNA, 0
db 10, CATERPIE, METAPOD, 0
; Mt. Moon 1F
db 12, PARAS, 0
db 10, KASANAGI, PARAS, 0
db 10, PUPAL, PARAS, 0
; Route 24
db 14, KOKANA, WEEDLE, 0
; Route 6
db 16, VENONAT, PARAS, 0 ; By this point, the player has fought like, 2 "three bugs" trainers. Toning it down.
db 17, BUTTERFREE, 0 ; this is that one boss fight-like one, levelled down for learnset reasons
; Silph Gauntlet 1F (Viridian Forest)
db 62, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0
db 62, SCIZOR, CARAPTHOR, PARASECT, VENOMOTH, TRICULES, KLEAVOR, 0
; Route 9
db 19, BUTTERFREE, BEEDRILL, 0
db 20, KASANAGI, VENONAT, BEEDRILL, 0
db 20, PUPAL, VENONAT, BEEDRILL, 0
; A strange trainer that usually uses "cute" Pokemon, mainly Normal, Flying, and Grass types.
; Main exception is Pikachu and the Nidorans. I think adding Kotora enhances this nicely.
@ -158,7 +158,7 @@ SailorData:
; Vermilion Gym
db 21, KOTORA, GAOTORA, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, KINGDRA, MACHAMP, TAABAN, STARMIE, GOROTORA, TENTACRUEL, 0
db 64, KINGDRA, MACHAMP, GOROCHU, STARMIE, POLIWRATH, TENTACRUEL, 0
; One of the most varied trainers in the game. No criticisms.
JrTrainerMData:
@ -182,7 +182,7 @@ JrTrainerMData:
; As varied as the male counterpart. Improvements come from reducing repeats.
JrTrainerFData:
; Cerulean Gym
db 19, GYOPIN, GOLDEEN, 0
db 19, ORFRY, GOLDEEN, 0
; Route 6
db 20, CUBONE, 0 ; Giselle from School of Hard Knocks, Indigo League Ep9, featured in Yellow
db 16, PIDGEY, SPEAROW, FARFETCHD, 0
@ -218,7 +218,7 @@ JrTrainerFData:
; Route 20
db 30, TENTACOOL, HORSEA, SEEL, 0
; Silph Gauntlet 1F (Viridian Forest)
db 62, TSUBOMITTO, SEAKING, TANGROWTH, MADAAMU, BELLOSSOM, GOROCHU, 0
db 62, BELLIGNAN, SEAKING, TANGROWTH, LUXWAN, BELLOSSOM, GOROCHU, 0
; I praise the PokeManiac for its variety. He mainly uses "endangered", bipedal Pokemon.
; Skimper seems appropriate here, as it's a baby iguana; these were often bought by those types in the 90s.
@ -229,9 +229,9 @@ PokemaniacData:
; Rock Tunnel B1F
db 20, SLOWPOKE, LICKITUNG, RHYHORN, 0
db 22, CHARMANDER, CUBONE, 0
db 25, SKIMPER, 0
db 25, SQUEAMATA, 0
; Victory Road 2F
db 40, BAWLIGUA, LAPRAS, LICKILICKY, RHYDON, 0
db 40, MINISTARE, LAPRAS, LICKILICKY, RHYDON, 0
; Rock Tunnel 1F
db 23, CUBONE, SLOWPOKE, 0
; Silph Gauntlet 2F (Mt. Moon)
@ -245,11 +245,11 @@ SuperNerdData:
db 12, GRIMER, VOLTORB, KOFFING, 0
; Route 8
db 20, GRIMER, KOFFING, KOFFING, MAGNEMITE, 0
db 22, VOLTORB, KOFFING, MAGNETITE, 0
db 22, VOLTORB, KOFFING, MAGNEMITE, 0
db 26, ELECTRODE, 0
; Unused - both now used in Celadon University
db 30, PORYGON, 0 ;
db 25, MAGNETITE, ELECTRODE, KABUTO, OMANYTE, 0 ;
db 25, GRIMER, KOFFING, KABUTO, OMANYTE, 0 ;
; Silph Gauntlet 2F (Mt. Moon)
db 63, ELECTRODE, MUK, KABUTOPS, OMASTAR, MAGNEZONE, PORYGONZ, 0
; Cinnabar Gym
@ -334,7 +334,7 @@ BurglarData:
; Mansion 2F
db 34, CHARMANDER, CHARMELEON, 0
; Mansion 3F
db 38, PUCHIKOON, NINETALES, 0
db 38, KOLTA, NINETALES, 0
; Mansion B1F
db 34, GROWLITHE, PONYTA, 0
@ -344,7 +344,7 @@ EngineerData:
db 36, GOLEM, 0
; Route 11
db 21, KOTORA, VOLTORB, 0
db 18, MAGNEMITE, MAGNEMITE, MAGNETITE, 0
db 18, MAGNEMITE, MAGNEMITE, PIKACHU, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, ELECTRODE, SANDSLASH_A, MAGNEZONE, 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...
@ -361,13 +361,13 @@ FisherData:
db 21, POLIWAG, SHELLDER, GOLDEEN, HORSEA, 0
; Route 21
db 28, PSYDUCK, CHEEP, KINGLER, 0
db 31, SHELLDER, TAABAN, 0
db 31, SHELLDER, DISTURBAN, 0
db 27, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, MAGIKARP, 0 ; he's too iconic to change
db 33, SEAKING, JAGG, 0
db 33, SEAKING, SHARPOON, 0
; Route 12
db 24, SKIMPER, WIGLETT, 0
db 24, BLASTYKE, WIGLETT, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, GYARADOS, SEAKING, TAABAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0
db 64, GYARADOS, SEAKING, DISTURBAN, WUGTRIO, BLASTOISE, PENDRAKEN, 0
; Brunswick Trail
db 65, POLIWRATH, MACHAMP, GOROTORA, PENDRAKEN, TAUROS_PA, 0
@ -377,11 +377,11 @@ SwimmerData:
; Cerulean Gym
db 16, HORSEA, SHELLDER, 0
; Route 19
db 30, TENTACOOL, TAABAN, 0
db 30, TENTACOOL, PENDRAKEN, 0
db 29, GOLDEEN, HORSEA, STARYU, 0
db 30, WEIRDUCK, POLIWHIRL, 0
db 27, HORSEA, TENTACOOL, TENTACOOL, GOLDEEN, 0
db 29, GOLDEEN, SEAKING, BAWLIGUA, 0
db 29, GOLDEEN, SEAKING, WEIRDUCK, 0
db 30, WIGLETT, CLOYSTER, 0
db 27, TENTACOOL, TENTACOOL, STARYU, HORSEA, TENTACRUEL, 0
; Route 20
@ -425,7 +425,7 @@ GamblerData:
; Silph Gauntlet 4F (Lavender Tower)
db 65, SEAKING, RHYPERIOR, ELECTRODE, ARCANINE, GOLEM, POLITOED, 0
; Route 8
db 24, CACTUS, 0 ; This was a repeat of Growlithe/Vulpix, so I made it a Game Corner prize instead.
db 24, CACTORMUS, 0 ; This was a repeat of Growlithe/Vulpix, so I made it a Game Corner prize instead.
; Very varied, little criticism outside of minor repeats.
; Seems to use whatever the route demands of the class, which I enjoy seeing.
@ -433,20 +433,20 @@ GamblerData:
BeautyData:
; Celadon Gym
db 21, ODDISH, BELLSPROUT, WEEPINBELL, 0
db 24, TOEDSCOOL, MONJA, 0
db 26, DEER, 0
db 24, TOEDSCOOL, GLOOM, 0
db 26, RAMOOSE, 0
; Route 13
db 27, RATTATA, PIKACHU, JIGGLYPUFF, 0
db 29, CLEFAIRY, MEOWTH, 0
; Route 20
db 35, SEAKING, 0
db 30, SHELLDER, TAABAN, CLOYSTER, 0
db 30, SHELLDER, DISTURBAN, CLOYSTER, 0
db 31, POLIWAG, SEAKING, 0
; Route 15
db 29, PERSIAN, 0 ; it doesn't have slash until like L47 trust me it's fine
db 29, BULBASAUR, IVYSAUR, 0
; Silph Gauntlet 3F (S.S Anne)
db 64, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
; Silph Gauntlet 2F (Mt. Moon)
db 63, PERSIAN, VICTREEBEL, WIGGLYTUFF, MACHAMP, CLOYSTER, SYLVEON, 0
; Route 19
db 27, POLIWAG, GOLDEEN, SEAKING, 0
db 30, BLASTYKE, GOLDUCK, 0
@ -469,7 +469,7 @@ PsychicData:
; Electric specialist with depressingly little representation.
RockerData:
; Vermilion Gym
db 20, VOLTORB, MAGNEMITE, MAGNETITE, 0
db 20, VOLTORB, MAGNEMITE, KOTORA, 0
; Route 12
db 29, VOLTORB, ELECTRODE, 0
; Silph Gauntlet 3F (S.S Anne)
@ -491,7 +491,7 @@ JugglerData:
; Fuchsia Gym
db 38, UMBREON, 0
; Fuchsia Gym
db 34, WEEPINBELL, TSUBOMITTO, 0
db 34, WEEPINBELL, BELLIGNAN, 0
; In Japanese, they are called "Fierce Beast users", and in turn use Pokemon
; based on those "fierce" beasts. Think lions, etc.
@ -499,7 +499,7 @@ JugglerData:
TamerData:
; Fuchsia Gym
db 34, NIDOQUEEN, ARBOK, 0
db 33, ARBOK, NIDOKING, TSUBOMITTO, 0
db 33, ARBOK, NIDORINA, NIDOKING, 0
; Viridian Gym
db 43, RHYDON, 0
db 39, SANDSLASH, TRAMPEL, 0
@ -520,18 +520,18 @@ BirdKeeperData:
db 33, FEAROW, 0
db 29, SPEAROW, FEAROW, 0
; Route 15
db 26, PIDGEY, DODUO, PIDGEOTTO, 0
db 26, PIDGEOTTO, DODUO, PIDGEOTTO, 0
db 28, FARFETCHD, DODRIO, 0
; Route 18
db 29, SPEAROW, FEAROW, 0
db 34, DODRIO, 0
db 26, SPEAROW, SPEAROW, FEAROW, SPEAROW, 0
db 26, SPEAROW, DODUO, FEAROW, DODUO, 0
; Route 20
db 30, FEAROW, MADAAMU, PIDGEOTTO, 0
db 30, FEAROW, LUXWAN, PIDGEOTTO, 0
; Brunswick Trail
db 65, PIDGEOT, SIRFETCHD, DODRIO, AERODACTYL, 0
; Silph Gauntlet 1F (Viridian Forest)
db 62, FEAROW, GOLDUCK, DODRIO, SIRFETCHD, MADAAMU, AERODACTYL, 0
db 62, PIDGEOT, FEAROW, DODRIO, SIRFETCHD, LUXWAN, AERODACTYL, 0
; Route 14
db 28, PIDGEY, DODUO, PIDGEOTTO, 0
db 26, PIDGEY, SPEAROW, PIDGEY, FEAROW, 0
@ -541,13 +541,13 @@ BirdKeeperData:
; Uses Silph products and Steel-types
ChiefData:
; Silph Gauntlet 7F
db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, PURAKKUSU, 70, GENGAR, 73, PORYGONZ, 75, OMEGA, 0
db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, TRICULES, 70, GENGAR, 73, PORYGONZ, 75, OMEGADGE, 0
; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope.
; Poison- and Electric-type Pokemon
ScientistData:
; Silph Gauntlet 4F (Lavender Tower)
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, ANIMON, WEEZING, ALAKAZAM, 0
db 65, MAGNEZONE, ELECTRODE, PORYGONZ, MIMMEO, WEEZING, ALAKAZAM, 0
; Silph Co. 2F
db 26, GRIMER, WEEZING, KOFFING, WEEZING, 0
db 28, MAGNEMITE, VOLTORB, MAGNETON, 0
@ -566,17 +566,17 @@ ScientistData:
; Silph Co. 9F
db 28, VOLTORB, KOFFING, MAGNETON, 0
; Silph Co. 10F
db 29, MAGNETITE, KOFFING, 0
db 29, MAGNETON, KOFFING, 0
; Mansion 3F
db 33, MAGNETITE, MAGNETON, DITTO, 0
db 33, MAGNEMITE, MAGNETON, DITTO, 0
; Mansion B1F
db 34, MAGNEMITE, ELECTRODE, 0
RocketData:
; Mt. Moon B2F
db 13, RATTATA, BITTYBAT, 0
db 11, SANDSHREW, RATTATA, BITTYBAT, 0
db 12, BITTYBAT, EKANS, 0
db 13, RATTATA, ZUBAT, 0
db 11, SANDSHREW, RATTATA, ZUBAT, 0
db 12, ZUBAT, EKANS, 0
db 16, RATICATE, 0
; Cerulean City
db 17, MACHOP, DROWZEE, 0
@ -658,9 +658,9 @@ CooltrainerMData:
; Equally varied, nothing to say
CooltrainerFData:
; Celadon Gym
db 24, CACTUS, GLOOM, 0
db 24, CACTORMUS, GLOOM, 0
; Victory Road 3F
db 43, TSUBOMITTO, VICTREEBEL, 0
db 43, BELLIGNAN, VICTREEBEL, 0
db 43, PARASECT, DEWGONG, CHANSEY, 0
; Silph Gauntlet 5F (Safari Zone)
db 66, CLEFABLE, GENGAR, VICTREEBEL, NINETALES, KANGASKHAN, BLASTOISE, 0
@ -681,7 +681,7 @@ GentlemanData:
; Silph Gauntlet 3F (S.S Anne)
db 64, ARCANINE, NIDOQUEEN, MR_RIME, FEAROW, CARAPTHOR, RAPIDASH, 0
; SS Anne 2F Rooms
db 17, PUCHIKOON, GROWLITHE, 0
db 17, KOLTA, GROWLITHE, 0
ChannelerData:
; Unused
@ -690,7 +690,7 @@ ChannelerData:
db 23, GASTLY, GASTLY, 0
db 24, GASTLY, 0
; Pokémon Tower 3F
db 23, MIKON, GASTLY, 0
db 23, VULPIII, GASTLY, 0
db 24, VULPIX, 0
; Silph Gauntlet 4F (Lavender Tower)
db 65, MUK, GUARDIA, ANNIHILAPE, HYPNO, NINETALES, GENGAR, 0
@ -728,7 +728,7 @@ StudentData:
db 4, PIDGEY, RATTATA, 0
db 6, CLEFAIRY, 0
; Silph Gauntlet 1F (Viridian Forest)
db 62, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, DEER, 0 ; all Normal types that Yujirou doesn't use
db 62, WIGGLYTUFF, PIDGEOT, TRAMPEL, CLEFABLE, KANGASKHAN, RAMOOSE, 0 ; all Normal types that Yujirou doesn't use
; Celadon University
db 22, BULBASAUR, CHARMANDER, SQUIRTLE, 0
@ -740,14 +740,14 @@ FirefighterData:
db 64, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0
JuniorData:
; Silph Gauntlet 2F (Mt. Moon)
db 63, BLASTOISE, OMASTAR, SANDSLASH, KINGDRA, GUARDIA, POLIWRATH, 0 ; no idea what to do with this guy's team, so I'll redo this later
; to be removed
db 5, BULBASAUR, 0
JackData:
; Celadon Mansion Roof House
db 23, MANKEY, PORYGON, HITMONCHAN, SCYTHER, 0 ; Scyther is Kage-Maru.
; Silph Gauntlet 7F (Chief's Office)
; db 70, ANIMON, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...
; db 70, MIMMEO, ANNIHILAPE, HITMONLEE, PORYGON2, HITMONCHAN, SCIZOR, 0 ; not 100% sure what to do with this guy...
JessieJamesData:
db $FF, 17, MEOWTH, 14, EKANS, 14, KOFFING, 0 ; Mt. Moon

8
data/trainers/rival_parties.asm
View file

@ -28,7 +28,7 @@ Green2Data:
db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 22, EXEGGCUTE, 20, KADABRA, 25, WARTORTLE, 0
db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0
db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0
db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNETITE, 20, SANDSHREW, 25, EEVEE, 0
db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNEMITE, 20, SANDSHREW, 25, EEVEE, 0
db $FF, 25, FEAROW, 23, SHELLDER, 22, VULPIX, 20, SANDSHREW, 25, RAICHU, 0
; Silph Co. 7F
db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
@ -50,9 +50,9 @@ Green3Data:
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, NINETALES, 63, MAGNEZONE, 65, UMBREON, 0
db $FF, 61, SANDSLASH, 59, ALAKAZAM, 61, EXEGGUTOR, 61, CLOYSTER, 63, NINETALES, 65, GOROCHU, 0
; post-game rematch teams, based on FRLG team
db $FF, 77, PURAKKUSU, 78, ALAKAZAM, 77, GYAOON, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0
db $FF, 77, PURAKKUSU, 78, ALAKAZAM, 77, GYAOON, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0
db $FF, 77, PURAKKUSU, 78, ALAKAZAM, 77, GYAOON, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, ARCANINE, 78, EXEGGUTOR, 80, TOTARTLE, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, GYARADOS, 78, ARCANINE, 80, VENUSAUR, 0
db $FF, 77, TRICULES, 78, ALAKAZAM, 77, GAWARHED, 78, EXEGGUTOR, 78, GYARADOS, 80, CHARIZARD, 0
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, NINETALES, 78, MAGNEZONE, 80, UMBREON, 0
db $FF, 77, GUARDIA, 78, ALAKAZAM, 77, TANGROWTH, 78, CLOYSTER, 78, MAGNEZONE, 80, GOROCHU, 0

60
data/trainers/scaled_parties.asm
View file

@ -2,18 +2,18 @@
; This goes for Brock's Steelix, Misty's Starmie, Surge's Gorochu, Erika's Bellossom, Koga's Crobat, Sabrina's Alakazam, Blaine's Arcanine, and Giovanni's Rhyperior.
; In addition, for the rematches, all the leaders should have a regional variant (see the LGPE E4 rematches), plus a starter where applicable.
BrockData:
db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0 ; 0 badges
db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1
db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
db $FF, 38, GOLEM, 37, OMANYTE, 37, KABUTO, 38, DECILLA, 40, STEELIX, 0, ; 4
db $FF, 41, GOLEM, 40, OMASTAR, 40, KABUTOPS, 41, GYAOON, 43, STEELIX, 0 ; 5
db $FF, 45, GOLEM, 44, OMASTAR, 44, KABUTOPS, 45, GYAOON, 47, STEELIX, 0 ; 6
db $FF, 47, GOLEM, 46, OMASTAR, 46, KABUTOPS, 48, GYAOON, 48, KLEAVOR, 50, STEELIX, 0 ; 7 (unused)
db $FF, 67, GOLEM, 66, GYAOON, 66, ARCANINE_H, 67, OMASTAR, 67, KABUTOPS, 70, STEELIX, 0 ; 8 (postgame)
db $FF, 10, GEODUDE, 11, DECILLA, 13, ONIX, 0 ; 0 badges
db $FF, 19, GEODUDE, 18, KABUTO, 19, DECILLA, 21, ONIX, 0 ; 1
db $FF, 22, GRAVELER, 21, OMANYTE, 21, KABUTO, 23, DECILLA, 24, ONIX, 0 ; 2
db $FF, 29, GRAVELER, 28, OMANYTE, 28, KABUTO, 29, DECILLA, 31, ONIX, 0 ; 3
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, 67, GOLEM, 66, GAWARHED, 66, ARCANINE_H, 67, OMASTAR, 67, KABUTOPS, 70, STEELIX, 0 ; 8 (postgame)
MistyData:
db $FF, 10, STARYU, 11, GYOPIN, 13, WEIRDUCK, 0 ; 0 badges
db $FF, 10, HORSEA, 11, STARYU, 13, WEIRDUCK, 0 ; 0 badges
db $FF, 19, HORSEA, 18, GOLDEEN, 19, WEIRDUCK, 21, STARMIE, 0 ; 1
db $FF, 22, HORSEA, 21, CHEEP, 21, GOLDEEN, 23, WEIRDUCK, 25, STARMIE, 0 ; 2
db $FF, 29, HORSEA, 28, JABETTA, 28, GOLDEEN, 29, WEIRDUCK, 31, STARMIE, 0 ; 3
@ -26,8 +26,8 @@ MistyData:
LtSurgeData:
db $FF, 10, VOLTORB, 11, PIKACHU, 13, GAOTORA, 0 ; 0 badges
db $FF, 19, VOLTORB, 18, PIKACHU, 19, GAOTORA, 21, ELECTABUZZ, 0 ; 1
db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNETITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2
db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNETITE, 29, ELECTABUZZ, 31, GOROCHU, 0 ; 3
db $FF, 22, VOLTORB, 21, GAOTORA, 21, MAGNEMITE, 23, ELECTABUZZ, 25, RAICHU, 0 ; 2
db $FF, 29, ELECTRODE, 28, GAOTORA, 28, MAGNEMITE, 29, ELECTABUZZ, 31, RAICHU, 0 ; 3
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
@ -39,10 +39,10 @@ ErikaData:
db $FF, 19, BELLSPROUT, 18, TOEDSCOOL, 19, ODDISH, 21, TANGELA, 0 ; 1
db $FF, 22, BELLSPROUT, 21, PARAS, 21, TOEDSCOOL, 23, TANGELA, 25, GLOOM, 0 ; 2
db $FF, 29, WEEPINBELL, 28, PARASECT, 28, TOEDSCOOL, 29, TANGELA, 31, BELLOSSOM, 0 ; 3
db $FF, 38, VICTREEBEL, 37, PARASECT, 37, CACTUS, 38, TANGELA, 40, BELLOSSOM, 0 ; 4
db $FF, 41, VICTREEBEL, 40, PARASECT, 40, CACTUS, 41, BELLOSSOM, 43, TANGROWTH, 0 ; 5
db $FF, 45, VICTREEBEL, 44, PARASECT, 45, CACTUS, 45, BELLOSSOM, 47, TANGROWTH, 0 ; 6
db $FF, 47, VICTREEBEL, 46, PARASECT, 46, CACTUS, 48, BELLOSSOM, 48, LEAFEON, 50, TANGROWTH, 0 ; 7 (unused)
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, 45, 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, 67, BELLOSSOM, 67, TOEDSCRUEL, 66, ELECTRODE_H, 66, LEAFEON, 67, VENUSAUR, 70, TANGROWTH, 0 ; 8 (postgame)
KogaData:
@ -54,7 +54,7 @@ KogaData:
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, NIDOKING, 46, TENTACRUEL, 48, MUK, 48, WEEZING, 50, CROBAT, 0 ; 7 (unused)
db $FF, 67, VENOMOTH, 66, TSUBOMITTO, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
db $FF, 67, VENOMOTH, 66, BELLIGNAN, 66, SLOWBRO_G, 67, MUK, 67, WEEZING, 70, CROBAT, 0 ; 8 (postgame)
BlaineData:
db $FF, 10, VULPIX, 11, GROWLITHE, 13, PONYTA, 0 ; 0 badges (unused)
@ -92,9 +92,9 @@ LoreleiData:
db $FF, 68, JYNX, 67, CLOYSTER, 67, NINETALES_A, 69, MR_RIME, 69, GLACEON, 71, LAPRAS, 0
BrunoData:
db $FF, 55, HITMONCHAN, 54, STEELIX, 54, SIRFETCHD, 56, HITMONLEE, 56, PURAKKUSU, 58, MACHAMP, 0
db $FF, 55, HITMONCHAN, 54, STEELIX, 54, SIRFETCHD, 56, HITMONLEE, 56, TRICULES, 58, MACHAMP, 0
; post-game rematch team (currently unused)
db $FF, 70, HITMONTOP, 69, STEELIX, 69, SIRFETCHD, 71, POLIWRATH, 71, PURAKKUSU, 73, MACHAMP, 0
db $FF, 70, HITMONTOP, 69, STEELIX, 69, SIRFETCHD, 71, POLIWRATH, 71, TRICULES, 73, MACHAMP, 0
AgathaData:
db $FF, 57, ANNIHILAPE, 56, CROBAT, 56, MAROWAK_A, 58, ARBOK, 58, UMBREON, 60, GENGAR, 0
@ -102,22 +102,22 @@ AgathaData:
db $FF, 72, ANNIHILAPE, 71, CROBAT, 71, MAROWAK_A, 73, ARBOK, 73, UMBREON, 75, GENGAR, 0
LanceData:
db $FF, 59, CROCKY, 58, GYARADOS, 58, EXEGGUTOR_A, 60, CRYITHAN, 60, KINGDRA, 62, DRAGONITE, 0
db $FF, 59, GAVILLAIN, 58, GYARADOS, 58, EXEGGUTOR_A, 60, IGUANARCH, 60, KINGDRA, 62, DRAGONITE, 0
; post-game rematch team (currently unused)
db $FF, 74, CROCKY, 73, GYARADOS, 73, EXEGGUTOR_A, 75, CRYITHAN, 75, KINGDRA, 77, DRAGONITE, 0
db $FF, 74, GAVILLAIN, 73, GYARADOS, 73, EXEGGUTOR_A, 75, IGUANARCH, 75, KINGDRA, 77, DRAGONITE, 0
YujirouData: ; was unused juggler
db $FF, 4, KONYA, 5, RATTATA, 8, LICKITUNG, 0 ; 0
db $FF, 10, KONYA, 11, RATTATA, 13, LICKITUNG, 0 ; 1
db $FF, 4, COINPUR, 5, RATTATA, 8, LICKITUNG, 0 ; 0
db $FF, 10, COINPUR, 11, RATTATA, 13, LICKITUNG, 0 ; 1
db $FF, 19, MEOWTH, 18, RATICATE, 19, FARFETCHD, 21, LICKITUNG, 0 ; 2
db $FF, 22, MEOWTH, 21, RATICATE, 21, FARFETCHD, 23, JIGGLYPUFF, 25, LICKITUNG, 0 ; 3
db $FF, 29, PERSIAN, 28, RATICATE, 28, MADAAMU, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 4
db $FF, 38, PERSIAN, 37, RATICATE, 37, MADAAMU, 38, CHANSEY, 40, LICKITUNG, 0, ; 5
db $FF, 41, PERSIAN, 40, TAUROS, 40, MADAAMU, 41, CHANSEY, 43, LICKILICKY, 0 ; 6
db $FF, 45, PERSIAN, 44, TAUROS, 44, MADAAMU, 45, CHANSEY, 47, LICKILICKY, 0 ; 7
db $FF, 47, PERSIAN, 46, TAUROS, 46, MADAAMU, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8
db $FF, 29, PERSIAN, 28, RATICATE, 28, LUXWAN, 29, JIGGLYPUFF, 31, LICKITUNG, 0 ; 4
db $FF, 38, PERSIAN, 37, RATICATE, 37, LUXWAN, 38, CHANSEY, 40, LICKITUNG, 0, ; 5
db $FF, 41, PERSIAN, 40, TAUROS, 40, LUXWAN, 41, CHANSEY, 43, LICKILICKY, 0 ; 6
db $FF, 45, PERSIAN, 44, TAUROS, 44, LUXWAN, 45, CHANSEY, 47, LICKILICKY, 0 ; 7
db $FF, 47, PERSIAN, 46, TAUROS, 46, LUXWAN, 48, BLISSEY, 48, SNORLAX, 50, LICKILICKY, 0 ; 8
; post-game rematch team
db $FF, 66, PERSIAN, 67, TAUROS, 67, MADAAMU, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
db $FF, 66, PERSIAN, 67, TAUROS, 67, LUXWAN, 66, BLISSEY, 67, SNORLAX, 70, LICKILICKY, 0
BlackbeltData:
; Koichi parties
@ -139,7 +139,7 @@ BlackbeltData:
; Viridian Gym - changed to fit the Ground-type gym theme
db 40, SANDSLASH, GOLEM, 0
db 43, GUARDIA, 0
db 38, CACTUS, DUGTRIO, STEELIX, 0
db 38, CACTORMUS, DUGTRIO, STEELIX, 0
; Victory Road 2F
db 43, MACHOKE, MACHOP, MACHOKE, 0
; Silph Gauntlet 2F (Mt. Moon)

2
data/wild/maps/BrunswickGrotto.asm
View file

@ -7,7 +7,7 @@ BrunswickGrottoWildMons:
db 51, VENOMOTH
db 53, PARASECT
db 53, PARASECT
db 53, CACTUS
db 53, CACTORMUS
db 54, SCYTHER
db 54, PINSIR
db 55, PINSIR

16
data/wild/maps/BrunswickTrail.asm
View file

@ -8,21 +8,11 @@ BrunswickTrailMons:
db 52, DODRIO
db 52, RAPIDASH
db 55, TAUROS
db 55, SANDSLASH
db 55, CACTORMUS
db 56, TOEDSCRUEL
db 56, TOEDSCRUEL
db 55, CACTUS
db 55, CACTORMUS
end_grass_wildmons
def_water_wildmons 10 ; encounter rate
db 52, WEIRDUCK
db 54, WEIRDUCK
db 50, GOLDUCK
db 56, STARYU
db 50, STARYU
db 52, GOLDUCK ; The fastest swimmer in Kanto, as stated in the Pokedex book.
db 54, GOLDUCK
db 50, SEADRA
db 56, SEADRA
db 50, RATICATE ; Raticate are said to be able to swim; fun Easter Egg; seen in the anime.
def_water_wildmons 0 ; encounter rate
end_water_wildmons

4
data/wild/maps/CelesteHill.asm
View file

@ -1,11 +1,11 @@
CelesteHillWildMons:
CelesteHillWildMons: ; unfinished
def_grass_wildmons 10 ; encounter rate
db 55, FARFETCHD
db 55, PIDGEOT
db 56, FARFETCHD
db 56, FEAROW
db 57, FEAROW
db 57, MADAAMU
db 57, LUXWAN
db 57, SIRFETCHD
db 57, DODRIO
db 56, GYARADOS

26
data/wild/maps/CitrineCity.asm
View file

@ -1,26 +1,6 @@
CitrineWildMons:
def_grass_wildmons 10 ; encounter rate
db 50, CACTUS
db 50, PIDGEOT
db 51, DODRIO
db 51, CACTUS
db 51, PIDGEOT
db 52, CACTUS
db 52, KINGLER
db 53, KINGLER
db 53, EXEGGUTOR
db 55, EXEGGUTOR
CitrineWildMons: ; encounters are being removed for now since I'm very unsure what to do with them...
def_grass_wildmons 0 ; encounter rate
end_grass_wildmons
def_water_wildmons 10 ; encounter rate
db 49, SEADRA
db 49, SEAKING
db 52, PENDRAKEN
db 50, SEADRA
db 50, SEAKING
db 53, KINGDRA
db 50, GOLDUCK
db 51, GOLDUCK
db 52, GYARADOS
db 53, GYARADOS
def_water_wildmons 0 ; encounter rate
end_water_wildmons

4
data/wild/maps/DiglettsCave.asm
View file

@ -2,10 +2,10 @@ DiglettsCaveWildMons:
def_grass_wildmons 15 ; encounter rate, lowered a tad to match other routes - PvK
db 18, DIGLETT
db 19, DIGLETT
db 17, ONIX
db 20, ONIX
db 20, DIGLETT
db 17, DIGLETT
db 16, DIGLETT
db 15, DIGLETT
db 21, DIGLETT
db 22, DIGLETT
db 29, DUGTRIO

14
data/wild/maps/FarawayIslandInside.asm
View file

@ -1,4 +1,4 @@
FarawayIslandInsideMons:
FarawayIslandInsideMons: ; DEFINITELY needs reworking
def_grass_wildmons 10 ; encounter rate
db 30, EEVEE
db 30, MANKEY
@ -12,15 +12,5 @@ FarawayIslandInsideMons:
db 30, EEVEE
end_grass_wildmons
def_water_wildmons 10 ; encounter rate
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
db 30, MAGIKARP
def_water_wildmons 0 ; encounter rate
end_water_wildmons

36
data/wild/maps/GarnetCavern1F.asm
View file

@ -1,27 +1,17 @@
; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Flying-type Pokemon.
; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Psychic-type Pokemon.
GarnetCavern1FWildMons:
def_grass_wildmons 5 ; encounter rate
db 62, RHYDON
db 62, GRAVELER
db 63, CROBAT
db 61, DODRIO
db 60, VENOMOTH
db 65, MADAAMU
db 64, FEAROW
db 65, GUARDIA
db 63, TRAMPEL
db 66, CROCKY
def_grass_wildmons 10 ; encounter rate
db 52, RHYDON
db 52, GRAVELER
db 53, CROBAT
db 51, HYPNO
db 50, VENOMOTH
db 55, SLOWBRO
db 54, SLOWBRO
db 55, GUARDIA
db 54, GAVILLAIN
db 55, GAVILLAIN
end_grass_wildmons
def_water_wildmons 5 ; encounter rate
db 62, BAWLIGUA
db 62, TENTACRUEL
db 63, BAWLIGUA
db 61, TENTACRUEL
db 63, SLOWBRO
db 63, KINGLER
db 64, LAPRAS ; reference to the ice cavern on the sevii islands
db 64, GYARADOS
db 65, JAGG
db 66, CRYITHAN
def_water_wildmons 0 ; encounter rate
end_water_wildmons

36
data/wild/maps/GarnetCavern2F.asm
View file

@ -1,27 +1,17 @@
; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Flying-type Pokemon.
; currently unfinished
GarnetCavern2FWildMons:
def_grass_wildmons 5 ; encounter rate
db 62, RHYDON
db 62, GRAVELER
db 63, CROBAT
db 61, DODRIO
db 60, VENOMOTH
db 65, MADAAMU
db 64, FEAROW
db 65, GUARDIA
db 63, TRAMPEL
db 66, CROCKY
def_grass_wildmons 10 ; encounter rate
db 52, RHYDON
db 52, GRAVELER
db 53, CROBAT
db 51, HYPNO
db 50, VENOMOTH
db 55, SLOWBRO
db 54, SLOWBRO
db 55, GUARDIA
db 54, GAVILLAIN
db 55, GAVILLAIN
end_grass_wildmons
def_water_wildmons 5 ; encounter rate
db 60, BAWLIGUA
db 60, TENTACRUEL
db 60, BAWLIGUA
db 60, TENTACRUEL
db 60, SLOWBRO
db 60, KINGLER
db 60, LAPRAS ; reference to the ice cavern on the sevii islands
db 60, GYARADOS
db 60, JAGG
db 60, CRYITHAN
def_water_wildmons 0 ; encounter rate
end_water_wildmons

34
data/wild/maps/GarnetCavernB1F.asm
View file

@ -1,27 +1,17 @@
; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Flying-type Pokemon.
; currently unfinished
GarnetCavernB1FWildMons:
def_grass_wildmons 5 ; encounter rate
db 62, RHYDON
db 62, GRAVELER
db 63, CROBAT
db 61, DODRIO
db 60, VENOMOTH
db 65, MADAAMU
db 64, FEAROW
db 65, GUARDIA
db 63, TRAMPEL
db 66, CROCKY
db 52, RHYDON
db 52, GRAVELER
db 53, CROBAT
db 51, HYPNO
db 50, VENOMOTH
db 55, SLOWBRO
db 54, SLOWBRO
db 55, GUARDIA
db 54, GAVILLAIN
db 55, GAVILLAIN
end_grass_wildmons
def_water_wildmons 5 ; encounter rate
db 60, BAWLIGUA
db 60, TENTACRUEL
db 60, BAWLIGUA
db 60, TENTACRUEL
db 60, SLOWBRO
db 60, KINGLER
db 60, LAPRAS ; reference to the ice cavern on the sevii islands
db 60, GYARADOS
db 60, JAGG
db 60, CRYITHAN
def_water_wildmons 0 ; encounter rate
end_water_wildmons

10
data/wild/maps/MtMoon1F.asm
View file

@ -1,14 +1,14 @@
MtMoon1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 8, BITTYBAT
db 7, BITTYBAT
db 9, BITTYBAT
db 8, ZUBAT
db 7, ZUBAT
db 9, ZUBAT
db 8, GEODUDE
db 6, BITTYBAT
db 6, ZUBAT
db 9, SANDSHREW
db 9, GEODUDE
db 8, PARAS
db 10, BITTYBAT
db 10, ZUBAT
db 8, CLEFAIRY
end_grass_wildmons

6
data/wild/maps/MtMoonB1F.asm
View file

@ -1,12 +1,12 @@
MtMoonB1FWildMons:
def_grass_wildmons 10 ; encounter rate
db 8, BITTYBAT
db 9, BITTYBAT
db 8, ZUBAT
db 9, ZUBAT
db 7, GEODUDE
db 8, GEODUDE
db 9, GEODUDE
db 9, PARAS
db 10, BITTYBAT
db 10, ZUBAT
db 9, SANDSHREW
db 9, CLEFAIRY
db 10, SANDSHREW

4
data/wild/maps/MtMoonB2F.asm
View file

@ -1,8 +1,8 @@
MtMoonB2FWildMons:
def_grass_wildmons 10 ; encounter rate
db 9, BITTYBAT
db 9, ZUBAT
db 9, GEODUDE
db 10, BITTYBAT
db 10, ZUBAT
db 10, GEODUDE
db 11, ZUBAT
db 10, PARAS

Some files were not shown because too many files have changed in this diff Show more