diff --git a/README.md b/README.md index 39cc1472..7e4e41a7 100644 --- a/README.md +++ b/README.md @@ -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.) diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 70060967..84fdb35a 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -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 diff --git a/constants/event_constants.asm b/constants/event_constants.asm index 91531db8..189e658c 100644 --- a/constants/event_constants.asm +++ b/constants/event_constants.asm @@ -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 diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index e754791a..87420f4f 100644 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -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 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 8c1b106b..1770e656 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -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 diff --git a/constants/pokedex_constants.asm b/constants/pokedex_constants.asm index df855bb0..e440e35d 100644 --- a/constants/pokedex_constants.asm +++ b/constants/pokedex_constants.asm @@ -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 diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 3778aec5..2e083e2b 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_constants.asm @@ -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 diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index 06760e76..5fa40ca5 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -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 diff --git a/data/credits/credits_mons.asm b/data/credits/credits_mons.asm index 25a30d9d..bbee279e 100644 --- a/data/credits/credits_mons.asm +++ b/data/credits/credits_mons.asm @@ -15,7 +15,7 @@ CreditsMons: db VENUSAUR db CHARIZARD db TOTARTLE - db OMEGA + db OMEGADGE db ARTICUNO_G db ZAPDOS_G db MOLTRES_G diff --git a/data/events/card_key_coords.asm b/data/events/card_key_coords.asm index efe393fb..95569169 100644 --- a/data/events/card_key_coords.asm +++ b/data/events/card_key_coords.asm @@ -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 diff --git a/data/events/card_key_maps.asm b/data/events/card_key_maps.asm index 4c826fd8..dd601c12 100644 --- a/data/events/card_key_maps.asm +++ b/data/events/card_key_maps.asm @@ -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 diff --git a/data/events/prize_mon_levels.asm b/data/events/prize_mon_levels.asm index ab141afe..505832fa 100644 --- a/data/events/prize_mon_levels.asm +++ b/data/events/prize_mon_levels.asm @@ -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 \ No newline at end of file + db SCYTHER, 25 + db PINSIR, 25 + db PORYGON, 25 \ No newline at end of file diff --git a/data/events/prizes.asm b/data/events/prizes.asm index 92689aad..0ef85dad 100644 --- a/data/events/prizes.asm +++ b/data/events/prizes.asm @@ -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 "@" diff --git a/data/events/trades.asm b/data/events/trades.asm index c2202e7b..4c3c8c56 100644 --- a/data/events/trades.asm +++ b/data/events/trades.asm @@ -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 diff --git a/data/items/names.asm b/data/items/names.asm index aca0ef1d..8f5689d8 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -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 diff --git a/data/maps/dungeon_maps.asm b/data/maps/dungeon_maps.asm index 9b4448b8..5aef3c46 100644 --- a/data/maps/dungeon_maps.asm +++ b/data/maps/dungeon_maps.asm @@ -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] diff --git a/data/maps/headers/CitrineFerryDock.asm b/data/maps/headers/CitrineFerryDock.asm new file mode 100644 index 00000000..36259099 --- /dev/null +++ b/data/maps/headers/CitrineFerryDock.asm @@ -0,0 +1,2 @@ + map_header CitrineFerryDock, CITRINE_FERRY_DOCK, SHIP_PORT, 0 + end_map_header diff --git a/data/maps/headers/FarawayIslandInside.asm b/data/maps/headers/FarawayIslandInside.asm index b60263ce..ec5eefa0 100644 --- a/data/maps/headers/FarawayIslandInside.asm +++ b/data/maps/headers/FarawayIslandInside.asm @@ -1,2 +1,2 @@ - map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, FOREST, 0 + map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, CELESTE, 0 end_map_header \ No newline at end of file diff --git a/data/maps/headers/FarawayIslandOutside.asm b/data/maps/headers/FarawayIslandOutside.asm index a9f14384..c122a938 100644 --- a/data/maps/headers/FarawayIslandOutside.asm +++ b/data/maps/headers/FarawayIslandOutside.asm @@ -1,2 +1,2 @@ - map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, FOREST, 0 + map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, CELESTE, 0 end_map_header \ No newline at end of file diff --git a/data/maps/headers/SeagallopFerry.asm b/data/maps/headers/SeagallopFerry.asm new file mode 100644 index 00000000..e3946afa --- /dev/null +++ b/data/maps/headers/SeagallopFerry.asm @@ -0,0 +1,2 @@ + map_header SeagallopFerry, SEAGALLOP_FERRY, SHIP, 0 + end_map_header diff --git a/data/maps/headers/VermilionFerryDock.asm b/data/maps/headers/VermilionFerryDock.asm new file mode 100644 index 00000000..fe5279e5 --- /dev/null +++ b/data/maps/headers/VermilionFerryDock.asm @@ -0,0 +1,2 @@ + map_header VermilionFerryDock, VERMILION_FERRY_DOCK, SHIP_PORT, 0 + end_map_header diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm index f5a9dc21..4e0a4b81 100644 --- a/data/maps/hide_show_data.asm +++ b/data/maps/hide_show_data.asm @@ -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 diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm index a61d52a0..d84f3847 100644 --- a/data/maps/map_header_banks.asm +++ b/data/maps/map_header_banks.asm @@ -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) diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm index cea087bb..92b40039 100644 --- a/data/maps/map_header_pointers.asm +++ b/data/maps/map_header_pointers.asm @@ -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 diff --git a/data/maps/objects/BillsHouse.asm b/data/maps/objects/BillsHouse.asm index 01054e5c..0e184ee5 100644 --- a/data/maps/objects/BillsHouse.asm +++ b/data/maps/objects/BillsHouse.asm @@ -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 diff --git a/data/maps/objects/BrunswickTrail.asm b/data/maps/objects/BrunswickTrail.asm index ea374d72..9e0fe377 100644 --- a/data/maps/objects/BrunswickTrail.asm +++ b/data/maps/objects/BrunswickTrail.asm @@ -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 diff --git a/data/maps/objects/CitrineCity.asm b/data/maps/objects/CitrineCity.asm index 251f32d5..d9ea4953 100644 --- a/data/maps/objects/CitrineCity.asm +++ b/data/maps/objects/CitrineCity.asm @@ -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 diff --git a/data/maps/objects/CitrineFerryDock.asm b/data/maps/objects/CitrineFerryDock.asm new file mode 100644 index 00000000..20c3e6c4 --- /dev/null +++ b/data/maps/objects/CitrineFerryDock.asm @@ -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 diff --git a/data/maps/objects/CitrinePokecenter.asm b/data/maps/objects/CitrinePokecenter.asm index c5129ed8..b8715a16 100644 --- a/data/maps/objects/CitrinePokecenter.asm +++ b/data/maps/objects/CitrinePokecenter.asm @@ -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 diff --git a/data/maps/objects/CitrineTradebackHouse.asm b/data/maps/objects/CitrineTradebackHouse.asm index 3ad8cf57..542b0467 100644 --- a/data/maps/objects/CitrineTradebackHouse.asm +++ b/data/maps/objects/CitrineTradebackHouse.asm @@ -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 diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm index b71f7256..8ada664a 100644 --- a/data/maps/objects/DiglettsCave.asm +++ b/data/maps/objects/DiglettsCave.asm @@ -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 diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm index dced9e04..45313b17 100644 --- a/data/maps/objects/FarawayIslandOutside.asm +++ b/data/maps/objects/FarawayIslandOutside.asm @@ -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 diff --git a/data/maps/objects/GiovannisRoom.asm b/data/maps/objects/GiovannisRoom.asm index 062a333e..e6977232 100644 --- a/data/maps/objects/GiovannisRoom.asm +++ b/data/maps/objects/GiovannisRoom.asm @@ -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 diff --git a/data/maps/objects/SeagallopFerry.asm b/data/maps/objects/SeagallopFerry.asm new file mode 100644 index 00000000..11b17a45 --- /dev/null +++ b/data/maps/objects/SeagallopFerry.asm @@ -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 diff --git a/data/maps/objects/SilphCo11F.asm b/data/maps/objects/SilphCo11F.asm index 87d2605c..8b90ea4c 100644 --- a/data/maps/objects/SilphCo11F.asm +++ b/data/maps/objects/SilphCo11F.asm @@ -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 diff --git a/data/maps/objects/SilphGauntlet2F.asm b/data/maps/objects/SilphGauntlet2F.asm index dae92cf7..d4ec14e2 100644 --- a/data/maps/objects/SilphGauntlet2F.asm +++ b/data/maps/objects/SilphGauntlet2F.asm @@ -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 diff --git a/data/maps/objects/SilphGauntlet3F.asm b/data/maps/objects/SilphGauntlet3F.asm index a0b4adca..24b725ad 100644 --- a/data/maps/objects/SilphGauntlet3F.asm +++ b/data/maps/objects/SilphGauntlet3F.asm @@ -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 diff --git a/data/maps/objects/SilphGauntlet6F.asm b/data/maps/objects/SilphGauntlet6F.asm index 1d0b7067..6b1d3bea 100644 --- a/data/maps/objects/SilphGauntlet6F.asm +++ b/data/maps/objects/SilphGauntlet6F.asm @@ -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 diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm index 455f13fb..d300fae6 100644 --- a/data/maps/objects/VermilionCity.asm +++ b/data/maps/objects/VermilionCity.asm @@ -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 diff --git a/data/maps/objects/VermilionFerryDock.asm b/data/maps/objects/VermilionFerryDock.asm new file mode 100644 index 00000000..466a658f --- /dev/null +++ b/data/maps/objects/VermilionFerryDock.asm @@ -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 diff --git a/data/maps/objects/VictoryRoad2F.asm b/data/maps/objects/VictoryRoad2F.asm index 95d74930..5f1cdbaf 100644 --- a/data/maps/objects/VictoryRoad2F.asm +++ b/data/maps/objects/VictoryRoad2F.asm @@ -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 diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm index b96f3143..2483dd6b 100644 --- a/data/maps/objects/ViridianCity.asm +++ b/data/maps/objects/ViridianCity.asm @@ -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 diff --git a/data/maps/songs.asm b/data/maps/songs.asm index 9b2009cb..0889bd25 100644 --- a/data/maps/songs.asm +++ b/data/maps/songs.asm @@ -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 diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm index 75b48259..37792e69 100644 --- a/data/maps/town_map_entries.asm +++ b/data/maps/town_map_entries.asm @@ -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 diff --git a/data/pokemon/base_stats.asm b/data/pokemon/base_stats.asm index 6f96b180..f129444f 100644 --- a/data/pokemon/base_stats.asm +++ b/data/pokemon/base_stats.asm @@ -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" diff --git a/data/pokemon/base_stats/barunda.asm b/data/pokemon/base_stats/balumba.asm similarity index 75% rename from data/pokemon/base_stats/barunda.asm rename to data/pokemon/base_stats/balumba.asm index 24cb6794..6a6d47d3 100644 --- a/data/pokemon/base_stats/barunda.asm +++ b/data/pokemon/base_stats/balumba.asm @@ -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) diff --git a/data/pokemon/base_stats/tsubomitto.asm b/data/pokemon/base_stats/bellignan.asm similarity index 68% rename from data/pokemon/base_stats/tsubomitto.asm rename to data/pokemon/base_stats/bellignan.asm index a5e4d956..81ca9e58 100644 --- a/data/pokemon/base_stats/tsubomitto.asm +++ b/data/pokemon/base_stats/bellignan.asm @@ -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) diff --git a/data/pokemon/base_stats/cactus.asm b/data/pokemon/base_stats/cactormus.asm similarity index 72% rename from data/pokemon/base_stats/cactus.asm rename to data/pokemon/base_stats/cactormus.asm index 52bea2b7..59accd24 100644 --- a/data/pokemon/base_stats/cactus.asm +++ b/data/pokemon/base_stats/cactormus.asm @@ -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) diff --git a/data/pokemon/base_stats/clefable.asm b/data/pokemon/base_stats/clefable.asm index 1325f951..5a1df5c2 100644 --- a/data/pokemon/base_stats/clefable.asm +++ b/data/pokemon/base_stats/clefable.asm @@ -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 diff --git a/data/pokemon/base_stats/konya.asm b/data/pokemon/base_stats/coinpur.asm similarity index 70% rename from data/pokemon/base_stats/konya.asm rename to data/pokemon/base_stats/coinpur.asm index fd9abf36..007202fe 100644 --- a/data/pokemon/base_stats/konya.asm +++ b/data/pokemon/base_stats/coinpur.asm @@ -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) diff --git a/data/pokemon/base_stats/taaban.asm b/data/pokemon/base_stats/disturban.asm similarity index 73% rename from data/pokemon/base_stats/taaban.asm rename to data/pokemon/base_stats/disturban.asm index 42e66437..d1e785f0 100644 --- a/data/pokemon/base_stats/taaban.asm +++ b/data/pokemon/base_stats/disturban.asm @@ -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) diff --git a/data/pokemon/base_stats/crocky.asm b/data/pokemon/base_stats/gavillain.asm similarity index 52% rename from data/pokemon/base_stats/crocky.asm rename to data/pokemon/base_stats/gavillain.asm index 8ab121b4..4cebc209 100644 --- a/data/pokemon/base_stats/crocky.asm +++ b/data/pokemon/base_stats/gavillain.asm @@ -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) diff --git a/data/pokemon/base_stats/gyaoon.asm b/data/pokemon/base_stats/gawarhed.asm similarity index 75% rename from data/pokemon/base_stats/gyaoon.asm rename to data/pokemon/base_stats/gawarhed.asm index ce17d132..a649895b 100644 --- a/data/pokemon/base_stats/gyaoon.asm +++ b/data/pokemon/base_stats/gawarhed.asm @@ -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) diff --git a/data/pokemon/base_stats/cryithan.asm b/data/pokemon/base_stats/iguanarch.asm similarity index 61% rename from data/pokemon/base_stats/cryithan.asm rename to data/pokemon/base_stats/iguanarch.asm index 227f641c..a3cc4ed4 100644 --- a/data/pokemon/base_stats/cryithan.asm +++ b/data/pokemon/base_stats/iguanarch.asm @@ -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) diff --git a/data/pokemon/base_stats/puchikoon.asm b/data/pokemon/base_stats/kolta.asm similarity index 67% rename from data/pokemon/base_stats/puchikoon.asm rename to data/pokemon/base_stats/kolta.asm index 9f6529f3..5a150852 100644 --- a/data/pokemon/base_stats/puchikoon.asm +++ b/data/pokemon/base_stats/kolta.asm @@ -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) diff --git a/data/pokemon/base_stats/madaamu.asm b/data/pokemon/base_stats/luxwan.asm similarity index 72% rename from data/pokemon/base_stats/madaamu.asm rename to data/pokemon/base_stats/luxwan.asm index 67dd3fb3..b77fd8c3 100644 --- a/data/pokemon/base_stats/madaamu.asm +++ b/data/pokemon/base_stats/luxwan.asm @@ -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) diff --git a/data/pokemon/base_stats/animon.asm b/data/pokemon/base_stats/mimmeo.asm similarity index 55% rename from data/pokemon/base_stats/animon.asm rename to data/pokemon/base_stats/mimmeo.asm index e2496ef9..a86c364b 100644 --- a/data/pokemon/base_stats/animon.asm +++ b/data/pokemon/base_stats/mimmeo.asm @@ -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) diff --git a/data/pokemon/base_stats/bawligua.asm b/data/pokemon/base_stats/ministare.asm similarity index 64% rename from data/pokemon/base_stats/bawligua.asm rename to data/pokemon/base_stats/ministare.asm index 6bf7bb3e..942422b4 100644 --- a/data/pokemon/base_stats/bawligua.asm +++ b/data/pokemon/base_stats/ministare.asm @@ -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) diff --git a/data/pokemon/base_stats/omega.asm b/data/pokemon/base_stats/omegadge.asm similarity index 76% rename from data/pokemon/base_stats/omega.asm rename to data/pokemon/base_stats/omegadge.asm index 69b5fc2c..d1416bcc 100644 --- a/data/pokemon/base_stats/omega.asm +++ b/data/pokemon/base_stats/omegadge.asm @@ -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) diff --git a/data/pokemon/base_stats/gyopin.asm b/data/pokemon/base_stats/orfry.asm similarity index 71% rename from data/pokemon/base_stats/gyopin.asm rename to data/pokemon/base_stats/orfry.asm index 65fb693a..6df14b06 100644 --- a/data/pokemon/base_stats/gyopin.asm +++ b/data/pokemon/base_stats/orfry.asm @@ -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) diff --git a/data/pokemon/base_stats/kasanagi.asm b/data/pokemon/base_stats/pupal.asm similarity index 53% rename from data/pokemon/base_stats/kasanagi.asm rename to data/pokemon/base_stats/pupal.asm index a2b80374..7393291a 100644 --- a/data/pokemon/base_stats/kasanagi.asm +++ b/data/pokemon/base_stats/pupal.asm @@ -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) diff --git a/data/pokemon/base_stats/deer.asm b/data/pokemon/base_stats/ramoose.asm similarity index 72% rename from data/pokemon/base_stats/deer.asm rename to data/pokemon/base_stats/ramoose.asm index 7275051e..b6305c3c 100644 --- a/data/pokemon/base_stats/deer.asm +++ b/data/pokemon/base_stats/ramoose.asm @@ -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) diff --git a/data/pokemon/base_stats/jagg.asm b/data/pokemon/base_stats/sharpoon.asm similarity index 70% rename from data/pokemon/base_stats/jagg.asm rename to data/pokemon/base_stats/sharpoon.asm index 0ba7313e..b0f71c29 100644 --- a/data/pokemon/base_stats/jagg.asm +++ b/data/pokemon/base_stats/sharpoon.asm @@ -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) diff --git a/data/pokemon/base_stats/skimper.asm b/data/pokemon/base_stats/squeamata.asm similarity index 63% rename from data/pokemon/base_stats/skimper.asm rename to data/pokemon/base_stats/squeamata.asm index 3f41e4b7..d4994187 100644 --- a/data/pokemon/base_stats/skimper.asm +++ b/data/pokemon/base_stats/squeamata.asm @@ -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) diff --git a/data/pokemon/base_stats/purakkusu.asm b/data/pokemon/base_stats/tricules.asm similarity index 70% rename from data/pokemon/base_stats/purakkusu.asm rename to data/pokemon/base_stats/tricules.asm index a6f28083..8bcd86e2 100644 --- a/data/pokemon/base_stats/purakkusu.asm +++ b/data/pokemon/base_stats/tricules.asm @@ -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) diff --git a/data/pokemon/base_stats/betobebii.asm b/data/pokemon/base_stats/unused/betobebii.asm similarity index 100% rename from data/pokemon/base_stats/betobebii.asm rename to data/pokemon/base_stats/unused/betobebii.asm diff --git a/data/pokemon/base_stats/bittybat.asm b/data/pokemon/base_stats/unused/bittybat.asm similarity index 100% rename from data/pokemon/base_stats/bittybat.asm rename to data/pokemon/base_stats/unused/bittybat.asm diff --git a/data/pokemon/base_stats/hinaazu.asm b/data/pokemon/base_stats/unused/hinaazu.asm similarity index 100% rename from data/pokemon/base_stats/hinaazu.asm rename to data/pokemon/base_stats/unused/hinaazu.asm diff --git a/data/pokemon/base_stats/magnetite.asm b/data/pokemon/base_stats/unused/magnetite.asm similarity index 100% rename from data/pokemon/base_stats/magnetite.asm rename to data/pokemon/base_stats/unused/magnetite.asm diff --git a/data/pokemon/base_stats/monja.asm b/data/pokemon/base_stats/unused/monja.asm similarity index 100% rename from data/pokemon/base_stats/monja.asm rename to data/pokemon/base_stats/unused/monja.asm diff --git a/data/pokemon/base_stats/pudi.asm b/data/pokemon/base_stats/unused/pudi.asm similarity index 100% rename from data/pokemon/base_stats/pudi.asm rename to data/pokemon/base_stats/unused/pudi.asm diff --git a/data/pokemon/base_stats/mikon.asm b/data/pokemon/base_stats/vulpiii.asm similarity index 69% rename from data/pokemon/base_stats/mikon.asm rename to data/pokemon/base_stats/vulpiii.asm index 29054f72..8d7d7f97 100644 --- a/data/pokemon/base_stats/mikon.asm +++ b/data/pokemon/base_stats/vulpiii.asm @@ -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) diff --git a/data/pokemon/base_stats/wigglytuff.asm b/data/pokemon/base_stats/wigglytuff.asm index e839d29c..65e70844 100644 --- a/data/pokemon/base_stats/wigglytuff.asm +++ b/data/pokemon/base_stats/wigglytuff.asm @@ -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 diff --git a/data/pokemon/cries.asm b/data/pokemon/cries.asm index d2fa8a80..3bb8c9d2 100644 --- a/data/pokemon/cries.asm +++ b/data/pokemon/cries.asm @@ -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 diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm index 30b25f44..3f9ae91e 100644 --- a/data/pokemon/dex_entries.asm +++ b/data/pokemon/dex_entries.asm @@ -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: diff --git a/data/pokemon/dex_order.asm b/data/pokemon/dex_order.asm index 0b97d190..80d97bf8 100644 --- a/data/pokemon/dex_order.asm +++ b/data/pokemon/dex_order.asm @@ -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 diff --git a/data/pokemon/evos_moves.asm b/data/pokemon/evos_moves.asm index 5f072631..15fb5845 100644 --- a/data/pokemon/evos_moves.asm +++ b/data/pokemon/evos_moves.asm @@ -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 diff --git a/data/pokemon/menu_icons.asm b/data/pokemon/menu_icons.asm index ca170564..9492b9d3 100644 --- a/data/pokemon/menu_icons.asm +++ b/data/pokemon/menu_icons.asm @@ -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 diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm index 71154a04..aaf169be 100644 --- a/data/pokemon/names.asm +++ b/data/pokemon/names.asm @@ -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" diff --git a/data/pokemon/new_dex_text.asm b/data/pokemon/new_dex_text.asm index 79b23a12..e5fa6329 100644 --- a/data/pokemon/new_dex_text.asm +++ b/data/pokemon/new_dex_text.asm @@ -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:: diff --git a/data/pokemon/palettes.asm b/data/pokemon/palettes.asm index bc9087f6..46587aad 100644 --- a/data/pokemon/palettes.asm +++ b/data/pokemon/palettes.asm @@ -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 diff --git a/data/pokemon/title_mons.asm b/data/pokemon/title_mons.asm index 822a9331..08a7b64f 100644 --- a/data/pokemon/title_mons.asm +++ b/data/pokemon/title_mons.asm @@ -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 diff --git a/data/pokemon/tradeback_moves.asm b/data/pokemon/tradeback_moves.asm index ebf2aad1..6bad7833 100644 --- a/data/pokemon/tradeback_moves.asm +++ b/data/pokemon/tradeback_moves.asm @@ -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 diff --git a/data/text/text_2.asm b/data/text/text_2.asm index 51c7db05..1356838d 100644 --- a/data/text/text_2.asm +++ b/data/text/text_2.asm @@ -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." diff --git a/data/tilesets/warp_tile_ids.asm b/data/tilesets/warp_tile_ids.asm index a5ef8c16..8100f649 100644 --- a/data/tilesets/warp_tile_ids.asm +++ b/data/tilesets/warp_tile_ids.asm @@ -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: diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm index 78acca92..229e3b05 100644 --- a/data/trainers/parties.asm +++ b/data/trainers/parties.asm @@ -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 diff --git a/data/trainers/rival_parties.asm b/data/trainers/rival_parties.asm index 1ddf2bf1..48a624e4 100644 --- a/data/trainers/rival_parties.asm +++ b/data/trainers/rival_parties.asm @@ -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 diff --git a/data/trainers/scaled_parties.asm b/data/trainers/scaled_parties.asm index e7f9f88f..3618414f 100644 --- a/data/trainers/scaled_parties.asm +++ b/data/trainers/scaled_parties.asm @@ -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) diff --git a/data/wild/maps/BrunswickGrotto.asm b/data/wild/maps/BrunswickGrotto.asm index 0c71646e..a1467d0a 100644 --- a/data/wild/maps/BrunswickGrotto.asm +++ b/data/wild/maps/BrunswickGrotto.asm @@ -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 diff --git a/data/wild/maps/BrunswickTrail.asm b/data/wild/maps/BrunswickTrail.asm index c9b0db27..e56113a2 100644 --- a/data/wild/maps/BrunswickTrail.asm +++ b/data/wild/maps/BrunswickTrail.asm @@ -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 \ No newline at end of file diff --git a/data/wild/maps/CelesteHill.asm b/data/wild/maps/CelesteHill.asm index 0feb3f73..05622838 100644 --- a/data/wild/maps/CelesteHill.asm +++ b/data/wild/maps/CelesteHill.asm @@ -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 diff --git a/data/wild/maps/CitrineCity.asm b/data/wild/maps/CitrineCity.asm index e350e157..d3aa9880 100644 --- a/data/wild/maps/CitrineCity.asm +++ b/data/wild/maps/CitrineCity.asm @@ -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 diff --git a/data/wild/maps/DiglettsCave.asm b/data/wild/maps/DiglettsCave.asm index deec8e76..16d3dbe8 100644 --- a/data/wild/maps/DiglettsCave.asm +++ b/data/wild/maps/DiglettsCave.asm @@ -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 diff --git a/data/wild/maps/FarawayIslandInside.asm b/data/wild/maps/FarawayIslandInside.asm index c9cde351..a0b692b8 100644 --- a/data/wild/maps/FarawayIslandInside.asm +++ b/data/wild/maps/FarawayIslandInside.asm @@ -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 \ No newline at end of file diff --git a/data/wild/maps/GarnetCavern1F.asm b/data/wild/maps/GarnetCavern1F.asm index 28a1a2b5..8cde7809 100644 --- a/data/wild/maps/GarnetCavern1F.asm +++ b/data/wild/maps/GarnetCavern1F.asm @@ -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 diff --git a/data/wild/maps/GarnetCavern2F.asm b/data/wild/maps/GarnetCavern2F.asm index e041d29a..ef694f1b 100644 --- a/data/wild/maps/GarnetCavern2F.asm +++ b/data/wild/maps/GarnetCavern2F.asm @@ -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 diff --git a/data/wild/maps/GarnetCavernB1F.asm b/data/wild/maps/GarnetCavernB1F.asm index 763c929a..ae75d80a 100644 --- a/data/wild/maps/GarnetCavernB1F.asm +++ b/data/wild/maps/GarnetCavernB1F.asm @@ -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 diff --git a/data/wild/maps/MtMoon1F.asm b/data/wild/maps/MtMoon1F.asm index ba5dfa50..5e5036c2 100644 --- a/data/wild/maps/MtMoon1F.asm +++ b/data/wild/maps/MtMoon1F.asm @@ -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 diff --git a/data/wild/maps/MtMoonB1F.asm b/data/wild/maps/MtMoonB1F.asm index f8b661cb..263ca1c0 100644 --- a/data/wild/maps/MtMoonB1F.asm +++ b/data/wild/maps/MtMoonB1F.asm @@ -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 diff --git a/data/wild/maps/MtMoonB2F.asm b/data/wild/maps/MtMoonB2F.asm index 72df01e0..3fbff0b4 100644 --- a/data/wild/maps/MtMoonB2F.asm +++ b/data/wild/maps/MtMoonB2F.asm @@ -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 diff --git a/data/wild/maps/MtMoonCrater.asm b/data/wild/maps/MtMoonCrater.asm index 008c7ca7..0b738181 100644 --- a/data/wild/maps/MtMoonCrater.asm +++ b/data/wild/maps/MtMoonCrater.asm @@ -5,11 +5,11 @@ MtMoonCraterMons: db 53, RAICHU db 52, VENOMOTH db 52, DUGTRIO - db 55, ESPEON - db 55, UMBREON + db 55, RAICHU + db 55, CHANSEY db 50, SANDY_SHOCKS db 50, SCREAM_TAIL - db 56, CHANSEY ; I don't like this but I also don't like the Paradox Pokemon not both being 4%. Sue me. + db 50, SCREAM_TAIL end_grass_wildmons def_water_wildmons 10 ; encounter rate @@ -21,6 +21,6 @@ MtMoonCraterMons: db 52, CROAKOZUNA db 54, CROAKOZUNA db 50, WUGTRIO - db 56, WUGTRIO - db 50, VAPOREON + db 51, WUGTRIO + db 52, WUGTRIO end_water_wildmons \ No newline at end of file diff --git a/data/wild/maps/PokemonTower2F.asm b/data/wild/maps/PokemonTower2F.asm index 98dc77fb..3c810670 100644 --- a/data/wild/maps/PokemonTower2F.asm +++ b/data/wild/maps/PokemonTower2F.asm @@ -2,14 +2,14 @@ PokemonTower2FWildMons: def_grass_wildmons 10 ; encounter rate db 20, GASTLY db 21, GASTLY - db 18, MIKON - db 15, MIKON + db 18, VULPIII + db 15, VULPIII db 20, VULPIX db 24, VULPIX db 22, CUBONE db 20, CUBONE db 25, HAUNTER - db 25, BARUNDA + db 25, BALUMBA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonTower3F.asm b/data/wild/maps/PokemonTower3F.asm index fb55a2f7..b9f6e98a 100644 --- a/data/wild/maps/PokemonTower3F.asm +++ b/data/wild/maps/PokemonTower3F.asm @@ -3,8 +3,8 @@ PokemonTower3FWildMons: db 20, GASTLY db 21, GASTLY db 22, GASTLY - db 15, MIKON - db 16, MIKON + db 15, VULPIII + db 16, VULPIII db 18, VULPIX db 24, VULPIX db 20, CUBONE diff --git a/data/wild/maps/PokemonTower4F.asm b/data/wild/maps/PokemonTower4F.asm index 5fef09ba..4d253387 100644 --- a/data/wild/maps/PokemonTower4F.asm +++ b/data/wild/maps/PokemonTower4F.asm @@ -3,8 +3,8 @@ PokemonTower4FWildMons: db 20, GASTLY db 21, GASTLY db 22, GASTLY - db 15, MIKON - db 16, MIKON + db 15, VULPIII + db 16, VULPIII db 23, VULPIX db 25, HAUNTER db 20, CUBONE diff --git a/data/wild/maps/PokemonTower5F.asm b/data/wild/maps/PokemonTower5F.asm index 00ef3434..c5960350 100644 --- a/data/wild/maps/PokemonTower5F.asm +++ b/data/wild/maps/PokemonTower5F.asm @@ -2,8 +2,8 @@ PokemonTower5FWildMons: def_grass_wildmons 10 ; encounter rate db 20, GASTLY db 21, GASTLY - db 15, MIKON - db 16, MIKON + db 15, VULPIII + db 16, VULPIII db 23, VULPIX db 24, VULPIX db 25, HAUNTER diff --git a/data/wild/maps/PokemonTower6F.asm b/data/wild/maps/PokemonTower6F.asm index 89ccf427..eaa3391b 100644 --- a/data/wild/maps/PokemonTower6F.asm +++ b/data/wild/maps/PokemonTower6F.asm @@ -9,7 +9,7 @@ PokemonTower6FWildMons: db 26, HAUNTER db 22, CUBONE db 27, HAUNTER - db 28, BARUNDA + db 28, BALUMBA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/PokemonTower7F.asm b/data/wild/maps/PokemonTower7F.asm index 4cc65820..91d76711 100644 --- a/data/wild/maps/PokemonTower7F.asm +++ b/data/wild/maps/PokemonTower7F.asm @@ -8,7 +8,7 @@ PokemonTower7FWildMons: db 28, HAUNTER db 22, CUBONE db 24, CUBONE - db 28, BARUNDA + db 28, BALUMBA db 30, GENGAR end_grass_wildmons diff --git a/data/wild/maps/PowerPlant.asm b/data/wild/maps/PowerPlant.asm index 2e1a53fc..7feafe78 100644 --- a/data/wild/maps/PowerPlant.asm +++ b/data/wild/maps/PowerPlant.asm @@ -1,15 +1,15 @@ PowerPlantWildMons: def_grass_wildmons 10 ; encounter rate - db 35, MAGNEMITE - db 35, VOLTORB - db 35, GAOTORA - db 36, VOLTORB - db 36, GAOTORA - db 36, PIKACHU - db 37, MAGNETITE - db 36, ELECTABUZZ - db 38, ELECTABUZZ - db 40, RAICHU + db 32, MAGNEMITE + db 32, VOLTORB + db 32, GAOTORA + db 33, VOLTORB + db 33, GAOTORA + db 33, PIKACHU + db 34, MAGNETON + db 33, ELECTABUZZ + db 35, ELECTABUZZ + db 36, RAICHU end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/RockTunnel1F.asm b/data/wild/maps/RockTunnel1F.asm index 6e50a739..b166cfa7 100644 --- a/data/wild/maps/RockTunnel1F.asm +++ b/data/wild/maps/RockTunnel1F.asm @@ -5,11 +5,11 @@ RockTunnel1FWildMons: db 17, GEODUDE db 15, MACHOP db 16, GEODUDE - db 18, CHARMANDER - db 15, BITTYBAT + db 18, SLOWPOKE + db 17, SLOWPOKE db 17, MACHOP db 13, ONIX - db 15, DITTO + db 15, GAVILLAIN end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/RockTunnelB1F.asm b/data/wild/maps/RockTunnelB1F.asm index 09eeb93b..c0505597 100644 --- a/data/wild/maps/RockTunnelB1F.asm +++ b/data/wild/maps/RockTunnelB1F.asm @@ -4,12 +4,12 @@ RockTunnelB1FWildMons: db 17, ZUBAT db 17, RIBBITO db 15, MACHOP - db 16, SLOWPOKE - db 18, BITTYBAT + db 16, RIBBITO + db 18, ZUBAT db 17, MACHOP - db 17, PSYDUCK - db 13, CROCKY - db 18, CROCKY + db 17, ONIX + db 13, GAVILLAIN + db 18, GAVILLAIN end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route1.asm b/data/wild/maps/Route1.asm index 260f1616..9e4c9bb3 100644 --- a/data/wild/maps/Route1.asm +++ b/data/wild/maps/Route1.asm @@ -4,8 +4,8 @@ Route1WildMons: db 2, RATTATA db 3, RATTATA db 3, PIDGEY - db 2, KONYA - db 3, KONYA + db 2, COINPUR + db 3, COINPUR db 3, PIDGEY db 4, RATTATA db 4, PIDGEY diff --git a/data/wild/maps/Route10.asm b/data/wild/maps/Route10.asm index 55fead9f..25e6d87f 100644 --- a/data/wild/maps/Route10.asm +++ b/data/wild/maps/Route10.asm @@ -1,15 +1,15 @@ Route10WildMons: def_grass_wildmons 15 ; encounter rate db 16, MAGNEMITE - db 16, KOTORA + db 16, RATTATA db 14, VOLTORB - db 11, EKANS + db 13, EKANS db 13, SPEAROW - db 15, NIDORINO - db 17, NIDORINA - db 20, MACHOP - db 13, SANDSHREW - db 17, SANDSHREW + db 14, KOTORA + db 15, NIDORAN_M + db 17, EKANS + db 14, SPEAROW + db 19, NIDORINO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route12.asm b/data/wild/maps/Route12.asm index bb0a85c3..d60af81b 100644 --- a/data/wild/maps/Route12.asm +++ b/data/wild/maps/Route12.asm @@ -2,14 +2,14 @@ Route12WildMons: def_grass_wildmons 15 ; encounter rate db 24, BELLSPROUT db 25, PIDGEOTTO - db 23, BLASTYKE - db 24, ODDISH - db 22, BARUNDA - db 26, BARUNDA + db 23, ODDISH + db 24, VENONAT + db 24, BALUMBA + db 25, BALUMBA db 26, GLOOM - db 27, FARFETCHD + db 27, PIDGEOTTO + db 27, WEEPINBELL db 28, WEEPINBELL - db 30, WEEPINBELL end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route13.asm b/data/wild/maps/Route13.asm index c23478ce..effa7bda 100644 --- a/data/wild/maps/Route13.asm +++ b/data/wild/maps/Route13.asm @@ -1,15 +1,15 @@ Route13WildMons: def_grass_wildmons 20 ; encounter rate db 24, ODDISH - db 25, FARFETCHD - db 27, PIDGEOTTO + db 25, PIDGEOTTO + db 23, BELLSPROUT db 24, VENONAT - db 22, DITTO - db 26, KRABBY - db 26, BELLSPROUT - db 25, DITTO + db 24, VENONAT + db 24, KOTORA + db 26, WEEPINBELL + db 27, BALUMBA + db 27, GLOOM db 28, GLOOM - db 30, GLOOM end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route14.asm b/data/wild/maps/Route14.asm index 9ea83a3a..34340cc8 100644 --- a/data/wild/maps/Route14.asm +++ b/data/wild/maps/Route14.asm @@ -1,15 +1,15 @@ Route14WildMons: def_grass_wildmons 15 ; encounter rate - db 26, ODDISH - db 28, PIDGEOTTO + db 24, ODDISH + db 26, VENONAT + db 25, PIDGEOTTO db 25, DITTO - db 26, TANGELA - db 24, BELLSPROUT - db 28, VENOMOTH - db 28, GLOOM - db 32, WEEPINBELL - db 30, PIDGEOTTO - db 32, SCYTHER + db 22, ODDISH + db 28, BELLSPROUT + db 26, RAMOOSE + db 30, VENOMOTH + db 28, GAOTORA + db 30, GAOTORA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route15.asm b/data/wild/maps/Route15.asm index 2b5c1283..b9b2d441 100644 --- a/data/wild/maps/Route15.asm +++ b/data/wild/maps/Route15.asm @@ -1,15 +1,15 @@ Route15WildMons: def_grass_wildmons 15 ; encounter rate - db 24, ODDISH - db 26, DITTO - db 23, PIDGEOTTO + db 24, BELLSPROUT db 26, VENONAT - db 22, ODDISH - db 28, DEER - db 26, BELLSPROUT + db 25, SPEAROW + db 25, DITTO + db 22, BELLSPROUT + db 28, ODDISH + db 26, RAMOOSE db 30, VENOMOTH db 28, GAOTORA - db 30, GAOTORA + db 30, FEAROW end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route16.asm b/data/wild/maps/Route16.asm index 99374a58..9df927cd 100644 --- a/data/wild/maps/Route16.asm +++ b/data/wild/maps/Route16.asm @@ -2,12 +2,12 @@ Route16WildMons: def_grass_wildmons 25 ; encounter rate db 20, SPEAROW db 22, FEAROW - db 18, GRIMER - db 20, DODUO db 20, GRIMER + db 20, DODUO + db 20, KOFFING db 18, DODUO - db 22, DODUO - db 22, RATICATE + db 22, KOFFING + db 22, RAMOOSE db 23, RATICATE db 25, RATICATE end_grass_wildmons diff --git a/data/wild/maps/Route17.asm b/data/wild/maps/Route17.asm index 97cc85f9..b04164ec 100644 --- a/data/wild/maps/Route17.asm +++ b/data/wild/maps/Route17.asm @@ -1,14 +1,14 @@ Route17WildMons: def_grass_wildmons 25 ; encounter rate db 25, FEAROW - db 27, RATICATE + db 27, KOFFING db 25, RATICATE - db 24, PUCHIKOON - db 27, RATICATE + db 24, KOLTA + db 27, GRIMER db 26, DODUO db 28, DODUO - db 29, PUCHIKOON - db 25, PONYTA + db 29, PONYTA + db 28, PONYTA db 27, DODRIO end_grass_wildmons diff --git a/data/wild/maps/Route2.asm b/data/wild/maps/Route2.asm index 8fe927b9..463297ff 100644 --- a/data/wild/maps/Route2.asm +++ b/data/wild/maps/Route2.asm @@ -4,12 +4,12 @@ Route2WildMons: db 3, PIDGEY db 4, PIDGEY db 3, WEEDLE - db 3, KONYA + db 3, COINPUR db 3, CATERPIE db 4, WEEDLE db 4, CATERPIE - db 4, KONYA - db 5, KONYA + db 4, COINPUR + db 5, COINPUR end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index 5358aabb..1e1eeee1 100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm @@ -1,10 +1,10 @@ Route21WildMons: def_grass_wildmons 25 ; encounter rate - db 21, RATICATE - db 23, PIDGEOTTO - db 30, BARUNDA - db 30, MR_MIME - db 29, MR_MIME + db 27, RATICATE + db 28, PIDGEOTTO + db 30, BALUMBA + db 28, GLOOM + db 28, WEEPINBELL db 29, TOEDSCOOL db 29, TOEDSCOOL db 28, TANGELA @@ -18,7 +18,7 @@ Route21WildMons: db 35, BLOTTLE db 35, BLOTTLE db 30, TENTACOOL - db 35, BARUNDA + db 35, BALUMBA db 30, TENTACOOL db 35, TENTACRUEL db 35, PENDRAKEN diff --git a/data/wild/maps/Route23.asm b/data/wild/maps/Route23.asm index 8dae5197..62ab11c3 100644 --- a/data/wild/maps/Route23.asm +++ b/data/wild/maps/Route23.asm @@ -3,13 +3,13 @@ Route23WildMons: db 41, ARBOK db 40, SANDSLASH db 38, FEAROW - db 38, RHYDON + db 38, ARBOK db 38, EXEGGCUTE db 40, PRIMEAPE - db 41, EXEGGCUTE - db 43, EXEGGCUTE - db 41, CHANSEY - db 38, TAUROS + db 37, EXEGGCUTE + db 38, EXEGGCUTE + db 40, FEAROW + db 41, SANDSLASH end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route4.asm b/data/wild/maps/Route4.asm index 285cc288..c552ddb9 100644 --- a/data/wild/maps/Route4.asm +++ b/data/wild/maps/Route4.asm @@ -6,8 +6,8 @@ Route4WildMons: db 12, RATTATA db 10, EKANS db 11, EKANS - db 11, MIKON - db 12, MIKON + db 11, VULPIII + db 12, VULPIII db 8, JIGGLYPUFF db 10, JIGGLYPUFF end_grass_wildmons diff --git a/data/wild/maps/Route5.asm b/data/wild/maps/Route5.asm index f35b8378..b8cd28b2 100644 --- a/data/wild/maps/Route5.asm +++ b/data/wild/maps/Route5.asm @@ -1,15 +1,15 @@ Route5WildMons: def_grass_wildmons 15 ; encounter rate db 13, ODDISH - db 13, KOTORA - db 15, MONJA + db 13, EKANS + db 15, EKANS db 10, MANKEY db 12, JIGGLYPUFF db 15, BELLSPROUT db 16, BELLSPROUT - db 16, PIDGEOTTO + db 15, PIDGEY db 14, JIGGLYPUFF - db 16, MEOWTH + db 16, PIDGEOTTO end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route7.asm b/data/wild/maps/Route7.asm index 6501e7ba..5c57146d 100644 --- a/data/wild/maps/Route7.asm +++ b/data/wild/maps/Route7.asm @@ -1,15 +1,15 @@ Route7WildMons: def_grass_wildmons 15 ; encounter rate - db 22, PIDGEY - db 19, ODDISH - db 17, PIDGEOTTO - db 22, BELLSPROUT - db 19, MANKEY - db 18, MEOWTH - db 18, GROWLITHE - db 20, JIGGLYPUFF + db 19, PIDGEOTTO + db 19, MEOWTH + db 20, MEOWTH + db 20, PIDGEOTTO + db 19, SANDSHREW + db 18, KOLTA + db 18, SANDSHREW + db 19, KOLTA db 19, VULPIX - db 20, ABRA + db 20, VULPIX end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route8.asm b/data/wild/maps/Route8.asm index 6117314b..e3f01958 100644 --- a/data/wild/maps/Route8.asm +++ b/data/wild/maps/Route8.asm @@ -2,14 +2,14 @@ Route8WildMons: def_grass_wildmons 15 ; encounter rate db 20, PIDGEOTTO db 18, MANKEY - db 17, EKANS + db 17, RATTATA db 16, GROWLITHE - db 18, BULBASAUR + db 18, KOLTA db 20, SANDSHREW - db 19, RATICATE + db 19, GROWLITHE db 17, VULPIX db 18, VULPIX - db 15, KADABRA + db 18, KADABRA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/Route9.asm b/data/wild/maps/Route9.asm index 9fb23e0b..58e3a7e1 100644 --- a/data/wild/maps/Route9.asm +++ b/data/wild/maps/Route9.asm @@ -2,14 +2,14 @@ Route9WildMons: def_grass_wildmons 15 ; encounter rate db 16, RATTATA db 16, SPEAROW - db 14, SANDSHREW - db 11, EKANS - db 13, CUBONE - db 15, CACTUS - db 17, NIDORINA - db 17, NIDORINO - db 17, RATICATE - db 20, FEAROW + db 14, EKANS + db 13, EKANS + db 15, RATTATA + db 15, MAGNEMITE + db 15, NIDORAN_F + db 17, SANDSHREW + db 17, SANDSHREW + db 19, NIDORINA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SafariZoneCenter.asm b/data/wild/maps/SafariZoneCenter.asm index 0fa30976..f09813a2 100644 --- a/data/wild/maps/SafariZoneCenter.asm +++ b/data/wild/maps/SafariZoneCenter.asm @@ -4,11 +4,11 @@ SafariZoneCenterWildMons: db 25, RHYHORN db 22, VENONAT db 24, TANGELA - db 31, MAROWAK + db 24, CUBONE db 25, SLOWPOKE - db 31, LICKITUNG + db 21, LICKITUNG + db 23, RAMOOSE db 23, CHANSEY - db 23, DEER db 23, TRAMPEL end_grass_wildmons diff --git a/data/wild/maps/SafariZoneEast.asm b/data/wild/maps/SafariZoneEast.asm index 467cecf4..0100ee88 100644 --- a/data/wild/maps/SafariZoneEast.asm +++ b/data/wild/maps/SafariZoneEast.asm @@ -4,12 +4,12 @@ SafariZoneEastWildMons: db 26, DODUO db 22, TANGELA db 25, RHYHORN - db 33, LICKITUNG + db 23, LICKITUNG db 23, EXEGGCUTE - db 24, KANGASKHAN + db 24, TAUROS db 25, PINSIR + db 24, KANGASKHAN db 7, CHANSEY - db 28, DEER end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SafariZoneNorth.asm b/data/wild/maps/SafariZoneNorth.asm index dde06c25..740442dc 100644 --- a/data/wild/maps/SafariZoneNorth.asm +++ b/data/wild/maps/SafariZoneNorth.asm @@ -6,10 +6,10 @@ SafariZoneNorthWildMons: db 25, TANGELA db 30, VENOMOTH db 27, EXEGGCUTE - db 30, DODRIO - db 32, KANGASKHAN - db 26, CHANSEY - db 28, TAUROS + db 28, DODRIO + db 27, TAUROS + db 26, TRAMPEL + db 28, KANGASKHAN end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SafariZoneWest.asm b/data/wild/maps/SafariZoneWest.asm index d4677f74..dbd65d3f 100644 --- a/data/wild/maps/SafariZoneWest.asm +++ b/data/wild/maps/SafariZoneWest.asm @@ -7,9 +7,9 @@ SafariZoneWestWildMons: db 33, VENOMOTH db 26, EXEGGCUTE db 25, MAROWAK - db 31, SCYTHER + db 25, SCYTHER db 26, TAUROS - db 28, PINSIR + db 25, CHANSEY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SilphGauntlet1F.asm b/data/wild/maps/SilphGauntlet1F.asm index 348653ec..8729106a 100644 --- a/data/wild/maps/SilphGauntlet1F.asm +++ b/data/wild/maps/SilphGauntlet1F.asm @@ -7,9 +7,9 @@ Gauntlet1FWildMons: db 51, BEEDRILL db 52, VENOMOTH db 52, CARAPTHOR - db 53, RAICHU + db 53, TANGELA db 53, CARAPTHOR - db 55, VENUSAUR + db 55, GOROTORA end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SilphGauntlet2F.asm b/data/wild/maps/SilphGauntlet2F.asm index 0e8ad34b..fbe62f67 100644 --- a/data/wild/maps/SilphGauntlet2F.asm +++ b/data/wild/maps/SilphGauntlet2F.asm @@ -3,13 +3,13 @@ Gauntlet2FWildMons: db 51, GRAVELER db 51, SANDSLASH db 52, MACHOKE - db 52, CROBAT + db 52, PARASECT db 52, SANDSLASH db 53, MACHOKE - db 53, STEELIX + db 53, CROBAT db 54, CLEFABLE - db 54, STEELIX - db 56, CHARIZARD + db 54, CROBAT + db 56, KLEAVOR end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SilphGauntlet3F.asm b/data/wild/maps/SilphGauntlet3F.asm index 7548651b..391debd7 100644 --- a/data/wild/maps/SilphGauntlet3F.asm +++ b/data/wild/maps/SilphGauntlet3F.asm @@ -9,7 +9,7 @@ Gauntlet3FWildMons: db 54, GOLDUCK db 55, BLASTOISE db 55, GOLDUCK - db 57, TOTARTLE + db 57, LAPRAS end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SilphGauntlet4F.asm b/data/wild/maps/SilphGauntlet4F.asm index 9efe6560..d30d8651 100644 --- a/data/wild/maps/SilphGauntlet4F.asm +++ b/data/wild/maps/SilphGauntlet4F.asm @@ -3,7 +3,7 @@ Gauntlet4FWildMons: db 53, HAUNTER db 53, GUARDIA db 54, NINETALES - db 54, BARUNDA + db 54, BALUMBA db 54, GUARDIA db 55, NINETALES db 55, HYPNO diff --git a/data/wild/maps/SilphGauntlet5F.asm b/data/wild/maps/SilphGauntlet5F.asm index bf3c6040..3f3eed24 100644 --- a/data/wild/maps/SilphGauntlet5F.asm +++ b/data/wild/maps/SilphGauntlet5F.asm @@ -5,8 +5,8 @@ Gauntlet5FWildMons: db 55, EXEGGUTOR db 55, SCYTHER db 55, PINSIR - db 56, KANGASKHAN db 56, TAUROS + db 56, KANGASKHAN db 57, TRAMPEL db 57, CHANSEY db 59, DRAGONITE diff --git a/data/wild/maps/SilphGauntlet6F.asm b/data/wild/maps/SilphGauntlet6F.asm index 3aaf4e7b..17d82a61 100644 --- a/data/wild/maps/SilphGauntlet6F.asm +++ b/data/wild/maps/SilphGauntlet6F.asm @@ -1,15 +1,15 @@ -Gauntlet6FWildMons: +Gauntlet6FWildMons: ; the pokemon on this floor represent the 9 gym leaders (including Yujirou!) def_grass_wildmons 10 ; encounter rate - db 55, MUK - db 55, WEEZING - db 56, ANIMON - db 56, ELECTRODE + db 55, STEELIX + db 55, STARMIE + db 56, ELECTABUZZ + db 56, BELLOSSOM db 56, WEEZING - db 57, ANIMON - db 57, MAGNEZONE - db 58, PORYGON - db 58, MAGNEZONE - db 60, OMEGA + db 57, MR_MIME + db 57, MAGMAR + db 58, NIDOKING + db 60, LICKILICKY + db 60, LICKILICKY end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index 91f8a289..74132360 100644 --- a/data/wild/maps/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm @@ -6,9 +6,9 @@ VictoryRoad1FWildMons: db 36, SANDSLASH db 39, SANDSLASH db 42, GOLBAT - db 41, CROCKY + db 41, GAVILLAIN db 41, RHYDON - db 42, GUARDIA + db 42, MAROWAK db 43, HITMONTOP ; LGPE Rare Spawn end_grass_wildmons diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index 5c032817..01409287 100644 --- a/data/wild/maps/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm @@ -6,9 +6,9 @@ VictoryRoad2FWildMons: db 36, SANDSLASH db 39, SANDSLASH db 42, MACHOKE - db 41, CROCKY + db 41, GAVILLAIN db 40, RHYDON - db 40, GUARDIA + db 40, MAROWAK db 43, HITMONLEE ; LGPE Rare Spawn end_grass_wildmons diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index b8c44de3..3ff5cab9 100644 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm @@ -6,9 +6,9 @@ VictoryRoad3FWildMons: db 42, SANDSLASH db 40, VENOMOTH db 45, SANDSLASH - db 43, CROCKY + db 43, GAVILLAIN db 45, RHYDON ; LGPE encounters - db 45, GUARDIA + db 45, MAROWAK db 45, HITMONCHAN ; LGPE Rare Spawn end_grass_wildmons diff --git a/data/wild/super_rod.asm b/data/wild/super_rod.asm index 7f192bec..7523be01 100644 --- a/data/wild/super_rod.asm +++ b/data/wild/super_rod.asm @@ -59,16 +59,15 @@ SuperRodData: db 4 db 5, MAGIKARP db 7, MAGIKARP - db 5, GYOPIN - db 7, GYOPIN + db 5, ORFRY + db 7, ORFRY .Group2: ; Route 4, Cerulean, Route 24, Route 6 - db 5 + db 4 db 12, MAGIKARP db 12, POLIWAG - db 12, GYOPIN + db 12, ORFRY db 12, PSYDUCK - db 12, CHEEP .Group3: ; Route 11, Route 25, Vermilion db 5 @@ -84,50 +83,47 @@ SuperRodData: db 20, PSYDUCK db 20, TENTACOOL db 20, BLOTTLE - db 20, MAGIKARP + db 20, KRABBY .Group5: ; Route 13, Route 17, Route 18, Fuchsia - db 7 + db 6 db 25, HORSEA db 25, POLIWHIRL db 25, KRABBY - db 20, SKIMPER db 25, CHEEP db 25, BLOTTLE db 25, GOLDEEN .Group6: ; Safari Zone - db 7 + db 6 db 15, DRATINI db 20, SLOWPOKE db 25, KRABBY db 25, WEIRDUCK db 25, POLIWHIRL db 30, DRAGONAIR - db 20, SKIMPER .Group7: ; Bill's Garden db 6 db 50, SQUIRTLE - db 50, WARTORTLE - db 50, TOTARTLE + db 50, SQUIRTLE + db 50, DRATINI db 50, DRATINI db 50, DRAGONAIR db 55, DRAGONITE .Group8: ; Sea Routes, Route 23, Seafoam Islands, Underwater Tunnel - db 7 + db 6 db 30, STARYU db 30, HORSEA db 30, SHELLDER - db 30, PENDRAKEN - db 30, JAGG + db 30, SHARPOON db 30, BLASTYKE db 30, GOLDEEN .Group9: ; Citrine, Brunswick, Garnet - db 10 - db 50, JAGG + db 8 + db 50, SHARPOON db 50, SEAKING db 50, KINGLER db 50, SEADRA @@ -135,21 +131,17 @@ SuperRodData: db 50, GYARADOS db 50, JABETTA db 50, CROAKOZUNA - db 50, BLASTOISE - db 50, LAPRAS .Group10: ; Cerulean Cave - db 10 + db 8 db 50, SLOWBRO db 50, SEAKING db 50, KINGLER - db 50, WUGTRIO db 50, SHELLDER db 50, GYARADOS db 50, JABETTA db 50, CROAKOZUNA db 50, GOLDUCK - db 100, MAGIKARP .Group11: ; Celadon db 7 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 089410b8..ac67282b 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1595,7 +1595,7 @@ TryRunningFromBattle: jp z, .canEscape ; jump if it's a safari battle ld a, [wLinkState] ld a, [wCurOpponent] - cp OMEGA + cp OMEGADGE jp z, .omegaCantEscape cp LINK_STATE_BATTLING jp z, .canEscape @@ -6417,28 +6417,31 @@ LoadEnemyMonData: ld de, wEnemyMonNick ld bc, NAME_LENGTH call CopyData - cp BATTLE_TENT - jr z, .skipSeenFlagAdding ; one of Battle Tower's rules + ;ld a, [wCurMap] + ;cp BATTLE_TENT + ;jr z, .skipSeenFlagAdding ; one of Battle Tower's rules ld a, [wEnemyMonSpecies2] ld [wd11e], a predef IndexToPokedex - call IsGhostBattle ; this prevents it from being identified early - jr nz, .noMarkSeen ; part of the ghost fix + ;call IsGhostBattle ; this prevents it from being identified early + ;jr nz, .noMarkSeen ; part of the ghost fix ld a, [wd11e] dec a ld c, a ld b, FLAG_SET ld hl, wPokedexSeen predef FlagActionPredef ; mark this mon as seen in the pokedex -.noMarkSeen ; part of the ghost fix - ld hl, wEnemyMonLevel - ld de, wEnemyMonUnmodifiedLevel - ld bc, 1 + NUM_STATS * 2 - call CopyData - ld a, $7 ; default stat mod - ld b, NUM_STAT_MODS ; number of stat mods - ld hl, wEnemyMonStatMods -.skipSeenFlagAdding + +;.noMarkSeen ; this is supposed to be a ghost fix but it causes the pokedex to just...never update so I'm commenting it out +; ld hl, wEnemyMonLevel +; ld de, wEnemyMonUnmodifiedLevel +; ld bc, 1 + NUM_STATS * 2 +; call CopyData +; ld a, $7 ; default stat mod +; ld b, NUM_STAT_MODS ; number of stat mods +; ld hl, wEnemyMonStatMods +;.skipSeenFlagAdding + ld hl, wEnemyMonLevel ld de, wEnemyMonUnmodifiedLevel ld bc, $b diff --git a/engine/battletentdata.asm b/engine/battletentdata.asm index ff5bcab9..2d787330 100644 --- a/engine/battletentdata.asm +++ b/engine/battletentdata.asm @@ -228,11 +228,11 @@ BTMonList:: db TRAMPEL db SNORLAX db BUTTERFREE - db PURAKKUSU + db TRICULES db SCIZOR db PARASECT ; Rock+Fighting set - db GYAOON + db GAWARHED db KABUTOPS db RHYPERIOR db ARCANINE_H @@ -246,7 +246,7 @@ BTMonList:: db LAPRAS db GYARADOS db BLASTOISE - db JAGG + db SHARPOON db POLITOED db PENDRAKEN ; Electric+Fire set @@ -268,7 +268,7 @@ BTMonList:: db NINETALES_A db MR_RIME ; Flying+Fire set - db MADAAMU + db LUXWAN db AERODACTYL db DRAGONITE db DODRIO @@ -277,13 +277,13 @@ BTMonList:: db RAPIDASH db TAUROS_PB ; Normal+Grass set - db DEER + db RAMOOSE db CHANSEY db KANGASKHAN db RATICATE_A db TANGROWTH - db CACTUS - db TSUBOMITTO + db CACTORMUS + db BELLIGNAN db VICTREEBEL ; Ghost+Ground+Poison set db STEELIX @@ -299,9 +299,9 @@ BTMonList:: db PORYGONZ db CLEFABLE db RATICATE - db CROCKY + db GAVILLAIN db EXEGGUTOR_A - db CRYITHAN + db IGUANARCH db KINGDRA diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index b3327892..786973b9 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -144,11 +144,10 @@ IF DEF(_DEBUG) .items_end ; Complete the Pokédex. - ; Comment out (except for the event) to test post-game setup. - ;ld hl, wPokedexOwned - ;call DebugSetPokedexEntries - ;ld hl, wPokedexSeen - ;call DebugSetPokedexEntries + ld hl, wPokedexOwned + call DebugSetPokedexEntries + ld hl, wPokedexSeen + call DebugSetPokedexEntries SetEvent EVENT_GOT_POKEDEX ; Test Post-Game Functionality. diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index aa78cabc..6d135af3 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -203,7 +203,7 @@ HandlePokedexListMenu: call PlaceString ; find the highest pokedex number among the pokemon the player has seen ld hl, wPokedexSeenEnd - 1 - ld b, (wPokedexSeenEnd - wPokedexSeen) * 8 + 1 - 4 ; this line's causing some issues, so we basically broke it for now + ld b, 249 ; This makes the last number in the dex match up with the last Pokemon in dex order. This makes it look a little odd when incomplete but also allows for Pokemon beyond 248 to display correctly. Setting it as 249 for now (so everything up to Melmetal gets displayed) but may update if we can bring Magnetite and Bittybat back. .maxSeenPokemonLoop ld a, [hld] ld c, 8 diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 17bf8968..88caea0a 100644 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -39,6 +39,47 @@ ShakeElevator:: call UpdateSprites jp PlayDefaultMusic +ShakeElevatorFerry:: + ld de, -$20 + call ShakeElevatorRedrawRow + ld de, SCREEN_HEIGHT * $20 + call ShakeElevatorRedrawRow + call Delay3 + ld a, SFX_STOP_ALL_MUSIC + call PlaySound + ldh a, [hSCY] + ld d, a + ld e, $1 + ld b, 100 +.shakeLoop ; scroll the BG up and down and play a sound effect + ld a, e + xor $fe + ld e, a + add d + ldh [hSCY], a + push bc + ld c, 0 ; BANK(SFX_Collision_1) + ld a, SFX_COLLISION + call PlaySound + pop bc + ld c, 2 + call DelayFrames + dec b + jr nz, .shakeLoop + ld a, d + ldh [hSCY], a + ld a, SFX_STOP_ALL_MUSIC + call PlaySound + ld c, 0 ; BANK(SFX_SS_Anne_Horn) + ld a, SFX_SS_ANNE_HORN + call PlaySound +;.musicLoop +; ld a, [wChannelSoundIDs + CHAN5] +; cp SFX_SAFARI_ZONE_PA +; jr z, .musicLoop + call UpdateSprites + jp PlayDefaultMusic + ShakeElevatorRedrawRow: ; This function is used to redraw certain portions of the screen, but it does ; not appear to ever result in any visible effect, so this function seems to diff --git a/engine/overworld/ferry_script.asm b/engine/overworld/ferry_script.asm new file mode 100644 index 00000000..ef462ef5 --- /dev/null +++ b/engine/overworld/ferry_script.asm @@ -0,0 +1,230 @@ +; New script for Red++ +; Based on a combination of Fossil Lab and Elevator Menus +; Allows travel to any Event Island based on which tickets the player has in the pack +EventIslandsFerryScript:: + ld hl, WelcomeToSeagallopText + call PrintText + call GetFerryTickets + ld a, [wFilteredBagItemsCount] + and a + jr z, .noTicket + call DoIslandMenu + ret + +.noTicket + call ManualTextScroll + ld hl,NoTicketText + call PrintText + ret + +GetFerryTickets: +; generate a list in wram of all Event Items the player has + xor a + ld [wFilteredBagItemsCount], a + ld de, wFilteredBagItems + ld hl, TicketList +.loop + ld a, [hli] + and a + jr z, .done + push hl + push de + ld [wd11e], a + ld b, a + predef GetQuantityOfItemInBag + pop de + pop hl + ld a, b + and a + jr z, .loop + + ; A ticket's in the bag + ld a, [wd11e] + ld [de], a + inc de + push hl + ld hl, wFilteredBagItemsCount + inc [hl] + pop hl + jr .loop +.done + ld hl, wFilteredBagItemsCount + ld a, [hl] + and a + jr z, .endList ; if no items are in the pack, don't add "Go Home" option + + ; add Vermilion to the list if there is one, to get back home + ld a, FLOOR_11F + ld [de],a + inc de + inc [hl] ; increase item count so GO HOME shows up + +.endList + ld a, $ff ; End of list + ld [de], a + ret + +TicketList: + db OLD_SEA_MAP + db CITRINE_PASS + db $00 + +PrintTicketsInBag: +; Print the list of names inside the menu box we drew + ld hl, wFilteredBagItems + xor a + ld [$ffdb], a +.loop + ld a, [hli] + cp $ff + ret z + push hl + ld [wd11e], a + call GetItemName + coord hl, 2, 2 + ld a, [$ffdb] + ld bc, $28 + call AddNTimes + ld de, wcd6d + call PlaceString + ld hl, $ffdb + inc [hl] + pop hl + jr .loop + +DoIslandMenu: +; Display the menu we generated earlier, let the player choose an item to use, +; then do the elevator thing and update the warps accordingly + ld hl, wd730 + set 6, [hl] + xor a + ld [wCurrentMenuItem], a + ld a, $3 ; A_BUTTON | B_BUTTON + ld [wMenuWatchedKeys], a + ld a, [wFilteredBagItemsCount] + dec a + ld [wMaxMenuItem], a + ld a, 2 + ld [wTopMenuItemY], a + ld a, 1 + ld [wTopMenuItemX], a + ld a, [wFilteredBagItemsCount] + dec a + ld bc, 2 + ld hl, 3 + call AddNTimes + dec l + ld b, l + ld c, $d + ld hl, wTileMap + call TextBoxBorder + call UpdateSprites + call PrintTicketsInBag + ld hl, wd730 + res 6, [hl] + call HandleMenuInput + bit 1, a ; Pressed B? + jr nz, .cancelledChoosingTicket + ld hl, wFilteredBagItems + ld a, [wCurrentMenuItem] + ld d, 0 + ld e, a + add hl, de + ld a, [hl] + ld [$ffdb], a + cp OLD_SEA_MAP + jr z, .choseFarawayIsland + cp CITRINE_PASS + jr z, .choseCitrineCity + +;choseVermilion + ld b, 1 + ld c, VERMILION_FERRY_DOCK + jr .islandSelected + +.choseFarawayIsland + ld b, 0 + ld c, FARAWAY_ISLAND_OUTSIDE + jr .islandSelected + +.choseCitrineCity + ld b, 1 + ld c, CITRINE_FERRY_DOCK + jr .islandSelected + +.islandSelected +; First, see if we need to update the warps + ld a, [wWarpEntries + 3] ; Map ID of first warp + cp c ; see if we're already at the place we tried to go + jr z, .alreadyThere + +; Hold onto the warp entry we selected + push bc + +; Mark for it to do the shake animation + ld hl, wCurrentMapScriptFlags + set 7, [hl] + +; Announce that we are leaving + ld hl, AllAboardText + call PrintText + +; Update the warp entries to match the ones for that island + pop bc ; get the warp IDs back + ld hl, wWarpEntries + call .doWarpStuff + +; This is called once to update the first warp, then it falls through to run again and update the second warp +.doWarpStuff + inc hl + inc hl + ld a, b + ld [hli], a + ld a, c + ld [hli], a + ret + +.cancelledChoosingTicket + ld hl, GoingNowhereText + call PrintText + ret + +.alreadyThere + ld hl, AlreadyThereText + call PrintText + ret + +WelcomeToSeagallopText: + text "Welcome aboard" + line "the SEAGALLOP" + cont "FERRY!" + + para "Do you have a" + line "ticket to travel" + cont "with us today?@@" + +NoTicketText: + text "No? That's too" + line "bad." + + para "Come back and see" + line "us later." + prompt + db "@" + +GoingNowhereText: + text "Come back and see" + line "us later." + prompt + db "@" + +AllAboardText: + text "All aboard!" + prompt + db "@" + +AlreadyThereText: + text "We're already" + line "there!" + prompt + db "@" diff --git a/gfx/pics.asm b/gfx/pics.asm index 988c6772..d8ca08e1 100644 --- a/gfx/pics.asm +++ b/gfx/pics.asm @@ -346,7 +346,7 @@ BirdKeeperPic:: INCBIN "gfx/trainers/birdkeeper.pic" BlackbeltPic:: INCBIN "gfx/trainers/blackbelt.pic" Rival1Pic:: INCBIN "gfx/trainers/rival1.pic" ProfOakPic:: INCBIN "gfx/trainers/prof.oak.pic" -ChiefPic:: INCBIN "gfx/trainers/chief.pic" +ChiefPic:: INCBIN "gfx/trainers/chief.pic" ScientistPic:: INCBIN "gfx/trainers/scientist.pic" GiovanniPic:: INCBIN "gfx/trainers/giovanni.pic" RocketPic:: INCBIN "gfx/trainers/rocket.pic" @@ -385,57 +385,51 @@ BlottlePicFront:: INCBIN "gfx/pokemon/front/blottle.pic" BlottlePicBack:: INCBIN "gfx/pokemon/back/blottleb.pic" PendrakenPicFront:: INCBIN "gfx/pokemon/front/pendraken.pic" PendrakenPicBack:: INCBIN "gfx/pokemon/back/pendrakenb.pic" -KonyaPicFront:: INCBIN "gfx/pokemon/front/konya.pic" -KonyaPicBack:: INCBIN "gfx/pokemon/back/konyab.pic" -MikonPicFront:: INCBIN "gfx/pokemon/front/mikon.pic" -MikonPicBack:: INCBIN "gfx/pokemon/back/mikonb.pic" -GyopinPicFront:: INCBIN "gfx/pokemon/front/gyopin.pic" -GyopinPicBack:: INCBIN "gfx/pokemon/back/gyopinb.pic" -PuchikoonPicFront:: INCBIN "gfx/pokemon/front/puchikoon.pic" -PuchikoonPicBack:: INCBIN "gfx/pokemon/back/puchikoonb.pic" +CoinpurPicFront:: INCBIN "gfx/pokemon/front/coinpur.pic" +CoinpurPicBack:: INCBIN "gfx/pokemon/back/coinpurb.pic" +VulpiiiPicFront:: INCBIN "gfx/pokemon/front/vulpiii.pic" +VulpiiiPicBack:: INCBIN "gfx/pokemon/back/vulpiiib.pic" +OrfryPicFront:: INCBIN "gfx/pokemon/front/orfry.pic" +OrfryPicBack:: INCBIN "gfx/pokemon/back/orfryb.pic" +KoltaPicFront:: INCBIN "gfx/pokemon/front/kolta.pic" +KoltaPicBack:: INCBIN "gfx/pokemon/back/koltab.pic" WeirduckPicFront:: INCBIN "gfx/pokemon/front/weirduck.pic" WeirduckPicBack:: INCBIN "gfx/pokemon/back/weirduckb.pic" BlastykePicFront:: INCBIN "gfx/pokemon/front/blastyke.pic" BlastykePicBack:: INCBIN "gfx/pokemon/back/blastykeb.pic" TotartlePicFront:: INCBIN "gfx/pokemon/front/totartle.pic" TotartlePicBack:: INCBIN "gfx/pokemon/back/totartleb.pic" -MagnetitePicFront:: INCBIN "gfx/pokemon/front/magnetite.pic" -MagnetitePicBack:: INCBIN "gfx/pokemon/back/magnetiteb.pic" -BittybatPicFront:: INCBIN "gfx/pokemon/front/bittybat.pic" -BittybatPicBack:: INCBIN "gfx/pokemon/back/bittybatb.pic" GuardiaPicFront:: INCBIN "gfx/pokemon/front/guardia.pic" GuardiaPicBack:: INCBIN "gfx/pokemon/back/guardiab.pic" -MadaamuPicFront:: INCBIN "gfx/pokemon/front/madaamu.pic" -MadaamuPicBack:: INCBIN "gfx/pokemon/back/madaamub.pic" -PurakkusuPicFront:: INCBIN "gfx/pokemon/front/purakkusu.pic" -PurakkusuPicBack:: INCBIN "gfx/pokemon/back/purakkusub.pic" -MonjaPicFront:: INCBIN "gfx/pokemon/front/monja.pic" -MonjaPicBack:: INCBIN "gfx/pokemon/back/monjab.pic" +LuxwanPicFront:: INCBIN "gfx/pokemon/front/luxwan.pic" +LuxwanPicBack:: INCBIN "gfx/pokemon/back/luxwanb.pic" +TriculesPicFront:: INCBIN "gfx/pokemon/front/tricules.pic" +TriculesPicBack:: INCBIN "gfx/pokemon/back/triculesb.pic" TangrowthPicFront:: INCBIN "gfx/pokemon/front/tangrowth.pic" TangrowthPicBack:: INCBIN "gfx/pokemon/back/tangrowthb.pic" LickilickyPicFront:: INCBIN "gfx/pokemon/front/lickilicky.pic" LickilickyPicBack:: INCBIN "gfx/pokemon/back/lickilickyb.pic" -MeltanPicFront:: INCBIN "gfx/pokemon/front/meltan.pic" -MeltanPicBack:: INCBIN "gfx/pokemon/back/meltanb.pic" +MeltanPicFront:: INCBIN "gfx/pokemon/front/meltan.pic" +MeltanPicBack:: INCBIN "gfx/pokemon/back/meltanb.pic" MelmetalPicFront:: INCBIN "gfx/pokemon/front/melmetal.pic" MelmetalPicBack:: INCBIN "gfx/pokemon/back/melmetalb.pic" SECTION "Pics 8", ROMX -BarundaPicFront:: INCBIN "gfx/pokemon/front/barunda.pic" -BarundaPicBack:: INCBIN "gfx/pokemon/back/barundab.pic" -CactusPicFront:: INCBIN "gfx/pokemon/front/cactus.pic" -CactusPicBack:: INCBIN "gfx/pokemon/back/cactusb.pic" -CrockyPicFront:: INCBIN "gfx/pokemon/front/crocky.pic" -CrockyPicBack:: INCBIN "gfx/pokemon/back/crockyb.pic" +BalumbaPicFront:: INCBIN "gfx/pokemon/front/balumba.pic" +BalumbaPicBack:: INCBIN "gfx/pokemon/back/balumbab.pic" +CactormusPicFront:: INCBIN "gfx/pokemon/front/cactormus.pic" +CactormusPicBack:: INCBIN "gfx/pokemon/back/cactormusb.pic" +GavillainPicFront:: INCBIN "gfx/pokemon/front/gavillain.pic" +GavillainPicBack:: INCBIN "gfx/pokemon/back/gavillainb.pic" TrampelPicFront:: INCBIN "gfx/pokemon/front/trampel.pic" TrampelPicBack:: INCBIN "gfx/pokemon/back/trampelb.pic" -DeerPicFront:: INCBIN "gfx/pokemon/front/deer.pic" -DeerPicBack:: INCBIN "gfx/pokemon/back/deerb.pic" +RamoosePicFront:: INCBIN "gfx/pokemon/front/ramoose.pic" +RamoosePicBack:: INCBIN "gfx/pokemon/back/ramooseb.pic" BuuPicFront:: INCBIN "gfx/pokemon/front/buu.pic" BuuPicBack:: INCBIN "gfx/pokemon/back/buub.pic" -JaggPicFront:: INCBIN "gfx/pokemon/front/jagg.pic" -JaggPicBack:: INCBIN "gfx/pokemon/back/jaggb.pic" +SharpoonPicFront:: INCBIN "gfx/pokemon/front/sharpoon.pic" +SharpoonPicBack:: INCBIN "gfx/pokemon/back/sharpoonb.pic" NidoreignPicFront:: INCBIN "gfx/pokemon/front/nidoreign.pic" NidoreignPicBack:: INCBIN "gfx/pokemon/back/nidoreignb.pic" KotoraPicFront:: INCBIN "gfx/pokemon/front/kotora.pic" @@ -444,20 +438,20 @@ GaotoraPicFront:: INCBIN "gfx/pokemon/front/gaotora.pic" GaotoraPicBack:: INCBIN "gfx/pokemon/back/gaotorab.pic" GorotoraPicFront:: INCBIN "gfx/pokemon/front/gorotora.pic" GorotoraPicBack:: INCBIN "gfx/pokemon/back/gorotorab.pic" -SkimperPicFront:: INCBIN "gfx/pokemon/front/skimper.pic" -SkimperPicBack:: INCBIN "gfx/pokemon/back/skimperb.pic" -BawliguaPicFront:: INCBIN "gfx/pokemon/front/bawligua.pic" -BawliguaPicBack:: INCBIN "gfx/pokemon/back/bawliguab.pic" -CryithanPicFront:: INCBIN "gfx/pokemon/front/cryithan.pic" -CryithanPicBack:: INCBIN "gfx/pokemon/back/cryithanb.pic" +SqueamataPicFront:: INCBIN "gfx/pokemon/front/squeamata.pic" +SqueamataPicBack:: INCBIN "gfx/pokemon/back/squeamatab.pic" +MinistarePicFront:: INCBIN "gfx/pokemon/front/ministare.pic" +MinistarePicBack:: INCBIN "gfx/pokemon/back/ministareb.pic" +IguanarchPicFront:: INCBIN "gfx/pokemon/front/iguanarch.pic" +IguanarchPicBack:: INCBIN "gfx/pokemon/back/iguanarchb.pic" GorochuPicFront:: INCBIN "gfx/pokemon/front/gorochu.pic" GorochuPicBack:: INCBIN "gfx/pokemon/back/gorochub.pic" DecillaPicFront:: INCBIN "gfx/pokemon/front/decilla.pic" DecillaPicBack:: INCBIN "gfx/pokemon/back/decillab.pic" -GyaoonPicFront:: INCBIN "gfx/pokemon/front/gyaoon.pic" -GyaoonPicBack:: INCBIN "gfx/pokemon/back/gyaoonb.pic" -OmegaPicFront:: INCBIN "gfx/pokemon/front/omega.pic" -OmegaPicBack:: INCBIN "gfx/pokemon/back/omegab.pic" +GawarhedPicFront:: INCBIN "gfx/pokemon/front/gawarhed.pic" +GawarhedPicBack:: INCBIN "gfx/pokemon/back/gawarhedb.pic" +OmegadgePicFront:: INCBIN "gfx/pokemon/front/omegadge.pic" +OmegadgePicBack:: INCBIN "gfx/pokemon/back/omegadgeb.pic" KokanaPicFront:: INCBIN "gfx/pokemon/front/kokana.pic" KokanaPicBack:: INCBIN "gfx/pokemon/back/kokanab.pic" ScizorPicFront:: INCBIN "gfx/pokemon/front/scizor.pic" @@ -495,18 +489,18 @@ GlaceonPicFront:: INCBIN "gfx/pokemon/front/glaceon.pic" GlaceonPicBack:: INCBIN "gfx/pokemon/back/glaceonb.pic" SylveonPicFront:: INCBIN "gfx/pokemon/front/sylveon.pic" SylveonPicBack:: INCBIN "gfx/pokemon/back/sylveonb.pic" -TsubomittoPicFront:: INCBIN "gfx/pokemon/front/tsubomitto.pic" -TsubomittoPicBack:: INCBIN "gfx/pokemon/back/tsubomittob.pic" -SteelixPicFront:: INCBIN "gfx/pokemon/front/steelix.pic" -SteelixPicBack:: INCBIN "gfx/pokemon/back/steelixb.pic" -BlisseyPicFront:: INCBIN "gfx/pokemon/front/blissey.pic" -BlisseyPicBack:: INCBIN "gfx/pokemon/back/blisseyb.pic" -HitmontopPicFront:: INCBIN "gfx/pokemon/front/hitmontop.pic" +BellignanPicFront:: INCBIN "gfx/pokemon/front/bellignan.pic" +BellignanPicBack:: INCBIN "gfx/pokemon/back/bellignanb.pic" +SteelixPicFront:: INCBIN "gfx/pokemon/front/steelix.pic" +SteelixPicBack:: INCBIN "gfx/pokemon/back/steelixb.pic" +BlisseyPicFront:: INCBIN "gfx/pokemon/front/blissey.pic" +BlisseyPicBack:: INCBIN "gfx/pokemon/back/blisseyb.pic" +HitmontopPicFront:: INCBIN "gfx/pokemon/front/hitmontop.pic" HitmontopPicBack:: INCBIN "gfx/pokemon/back/hitmontopb.pic" -CrobatPicFront:: INCBIN "gfx/pokemon/front/crobat.pic" -CrobatPicBack:: INCBIN "gfx/pokemon/back/crobatb.pic" -AnimonPicFront:: INCBIN "gfx/pokemon/front/animon.pic" -AnimonPicBack:: INCBIN "gfx/pokemon/back/animonb.pic" +CrobatPicFront:: INCBIN "gfx/pokemon/front/crobat.pic" +CrobatPicBack:: INCBIN "gfx/pokemon/back/crobatb.pic" +MimmeoPicFront:: INCBIN "gfx/pokemon/front/mimmeo.pic" +MimmeoPicBack:: INCBIN "gfx/pokemon/back/mimmeob.pic" BellossomPicFront:: INCBIN "gfx/pokemon/front/bellossom.pic" BellossomPicBack:: INCBIN "gfx/pokemon/back/bellossomb.pic" Porygon2PicFront:: INCBIN "gfx/pokemon/front/porygon2.pic" @@ -521,10 +515,10 @@ ElectivirePicFront:: INCBIN "gfx/pokemon/front/electivire.pic" ElectivirePicBack:: INCBIN "gfx/pokemon/back/electivireb.pic" MagmortarPicFront:: INCBIN "gfx/pokemon/front/magmortar.pic" MagmortarPicBack:: INCBIN "gfx/pokemon/back/magmortarb.pic" -TaabanPicFront:: INCBIN "gfx/pokemon/front/taaban.pic" -TaabanPicBack:: INCBIN "gfx/pokemon/back/taabanb.pic" -KasanagiPicFront:: INCBIN "gfx/pokemon/front/kasanagi.pic" -KasanagiPicBack:: INCBIN "gfx/pokemon/back/kasanagib.pic" +DisturbanPicFront:: INCBIN "gfx/pokemon/front/disturban.pic" +DisturbanPicBack:: INCBIN "gfx/pokemon/back/disturbanb.pic" +PupalPicFront:: INCBIN "gfx/pokemon/front/pupal.pic" +PupalPicBack:: INCBIN "gfx/pokemon/back/pupalb.pic" CarapthorPicFront:: INCBIN "gfx/pokemon/front/carapthor.pic" CarapthorPicBack:: INCBIN "gfx/pokemon/back/carapthorb.pic" MagnezonePicFront:: INCBIN "gfx/pokemon/front/magnezone.pic" diff --git a/gfx/pokemon/back/barundab.png b/gfx/pokemon/back/balumbab.png similarity index 100% rename from gfx/pokemon/back/barundab.png rename to gfx/pokemon/back/balumbab.png diff --git a/gfx/pokemon/back/tsubomittob.png b/gfx/pokemon/back/bellignanb.png similarity index 100% rename from gfx/pokemon/back/tsubomittob.png rename to gfx/pokemon/back/bellignanb.png diff --git a/gfx/pokemon/back/cactusb.png b/gfx/pokemon/back/cactormusb.png similarity index 100% rename from gfx/pokemon/back/cactusb.png rename to gfx/pokemon/back/cactormusb.png diff --git a/gfx/pokemon/back/konyab.png b/gfx/pokemon/back/coinpurb.png similarity index 100% rename from gfx/pokemon/back/konyab.png rename to gfx/pokemon/back/coinpurb.png diff --git a/gfx/pokemon/back/taabanb.png b/gfx/pokemon/back/disturbanb.png similarity index 100% rename from gfx/pokemon/back/taabanb.png rename to gfx/pokemon/back/disturbanb.png diff --git a/gfx/pokemon/back/crockyb.png b/gfx/pokemon/back/gavillainb.png similarity index 100% rename from gfx/pokemon/back/crockyb.png rename to gfx/pokemon/back/gavillainb.png diff --git a/gfx/pokemon/back/gyaoonb.png b/gfx/pokemon/back/gawarhedb.png similarity index 100% rename from gfx/pokemon/back/gyaoonb.png rename to gfx/pokemon/back/gawarhedb.png diff --git a/gfx/pokemon/back/cryithanb.png b/gfx/pokemon/back/iguanarchb.png similarity index 100% rename from gfx/pokemon/back/cryithanb.png rename to gfx/pokemon/back/iguanarchb.png diff --git a/gfx/pokemon/back/puchikoonb.png b/gfx/pokemon/back/koltab.png similarity index 100% rename from gfx/pokemon/back/puchikoonb.png rename to gfx/pokemon/back/koltab.png diff --git a/gfx/pokemon/back/madaamub.png b/gfx/pokemon/back/luxwanb.png similarity index 100% rename from gfx/pokemon/back/madaamub.png rename to gfx/pokemon/back/luxwanb.png diff --git a/gfx/pokemon/back/animonb.png b/gfx/pokemon/back/mimmeob.png similarity index 100% rename from gfx/pokemon/back/animonb.png rename to gfx/pokemon/back/mimmeob.png diff --git a/gfx/pokemon/back/bawliguab.png b/gfx/pokemon/back/ministareb.png similarity index 100% rename from gfx/pokemon/back/bawliguab.png rename to gfx/pokemon/back/ministareb.png diff --git a/gfx/pokemon/back/omegab.png b/gfx/pokemon/back/omegadgeb.png similarity index 100% rename from gfx/pokemon/back/omegab.png rename to gfx/pokemon/back/omegadgeb.png diff --git a/gfx/pokemon/back/gyopinb.png b/gfx/pokemon/back/orfryb.png similarity index 100% rename from gfx/pokemon/back/gyopinb.png rename to gfx/pokemon/back/orfryb.png diff --git a/gfx/pokemon/back/kasanagib.png b/gfx/pokemon/back/pupalb.png similarity index 100% rename from gfx/pokemon/back/kasanagib.png rename to gfx/pokemon/back/pupalb.png diff --git a/gfx/pokemon/back/deerb.png b/gfx/pokemon/back/ramooseb.png similarity index 100% rename from gfx/pokemon/back/deerb.png rename to gfx/pokemon/back/ramooseb.png diff --git a/gfx/pokemon/back/jaggb.png b/gfx/pokemon/back/sharpoonb.png similarity index 100% rename from gfx/pokemon/back/jaggb.png rename to gfx/pokemon/back/sharpoonb.png diff --git a/gfx/pokemon/back/skimperb.png b/gfx/pokemon/back/squeamatab.png similarity index 100% rename from gfx/pokemon/back/skimperb.png rename to gfx/pokemon/back/squeamatab.png diff --git a/gfx/pokemon/back/sylveonb.png b/gfx/pokemon/back/sylveonb.png index 6fa9a74f..4d7dc48d 100644 Binary files a/gfx/pokemon/back/sylveonb.png and b/gfx/pokemon/back/sylveonb.png differ diff --git a/gfx/pokemon/back/purakkusub.png b/gfx/pokemon/back/triculesb.png similarity index 100% rename from gfx/pokemon/back/purakkusub.png rename to gfx/pokemon/back/triculesb.png diff --git a/gfx/pokemon/back/mikonb.png b/gfx/pokemon/back/vulpiiib.png similarity index 100% rename from gfx/pokemon/back/mikonb.png rename to gfx/pokemon/back/vulpiiib.png diff --git a/gfx/pokemon/front/barunda.png b/gfx/pokemon/front/balumba.png similarity index 100% rename from gfx/pokemon/front/barunda.png rename to gfx/pokemon/front/balumba.png diff --git a/gfx/pokemon/front/tsubomitto.png b/gfx/pokemon/front/bellignan.png similarity index 100% rename from gfx/pokemon/front/tsubomitto.png rename to gfx/pokemon/front/bellignan.png diff --git a/gfx/pokemon/front/cactus.png b/gfx/pokemon/front/cactormus.png similarity index 100% rename from gfx/pokemon/front/cactus.png rename to gfx/pokemon/front/cactormus.png diff --git a/gfx/pokemon/front/konya.png b/gfx/pokemon/front/coinpur.png similarity index 100% rename from gfx/pokemon/front/konya.png rename to gfx/pokemon/front/coinpur.png diff --git a/gfx/pokemon/front/taaban.png b/gfx/pokemon/front/disturban.png similarity index 100% rename from gfx/pokemon/front/taaban.png rename to gfx/pokemon/front/disturban.png diff --git a/gfx/pokemon/front/crocky.png b/gfx/pokemon/front/gavillain.png similarity index 100% rename from gfx/pokemon/front/crocky.png rename to gfx/pokemon/front/gavillain.png diff --git a/gfx/pokemon/front/gyaoon.png b/gfx/pokemon/front/gawarhed.png similarity index 100% rename from gfx/pokemon/front/gyaoon.png rename to gfx/pokemon/front/gawarhed.png diff --git a/gfx/pokemon/front/cryithan.png b/gfx/pokemon/front/iguanarch.png similarity index 100% rename from gfx/pokemon/front/cryithan.png rename to gfx/pokemon/front/iguanarch.png diff --git a/gfx/pokemon/front/puchikoon.png b/gfx/pokemon/front/kolta.png similarity index 100% rename from gfx/pokemon/front/puchikoon.png rename to gfx/pokemon/front/kolta.png diff --git a/gfx/pokemon/front/madaamu.png b/gfx/pokemon/front/luxwan.png similarity index 100% rename from gfx/pokemon/front/madaamu.png rename to gfx/pokemon/front/luxwan.png diff --git a/gfx/pokemon/front/magnezone.png b/gfx/pokemon/front/magnezone.png index a669779f..fce20c39 100644 Binary files a/gfx/pokemon/front/magnezone.png and b/gfx/pokemon/front/magnezone.png differ diff --git a/gfx/pokemon/front/marowaka.png b/gfx/pokemon/front/marowaka.png index 294b639d..d5b69fb7 100644 Binary files a/gfx/pokemon/front/marowaka.png and b/gfx/pokemon/front/marowaka.png differ diff --git a/gfx/pokemon/front/animon.png b/gfx/pokemon/front/mimmeo.png similarity index 100% rename from gfx/pokemon/front/animon.png rename to gfx/pokemon/front/mimmeo.png diff --git a/gfx/pokemon/front/bawligua.png b/gfx/pokemon/front/ministare.png similarity index 100% rename from gfx/pokemon/front/bawligua.png rename to gfx/pokemon/front/ministare.png diff --git a/gfx/pokemon/front/muka.png b/gfx/pokemon/front/muka.png index e783eff8..d9e94f06 100644 Binary files a/gfx/pokemon/front/muka.png and b/gfx/pokemon/front/muka.png differ diff --git a/gfx/pokemon/front/omega.png b/gfx/pokemon/front/omegadge.png similarity index 100% rename from gfx/pokemon/front/omega.png rename to gfx/pokemon/front/omegadge.png diff --git a/gfx/pokemon/front/gyopin.png b/gfx/pokemon/front/orfry.png similarity index 100% rename from gfx/pokemon/front/gyopin.png rename to gfx/pokemon/front/orfry.png diff --git a/gfx/pokemon/front/kasanagi.png b/gfx/pokemon/front/pupal.png similarity index 100% rename from gfx/pokemon/front/kasanagi.png rename to gfx/pokemon/front/pupal.png diff --git a/gfx/pokemon/front/deer.png b/gfx/pokemon/front/ramoose.png similarity index 100% rename from gfx/pokemon/front/deer.png rename to gfx/pokemon/front/ramoose.png diff --git a/gfx/pokemon/front/jagg.png b/gfx/pokemon/front/sharpoon.png similarity index 100% rename from gfx/pokemon/front/jagg.png rename to gfx/pokemon/front/sharpoon.png diff --git a/gfx/pokemon/front/skimper.png b/gfx/pokemon/front/squeamata.png similarity index 100% rename from gfx/pokemon/front/skimper.png rename to gfx/pokemon/front/squeamata.png diff --git a/gfx/pokemon/front/purakkusu.png b/gfx/pokemon/front/tricules.png similarity index 100% rename from gfx/pokemon/front/purakkusu.png rename to gfx/pokemon/front/tricules.png diff --git a/gfx/pokemon/front/mikon.png b/gfx/pokemon/front/vulpiii.png similarity index 100% rename from gfx/pokemon/front/mikon.png rename to gfx/pokemon/front/vulpiii.png diff --git a/gfx/pokemon/front/weezingg.png b/gfx/pokemon/front/weezingg.png index 5bf410f7..8c20c42b 100644 Binary files a/gfx/pokemon/front/weezingg.png and b/gfx/pokemon/front/weezingg.png differ diff --git a/gfx/pokemon/front/bittybat.png b/gfx/pokemon/unused/bittybat.png similarity index 100% rename from gfx/pokemon/front/bittybat.png rename to gfx/pokemon/unused/bittybat.png diff --git a/gfx/pokemon/back/bittybatb.png b/gfx/pokemon/unused/bittybatb.png similarity index 100% rename from gfx/pokemon/back/bittybatb.png rename to gfx/pokemon/unused/bittybatb.png diff --git a/gfx/pokemon/front/monja.png b/gfx/pokemon/unused/burgela.png similarity index 100% rename from gfx/pokemon/front/monja.png rename to gfx/pokemon/unused/burgela.png diff --git a/gfx/pokemon/unused/hinaazu.png b/gfx/pokemon/unused/dodaerie.png similarity index 100% rename from gfx/pokemon/unused/hinaazu.png rename to gfx/pokemon/unused/dodaerie.png diff --git a/gfx/pokemon/unused/hinaazub.png b/gfx/pokemon/unused/dodaerieb.png similarity index 100% rename from gfx/pokemon/unused/hinaazub.png rename to gfx/pokemon/unused/dodaerieb.png diff --git a/gfx/pokemon/front/magnetite.png b/gfx/pokemon/unused/magnetite.png similarity index 100% rename from gfx/pokemon/front/magnetite.png rename to gfx/pokemon/unused/magnetite.png diff --git a/gfx/pokemon/back/magnetiteb.png b/gfx/pokemon/unused/magnetiteb.png similarity index 100% rename from gfx/pokemon/back/magnetiteb.png rename to gfx/pokemon/unused/magnetiteb.png diff --git a/gfx/pokemon/back/monjab.png b/gfx/pokemon/unused/monjab.png similarity index 100% rename from gfx/pokemon/back/monjab.png rename to gfx/pokemon/unused/monjab.png diff --git a/gfx/pokemon/unused/para.png b/gfx/pokemon/unused/paraspor.png similarity index 100% rename from gfx/pokemon/unused/para.png rename to gfx/pokemon/unused/paraspor.png diff --git a/gfx/pokemon/unused/parab.png b/gfx/pokemon/unused/parasporb.png similarity index 100% rename from gfx/pokemon/unused/parab.png rename to gfx/pokemon/unused/parasporb.png diff --git a/gfx/pokemon/unused/pudi.png b/gfx/pokemon/unused/pupperon.png similarity index 100% rename from gfx/pokemon/unused/pudi.png rename to gfx/pokemon/unused/pupperon.png diff --git a/gfx/pokemon/unused/pudib.png b/gfx/pokemon/unused/pupperonb.png similarity index 100% rename from gfx/pokemon/unused/pudib.png rename to gfx/pokemon/unused/pupperonb.png diff --git a/gfx/pokemon/unused/betobebii.png b/gfx/pokemon/unused/smujj.png similarity index 100% rename from gfx/pokemon/unused/betobebii.png rename to gfx/pokemon/unused/smujj.png diff --git a/gfx/pokemon/unused/betobebiib.png b/gfx/pokemon/unused/smujjb.png similarity index 100% rename from gfx/pokemon/unused/betobebiib.png rename to gfx/pokemon/unused/smujjb.png diff --git a/main.asm b/main.asm index 6b98f261..b8e020d6 100644 --- a/main.asm +++ b/main.asm @@ -362,6 +362,7 @@ SECTION "Engine Spillover", ROMX INCLUDE "engine/menus/item_descriptions.asm" INCLUDE "engine/items/tm_prices.asm" +INCLUDE "engine/overworld/ferry_script.asm" _PartyMenuBattleTentText:: text "Select which" diff --git a/maps.asm b/maps.asm index 1a6047e5..5e5cd9dd 100644 --- a/maps.asm +++ b/maps.asm @@ -55,20 +55,20 @@ INCLUDE "scripts/IndigoPlateauLobby.asm" INCLUDE "data/maps/objects/IndigoPlateauLobby.asm" IndigoPlateauLobby_Blocks: INCBIN "maps/IndigoPlateauLobby.blk" -INCLUDE "data/maps/headers/SilphCo4F.asm" -INCLUDE "scripts/SilphCo4F.asm" -INCLUDE "data/maps/objects/SilphCo4F.asm" -SilphCo4F_Blocks: INCBIN "maps/SilphCo4F.blk" +INCLUDE "data/maps/headers/CitrineFerryDock.asm" +INCLUDE "scripts/CitrineFerryDock.asm" +INCLUDE "data/maps/objects/CitrineFerryDock.asm" +CitrineFerryDock_Blocks: INCBIN "maps/CitrineFerryDock.blk" INCLUDE "data/maps/headers/SilphCo5F.asm" INCLUDE "scripts/SilphCo5F.asm" INCLUDE "data/maps/objects/SilphCo5F.asm" SilphCo5F_Blocks: INCBIN "maps/SilphCo5F.blk" -INCLUDE "data/maps/headers/SilphCo6F.asm" -INCLUDE "scripts/SilphCo6F.asm" -INCLUDE "data/maps/objects/SilphCo6F.asm" -SilphCo6F_Blocks: INCBIN "maps/SilphCo6F.blk" +INCLUDE "data/maps/headers/VermilionFerryDock.asm" +INCLUDE "scripts/VermilionFerryDock.asm" +INCLUDE "data/maps/objects/VermilionFerryDock.asm" +VermilionFerryDock_Blocks: INCBIN "maps/VermilionFerryDock.blk" SECTION "Maps 3", ROMX @@ -779,10 +779,10 @@ INCLUDE "scripts/PokemonFanClub.asm" INCLUDE "data/maps/objects/PokemonFanClub.asm" PokemonFanClub_Blocks: INCBIN "maps/PokemonFanClub.blk" -INCLUDE "data/maps/headers/SilphCo2F.asm" -INCLUDE "scripts/SilphCo2F.asm" -INCLUDE "data/maps/objects/SilphCo2F.asm" -SilphCo2F_Blocks: INCBIN "maps/SilphCo2F.blk" +INCLUDE "data/maps/headers/SeagallopFerry.asm" +INCLUDE "scripts/SeagallopFerry.asm" +INCLUDE "data/maps/objects/SeagallopFerry.asm" +SeagallopFerry_Blocks: INCBIN "maps/SeagallopFerry.blk" INCLUDE "data/maps/headers/SilphCo3F.asm" INCLUDE "scripts/SilphCo3F.asm" diff --git a/maps/CitrineCity.blk b/maps/CitrineCity.blk index d5c72d81..a2dcdf0c 100644 --- a/maps/CitrineCity.blk +++ b/maps/CitrineCity.blk @@ -22,24 +22,18 @@ eXB-@ACGFCEFB-DGFCEFcCF-@AA -BbAAB--@AC? -BACEF--DGF@AAABAB----@AB@CG?CFCF-c--@AB@BA@BEF---<=@aF@BA@B-----@@BADFADF--c--@DFEEEEGF-----@'Y&----c-DE \ No newline at end of file +@BB@BB@BB@BZB@BUZXB@BZ_BDFUUB(FUbCF-@C_bAAB--@B_ACEF--@B<>AB----@BADFEF-l--@BDE?CF----<=@ANA@CGF-----@DEFADFAB--k--@-DEEEEGF-----@-pYk--k-DE \ No newline at end of file diff --git a/maps/SeagallopFerry.blk b/maps/SeagallopFerry.blk new file mode 100644 index 00000000..c0902e2c --- /dev/null +++ b/maps/SeagallopFerry.blk @@ -0,0 +1 @@ +$$ "  \ No newline at end of file diff --git a/maps/SilphGauntlet6F.blk b/maps/SilphGauntlet6F.blk index b383d9cc..125b7179 100644 --- a/maps/SilphGauntlet6F.blk +++ b/maps/SilphGauntlet6F.blk @@ -1 +1 @@ -@AAB@aaB@aaBD!qpqpFDSRSRFHIIJHIIJHwEJ@aaB@aaB@*+BDqp/F\]DSRF\]PwEJHIIJHwEJ@*+B@aaB@*+B\qpqp]\SRSR]HIIJHIIJHIIJ \ No newline at end of file +@AAB@AABD!qAeeApuvFDSRFHIIJIIIIHWJddfdE@*gdfdED/dfHWHIIHXJDGD9 4D99 D7pp HIII33IIIJ \ No newline at end of file diff --git a/maps/VermilionCity.blk b/maps/VermilionCity.blk index 07a49252..63dfb541 100644 --- a/maps/VermilionCity.blk +++ b/maps/VermilionCity.blk @@ -1 +1 @@ -CCC ! ! !1 !11111111Ckk7~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV21|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxTxxCCCkkkTkTkTkkkCCCCCCCCCCCCTCCCCCCCCCCCTCCCTCCCTCCCCCC \ No newline at end of file +CCC ! ! !1 !11111111Ckk7~|r7~17~wVwww111Cd1111111111111111C-111111111IH111CCC-111111DE111CCC !C !11 !111111Cd|~1|~11|swwwwVwCd1111111111111111Cd1 1111 !TCdV21|~edTeCCCCd11111ed111e-T.CCCCd11111e-.CTCdC-.CCCCCCTCdCCCCTTTTTTTTTTTC-gCCCCTxxxTxxxxxxCCCkkkTkTkkkkkkkCCCCCCCCCCCCCCCCCCCCCCCCCCCTCCCCCCCCCC \ No newline at end of file diff --git a/maps/VermilionFerryDock.blk b/maps/VermilionFerryDock.blk new file mode 100644 index 00000000..f4a95739 --- /dev/null +++ b/maps/VermilionFerryDock.blk @@ -0,0 +1,2 @@ +      +    \ No newline at end of file diff --git a/scripts/BrunswickTrail.asm b/scripts/BrunswickTrail.asm index 7ff55b29..8b182408 100644 --- a/scripts/BrunswickTrail.asm +++ b/scripts/BrunswickTrail.asm @@ -144,7 +144,7 @@ FakeTreeEvent: CactusBattleText: text_far _FakeTreeAttack text_asm - ld a, CACTUS + ld a, CACTORMUS call PlayCry call WaitForSoundToFinish jp TextScriptEnd diff --git a/scripts/CinnabarLabFossilRoom.asm b/scripts/CinnabarLabFossilRoom.asm index 17ca0eb2..8b1db068 100644 --- a/scripts/CinnabarLabFossilRoom.asm +++ b/scripts/CinnabarLabFossilRoom.asm @@ -101,7 +101,7 @@ Lab4Text_75dd5: Lab4Text2: text_asm - ld a, TRADE_FOR_JIMBO + ld a, TRADE_FOR_MICHELLE ld [wWhichTrade], a predef DoInGameTradeDialogue jp TextScriptEnd diff --git a/scripts/CitrineFerryDock.asm b/scripts/CitrineFerryDock.asm new file mode 100644 index 00000000..d8a62c42 --- /dev/null +++ b/scripts/CitrineFerryDock.asm @@ -0,0 +1,6 @@ +CitrineFerryDock_Script: + jp EnableAutoTextBoxDrawing + +CitrineFerryDock_TextPointers: + + text_end \ No newline at end of file diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm index 250fc99f..f9f2e590 100644 --- a/scripts/DiglettsCave.asm +++ b/scripts/DiglettsCave.asm @@ -1,36 +1,6 @@ DiglettsCave_Script: - call EnableAutoTextBoxDrawing - ld hl, DiglettsCaveTrainerHeaders - ld de, DiglettsCave_ScriptPointers - ld a, [wDiglettsCaveCurScript] - call ExecuteCurMapScriptInTable - ld [wDiglettsCaveCurScript], a - ret - -DiglettsCave_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + jp EnableAutoTextBoxDrawing DiglettsCave_TextPointers: - dw WugtrioText -DiglettsCaveTrainerHeaders: - def_trainers -WugtrioTrainerHeader: - trainer EVENT_BEAT_WUGTRIO, 0, WugtrioBattleText, WugtrioBattleText, WugtrioBattleText - db -1 ; end - -WugtrioText: - text_asm - ld hl, WugtrioTrainerHeader - call TalkToTrainer - jp TextScriptEnd - -WugtrioBattleText: - text_far _WugtrioBattleText - text_asm - ld a, WUGTRIO - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd + text_end ; unused diff --git a/scripts/GiovannisRoom.asm b/scripts/GiovannisRoom.asm index 2ba2e51b..b478e300 100644 --- a/scripts/GiovannisRoom.asm +++ b/scripts/GiovannisRoom.asm @@ -1,16 +1,8 @@ GiovannisRoom_Script: - call EnableAutoTextBoxDrawing - ld hl, GiovannisRoomTrainerHeaders - ld de, RocketHideoutB1F_ScriptPointers - ld a, [wRocketHideoutB1FCurScript] - call ExecuteCurMapScriptInTable - ld [wRocketHideoutB1FCurScript], a - ret + jp EnableAutoTextBoxDrawing GiovannisRoom_ScriptPointers: dw GiovannisRoomScript0 - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle dw GiovannisRoomScript4 GiovannisRoomScript0: @@ -127,13 +119,6 @@ GiovannisRoom_TextPointers: dw GiovannisRoomText4 dw PickUpItemText dw PickUpItemText - dw GiovannisRoomText7 - -GiovannisRoomTrainerHeaders: - def_trainers -GiovannisRoomTrainerHeader0: - trainer EVENT_BEAT_ROCKET_HIDEOUT_1_TRAINER_0, 3, GiovannisRoomBattleText2, GiovannisRoomEndBattleText2, GiovannisRoomAfterBattleTxt2 - db -1 ; end GiovannisRoomText1: text_far _GiovannisRoomText1 @@ -150,21 +135,3 @@ GiovannisRoomText3: GiovannisRoomText4: text_far _GiovannisRoomText4 text_end - -GiovannisRoomText7: - text_asm - ld hl, GiovannisRoomTrainerHeader0 - call TalkToTrainer - jp TextScriptEnd - -GiovannisRoomBattleText2: - text_far _GiovannisRoomBattleText2 - text_end - -GiovannisRoomEndBattleText2: - text_far _GiovannisRoomEndBattleText2 - text_end - -GiovannisRoomAfterBattleTxt2: - text_far _GiovannisRoomAfterBattleTxt2 - text_end \ No newline at end of file diff --git a/scripts/HallOfFame.asm b/scripts/HallOfFame.asm index 9b29c390..78ea665c 100644 --- a/scripts/HallOfFame.asm +++ b/scripts/HallOfFame.asm @@ -164,7 +164,7 @@ ResetLegendaryPokemon: ; Omega is special. ; If Omega wasn't caught, it'll be available in the empty room of Silph Co. 11F. ; In my mind, Omega was sent there, pending eventual scrapping for spare parts. - ld a, DEX_OMEGA + ld a, DEX_OMEGADGE call HoFIsPokemonBitSet jr nz, .skipOmega ResetEvent EVENT_BEAT_OMEGA ; Reusing the old event - it's completely free to use. diff --git a/scripts/SeagallopFerry.asm b/scripts/SeagallopFerry.asm new file mode 100644 index 00000000..4d9149b9 --- /dev/null +++ b/scripts/SeagallopFerry.asm @@ -0,0 +1,47 @@ +; All credit to Mateo's Pokemon Red++ + +SeagallopFerry_Script: ; setup the stuff when you walk inside + ld hl, wCurrentMapScriptFlags + bit 5, [hl] + res 5, [hl] + push hl + call nz, SeagallopFerry_GetLastWarp + pop hl + bit 7, [hl] + res 7, [hl] + call nz, SeagallopFerry_ShakeElevator + xor a + ld [wAutoTextBoxDrawingControl], a + inc a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ret + +SeagallopFerry_GetLastWarp: + ld hl, wWarpEntries + ld a, [wWarpedFromWhichWarp] ; last warped number + ld b, a + ld a, [wWarpedFromWhichMap] ; last warped map + ld c, a + call SeagallopFerry_ApplyWarpData + +SeagallopFerry_ApplyWarpData: + inc hl + inc hl + ld a, b + ld [hli], a + ld a, c + ld [hli], a + ret + +SeagallopFerry_ShakeElevator: + ld b, BANK(ShakeElevatorFerry) + ld hl, ShakeElevatorFerry + jp Bankswitch + +SeagallopFerry_TextPointers: + dw SeagallopFerryText1 + +SeagallopFerryText1: + text_asm + farcall EventIslandsFerryScript + jp TextScriptEnd diff --git a/scripts/SilphCo11F.asm b/scripts/SilphCo11F.asm index c7a43932..26f5d9ab 100644 --- a/scripts/SilphCo11F.asm +++ b/scripts/SilphCo11F.asm @@ -72,7 +72,7 @@ SilphCo11Script_6217b: ld a, $7 ldh [hSpriteIndex], a ; TODO: Make Omega look at the player. call MoveOmegaSprite - ld a, OMEGA + ld a, OMEGADGE ld [wcf91], a call PlayCry ld a, SFX_STOP_ALL_MUSIC @@ -93,7 +93,7 @@ SilphCo11ScriptOmegaBattle: ld a, 11 ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, OMEGA + ld a, OMEGADGE ld [wCurOpponent], a ld a, 40 ld [wCurEnemyLVL], a @@ -165,16 +165,16 @@ MissableObjectIDs_6219b: db HS_SAFFRON_CITY_E db HS_SILPH_CO_3F_1 db HS_SILPH_CO_3F_2 - db HS_SILPH_CO_4F_1 - db HS_SILPH_CO_4F_2 - db HS_SILPH_CO_4F_3 + ;db HS_SILPH_CO_4F_1 + ;db HS_SILPH_CO_4F_2 + ;db HS_SILPH_CO_4F_3 db HS_SILPH_CO_5F_1 db HS_SILPH_CO_5F_2 db HS_SILPH_CO_5F_3 db HS_SILPH_CO_5F_4 - db HS_SILPH_CO_6F_1 - db HS_SILPH_CO_6F_2 - db HS_SILPH_CO_6F_3 + ;db HS_SILPH_CO_6F_1 + ;db HS_SILPH_CO_6F_2 + ;db HS_SILPH_CO_6F_3 db HS_SILPH_CO_7F_1 db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 @@ -630,16 +630,16 @@ SaffronCityRockets: db HS_SAFFRON_CITY_E db HS_SILPH_CO_3F_1 db HS_SILPH_CO_3F_2 - db HS_SILPH_CO_4F_1 - db HS_SILPH_CO_4F_2 - db HS_SILPH_CO_4F_3 + ;db HS_SILPH_CO_4F_1 + ;db HS_SILPH_CO_4F_2 + ;db HS_SILPH_CO_4F_3 db HS_SILPH_CO_5F_1 db HS_SILPH_CO_5F_2 db HS_SILPH_CO_5F_3 db HS_SILPH_CO_5F_4 - db HS_SILPH_CO_6F_1 - db HS_SILPH_CO_6F_2 - db HS_SILPH_CO_6F_3 + ;db HS_SILPH_CO_6F_1 + ;db HS_SILPH_CO_6F_2 + ;db HS_SILPH_CO_6F_3 db HS_SILPH_CO_7F_1 db HS_SILPH_CO_7F_2 db HS_SILPH_CO_7F_3 @@ -802,7 +802,7 @@ Omega2Text: Omega2BattleText: text_far _OmegaBattleText text_asm - ld a, OMEGA + ld a, OMEGADGE call PlayCry call WaitForSoundToFinish jp TextScriptEnd diff --git a/scripts/SilphCo3F.asm b/scripts/SilphCo3F.asm index eb92dd78..f8cc0504 100644 --- a/scripts/SilphCo3F.asm +++ b/scripts/SilphCo3F.asm @@ -37,6 +37,42 @@ SilphCo3GateCoords: dbmapcoord 8, 4 db -1 ; end +SilphCo2Script_59d43: + push hl + ld hl, wCardKeyDoorY + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + xor a + ldh [hUnlockedSilphCoDoors], a + pop hl +.asm_59d4f + ld a, [hli] + cp $ff + jr z, .asm_59d6b + push hl + ld hl, hUnlockedSilphCoDoors + inc [hl] + pop hl + cp b + jr z, .asm_59d60 + inc hl + jr .asm_59d4f +.asm_59d60 + ld a, [hli] + cp c + jr nz, .asm_59d4f + ld hl, wCardKeyDoorY + xor a + ld [hli], a + ld [hl], a + ret +.asm_59d6b + xor a + ldh [hUnlockedSilphCoDoors], a + ret + SilphCo3Script_59fad: EventFlagAddress hl, EVENT_SILPH_CO_3_UNLOCKED_DOOR1 ldh a, [hUnlockedSilphCoDoors] diff --git a/scripts/SilphCo5F.asm b/scripts/SilphCo5F.asm index 58b64ba2..6106a723 100644 --- a/scripts/SilphCo5F.asm +++ b/scripts/SilphCo5F.asm @@ -47,6 +47,42 @@ SilphCo5GateCoords: dbmapcoord 7, 5 db -1 ; end +SilphCo4Script_19d5d: + push hl + ld hl, wCardKeyDoorY + ld a, [hli] + ld b, a + ld a, [hl] + ld c, a + xor a + ldh [hUnlockedSilphCoDoors], a + pop hl +.asm_19d69 + ld a, [hli] + cp $ff + jr z, .asm_19d85 + push hl + ld hl, hUnlockedSilphCoDoors + inc [hl] + pop hl + cp b + jr z, .asm_19d7a + inc hl + jr .asm_19d69 +.asm_19d7a + ld a, [hli] + cp c + jr nz, .asm_19d69 + ld hl, wCardKeyDoorY + xor a + ld [hli], a + ld [hl], a + ret +.asm_19d85 + xor a + ldh [hUnlockedSilphCoDoors], a + ret + SilphCo5Script_19f9e: EventFlagAddress hl, EVENT_SILPH_CO_5_UNLOCKED_DOOR1 ldh a, [hUnlockedSilphCoDoors] @@ -95,6 +131,16 @@ SilphCo5TrainerHeader3: trainer EVENT_BEAT_SILPH_CO_5F_TRAINER_3, 3, SilphCo5BattleText5, SilphCo5EndBattleText5, SilphCo5AfterBattleText5 db -1 ; end +SilphCo6Script_1a22f: + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + jr nz, .asm_1a238 + jr .asm_1a23a +.asm_1a238 + ld h, d + ld l, e +.asm_1a23a + jp PrintText + SilphCo5Text1: text_asm ld hl, SilphCo5Text_1a010 diff --git a/scripts/SilphCoElevator.asm b/scripts/SilphCoElevator.asm index 30323295..9922c4e8 100644 --- a/scripts/SilphCoElevator.asm +++ b/scripts/SilphCoElevator.asm @@ -59,11 +59,11 @@ SilphCoElevatorFloors: SilphCoElevatorWarpMaps: ; warp number, map id db 3, SILPH_CO_1F - db 2, SILPH_CO_2F + ;db 2, SILPH_CO_2F db 2, SILPH_CO_3F - db 2, SILPH_CO_4F + ;db 2, SILPH_CO_4F db 2, SILPH_CO_5F - db 2, SILPH_CO_6F + ;db 2, SILPH_CO_6F db 2, SILPH_CO_7F ;db 2, SILPH_CO_8F db 2, SILPH_CO_9F diff --git a/scripts/SilphGauntlet2F.asm b/scripts/SilphGauntlet2F.asm index d00424c7..48e9ed8a 100644 --- a/scripts/SilphGauntlet2F.asm +++ b/scripts/SilphGauntlet2F.asm @@ -21,17 +21,17 @@ SilphGauntlet2F_TextPointers: dw SilphGauntlet2FText6 SilphGauntlet2FTrainerHeaders: - def_trainers 7 + def_trainers SilphGauntlet2FTrainerHeader0: trainer EVENT_BEAT_GAUNTLET_LASS, 2, SilphGauntlet2FBattleText1, SilphGauntlet2FEndBattleText1, SilphGauntlet2FAfterBattleText1 SilphGauntlet2FTrainerHeader1: - trainer EVENT_BEAT_GAUNTLET_JUNIOR, 1, SilphGauntlet2FBattleText2, SilphGauntlet2FEndBattleText2, SilphGauntlet2FAfterBattleText2 + trainer EVENT_BEAT_GAUNTLET_HIKER, 1, SilphGauntlet2FBattleText2, SilphGauntlet2FEndBattleText2, SilphGauntlet2FAfterBattleText2 SilphGauntlet2FTrainerHeader2: - trainer EVENT_BEAT_GAUNTLET_HIKER, 1, SilphGauntlet2FBattleText3, SilphGauntlet2FEndBattleText3, SilphGauntlet2FAfterBattleText3 + trainer EVENT_BEAT_GAUNTLET_SUPER_NERD, 1, SilphGauntlet2FBattleText3, SilphGauntlet2FEndBattleText3, SilphGauntlet2FAfterBattleText3 SilphGauntlet2FTrainerHeader3: - trainer EVENT_BEAT_GAUNTLET_SUPER_NERD, 1, SilphGauntlet2FBattleText4, SilphGauntlet2FEndBattleText4, SilphGauntlet2FAfterBattleText4 + trainer EVENT_BEAT_GAUNTLET_POKEMANIAC, 1, SilphGauntlet2FBattleText4, SilphGauntlet2FEndBattleText4, SilphGauntlet2FAfterBattleText4 SilphGauntlet2FTrainerHeader4: - trainer EVENT_BEAT_GAUNTLET_POKEMANIAC, 3, SilphGauntlet2FBattleText5, SilphGauntlet2FEndBattleText5, SilphGauntlet2FAfterBattleText5 + trainer EVENT_BEAT_GAUNTLET_BEAUTY, 3, SilphGauntlet2FBattleText5, SilphGauntlet2FEndBattleText5, SilphGauntlet2FAfterBattleText5 SilphGauntlet2FTrainerHeader5: trainer EVENT_BEAT_GAUNTLET_BLACK_BELT, 1, SilphGauntlet2FBattleText6, SilphGauntlet2FEndBattleText6, SilphGauntlet2FAfterBattleText6 db -1 ; end diff --git a/scripts/SilphGauntlet3F.asm b/scripts/SilphGauntlet3F.asm index 96d023e8..fc659715 100644 --- a/scripts/SilphGauntlet3F.asm +++ b/scripts/SilphGauntlet3F.asm @@ -19,10 +19,9 @@ SilphGauntlet3F_TextPointers: dw SilphGauntlet3FText4 dw SilphGauntlet3FText5 dw SilphGauntlet3FText6 - dw SilphGauntlet3FText7 SilphGauntlet3FTrainerHeaders: - def_trainers 5 + def_trainers SilphGauntlet3FTrainerHeader0: trainer EVENT_BEAT_GAUNTLET_SAILOR, 1, SilphGauntlet3FBattleText1, SilphGauntlet3FEndBattleText1, SilphGauntlet3FAfterBattleText1 SilphGauntlet3FTrainerHeader1: @@ -35,8 +34,6 @@ SilphGauntlet3FTrainerHeader4: trainer EVENT_BEAT_GAUNTLET_ROCKER, 1, SilphGauntlet3FBattleText5, SilphGauntlet3FEndBattleText5, SilphGauntlet3FAfterBattleText5 SilphGauntlet3FTrainerHeader5: trainer EVENT_BEAT_GAUNTLET_FISHER, 2, SilphGauntlet3FBattleText6, SilphGauntlet3FEndBattleText6, SilphGauntlet3FAfterBattleText6 -SilphGauntlet3FTrainerHeader6: - trainer EVENT_BEAT_GAUNTLET_BEAUTY, 3, SilphGauntlet3FBattleText7, SilphGauntlet3FEndBattleText7, SilphGauntlet3FAfterBattleText7 db -1 ; end SilphGauntlet3FText1: @@ -146,23 +143,5 @@ SilphGauntlet3FEndBattleText6: SilphGauntlet3FAfterBattleText6: text_far _SilphGauntlet3FAfterBattleText6 text_end - -SilphGauntlet3FText7: - text_asm - ld hl, SilphGauntlet3FTrainerHeader6 - call TalkToTrainer - jp TextScriptEnd - -SilphGauntlet3FBattleText7: - text_far _SilphGauntlet3FBattleText7 - text_end - -SilphGauntlet3FEndBattleText7: - text_far _SilphGauntlet3FEndBattleText7 - text_end - -SilphGauntlet3FAfterBattleText7: - text_far _SilphGauntlet3FAfterBattleText7 - text_end text_end \ No newline at end of file diff --git a/scripts/SilphGauntlet4F.asm b/scripts/SilphGauntlet4F.asm index 6305ed3d..f29fddae 100644 --- a/scripts/SilphGauntlet4F.asm +++ b/scripts/SilphGauntlet4F.asm @@ -58,7 +58,7 @@ SilphGauntlet4F_TextPointers: dw PurifiedZoneText SilphGauntlet4FTrainerHeaders: - def_trainers 4 + def_trainers SilphGauntlet4FTrainerHeader0: trainer EVENT_BEAT_GAUNTLET_SCIENTIST, 1, SilphGauntlet4FBattleText1, SilphGauntlet4FEndBattleText1, SilphGauntlet4FAfterBattleText1 SilphGauntlet4FTrainerHeader1: diff --git a/scripts/SilphGauntlet5F.asm b/scripts/SilphGauntlet5F.asm index 0da6f35e..93e3dc98 100644 --- a/scripts/SilphGauntlet5F.asm +++ b/scripts/SilphGauntlet5F.asm @@ -22,7 +22,7 @@ SilphGauntlet5F_TextPointers: dw SilphGauntlet5FText7 SilphGauntlet5FTrainerHeaders: - def_trainers 2 + def_trainers SilphGauntlet5FTrainerHeader0: trainer EVENT_BEAT_GAUNTLET_JUGGLER, 3, SilphGauntlet5FBattleText1, SilphGauntlet5FEndBattleText1, SilphGauntlet5FAfterBattleText1 SilphGauntlet5FTrainerHeader1: diff --git a/scripts/SilphGauntlet6F.asm b/scripts/SilphGauntlet6F.asm index 683c89e3..7504cffa 100644 --- a/scripts/SilphGauntlet6F.asm +++ b/scripts/SilphGauntlet6F.asm @@ -1,6 +1,168 @@ SilphGauntlet6F_Script: - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ld hl, SilphGauntlet6FTrainerHeaders + ld de, SilphGauntlet6F_ScriptPointers + ld a, [wSilphGauntlet6FCurScript] + call ExecuteCurMapScriptInTable + ld [wSilphGauntlet6FCurScript], a + ret + +SilphGauntlet6F_ScriptPointers: + dw CheckFightingMapTrainers + dw DisplayEnemyTrainerTextAndStartBattle + dw EndTrainerBattle SilphGauntlet6F_TextPointers: + dw SilphGauntlet6FText1 + dw SilphGauntlet6FText2 + dw SilphGauntlet6FText3 + dw SilphGauntlet6FText4 + dw SilphGauntlet6FText5 + dw SilphGauntlet6FText6 + dw SilphGauntlet6FText7 + +SilphGauntlet6FTrainerHeaders: + def_trainers +SilphGauntlet6FTrainerHeader0: + trainer EVENT_BEAT_GAUNTLET_BROCK, 2, SilphGauntlet6FBattleText1, SilphGauntlet6FEndBattleText1, SilphGauntlet6FAfterBattleText1 +SilphGauntlet6FTrainerHeader1: + trainer EVENT_BEAT_GAUNTLET_MISTY, 3, SilphGauntlet6FBattleText2, SilphGauntlet6FEndBattleText2, SilphGauntlet6FAfterBattleText2 +SilphGauntlet6FTrainerHeader2: + trainer EVENT_BEAT_GAUNTLET_SURGE, 3, SilphGauntlet6FBattleText3, SilphGauntlet6FEndBattleText3, SilphGauntlet6FAfterBattleText3 +SilphGauntlet6FTrainerHeader3: + trainer EVENT_BEAT_GAUNTLET_ERIKA, 3, SilphGauntlet6FBattleText4, SilphGauntlet6FEndBattleText4, SilphGauntlet6FAfterBattleText4 +SilphGauntlet6FTrainerHeader4: + trainer EVENT_BEAT_GAUNTLET_KOGA, 3, SilphGauntlet6FBattleText5, SilphGauntlet6FEndBattleText5, SilphGauntlet6FAfterBattleText5 +SilphGauntlet6FTrainerHeader5: + trainer EVENT_BEAT_GAUNTLET_SABRINA, 2, SilphGauntlet6FBattleText6, SilphGauntlet6FEndBattleText6, SilphGauntlet6FAfterBattleText6 +SilphGauntlet6FTrainerHeader6: + trainer EVENT_BEAT_GAUNTLET_BLAINE, 2, SilphGauntlet6FBattleText7, SilphGauntlet6FEndBattleText7, SilphGauntlet6FAfterBattleText7 + db -1 ; end + +SilphGauntlet6FText1: + text_asm + ld hl, SilphGauntlet6FTrainerHeader0 + call TalkToTrainer + jp TextScriptEnd + +SilphGauntlet6FBattleText1: + text_far _SilphGauntlet6FBattleText1 + text_end + +SilphGauntlet6FEndBattleText1: + text_far _SilphGauntlet6FEndBattleText1 + text_end + +SilphGauntlet6FAfterBattleText1: + text_far _SilphGauntlet6FAfterBattleText1 + text_end + +SilphGauntlet6FText2: + text_asm + ld hl, SilphGauntlet6FTrainerHeader1 + call TalkToTrainer + jp TextScriptEnd + +SilphGauntlet6FBattleText2: + text_far _SilphGauntlet6FBattleText2 + text_end + +SilphGauntlet6FEndBattleText2: + text_far _SilphGauntlet6FEndBattleText2 + text_end + +SilphGauntlet6FAfterBattleText2: + text_far _SilphGauntlet6FAfterBattleText2 + text_end + +SilphGauntlet6FText3: + text_asm + ld hl, SilphGauntlet6FTrainerHeader2 + call TalkToTrainer + jp TextScriptEnd + +SilphGauntlet6FBattleText3: + text_far _SilphGauntlet6FBattleText3 + text_end + +SilphGauntlet6FEndBattleText3: + text_far _SilphGauntlet6FEndBattleText3 + text_end + +SilphGauntlet6FAfterBattleText3: + text_far _SilphGauntlet6FAfterBattleText3 + text_end + +SilphGauntlet6FText4: + text_asm + ld hl, SilphGauntlet6FTrainerHeader3 + call TalkToTrainer + jp TextScriptEnd + +SilphGauntlet6FBattleText4: + text_far _SilphGauntlet6FBattleText4 + text_end + +SilphGauntlet6FEndBattleText4: + text_far _SilphGauntlet6FEndBattleText4 + text_end + +SilphGauntlet6FAfterBattleText4: + text_far _SilphGauntlet6FAfterBattleText4 + text_end + +SilphGauntlet6FText5: + text_asm + ld hl, SilphGauntlet6FTrainerHeader4 + call TalkToTrainer + jp TextScriptEnd + +SilphGauntlet6FBattleText5: + text_far _SilphGauntlet6FBattleText5 + text_end + +SilphGauntlet6FEndBattleText5: + text_far _SilphGauntlet6FEndBattleText5 + text_end + +SilphGauntlet6FAfterBattleText5: + text_far _SilphGauntlet6FAfterBattleText5 + text_end + +SilphGauntlet6FText6: + text_asm + ld hl, SilphGauntlet6FTrainerHeader5 + call TalkToTrainer + jp TextScriptEnd + +SilphGauntlet6FBattleText6: + text_far _SilphGauntlet6FBattleText6 + text_end + +SilphGauntlet6FEndBattleText6: + text_far _SilphGauntlet6FEndBattleText6 + text_end + +SilphGauntlet6FAfterBattleText6: + text_far _SilphGauntlet6FAfterBattleText6 + text_end + +SilphGauntlet6FText7: + text_asm + ld hl, SilphGauntlet6FTrainerHeader6 + call TalkToTrainer + jp TextScriptEnd + +SilphGauntlet6FBattleText7: + text_far _SilphGauntlet6FBattleText7 + text_end + +SilphGauntlet6FEndBattleText7: + text_far _SilphGauntlet6FEndBattleText7 + text_end + +SilphGauntlet6FAfterBattleText7: + text_far _SilphGauntlet6FAfterBattleText7 + text_end text_end \ No newline at end of file diff --git a/scripts/SilphGauntlet7F.asm b/scripts/SilphGauntlet7F.asm index 57739ae7..e6e86aba 100644 --- a/scripts/SilphGauntlet7F.asm +++ b/scripts/SilphGauntlet7F.asm @@ -95,6 +95,7 @@ ChiefScript4: ld a, HS_CERULEAN_CAVE_GUY ld [wMissableObjectIndex], a predef HideObject + ; ResetEventRange SILPH_GAUNTLET_EVENTS_START, SILPH_GAUNTLET_EVENTS_END, 1 ; I want this to reset the trainers so you can refight them, but I'm very unsure how this works... ld a, $0 ld [wSilphGauntlet7FCurScript], a diff --git a/scripts/VermilionCity.asm b/scripts/VermilionCity.asm index 4939c967..7edbbcab 100644 --- a/scripts/VermilionCity.asm +++ b/scripts/VermilionCity.asm @@ -50,19 +50,11 @@ VermilionCityScript0: ld a, $3 ldh [hSpriteIndexOrTextID], a call DisplayTextID - ld a, [wObtainedBadges] ; ship returns after obtaining the marsh badge - bit 5, a + CheckEvent EVENT_BEAT_SABRINA jr nz, .default CheckEvent EVENT_SS_ANNE_LEFT jr nz, .shipHasDeparted .default - ld hl, OldSeaMapCheckCoords - call ArePlayerCoordsInArray - jp c, MovePlayerVermilion - ld hl, CitrineCityCheckCoords - call ArePlayerCoordsInArray - jp c, MovePlayerVermilion - ld b, S_S_TICKET predef GetQuantityOfItemInBag ld a, b @@ -78,22 +70,10 @@ VermilionCityScript0: ld [wVermilionCityCurScript], a ret -SSAnneTicketCheckCoords: ; Mother coords - use to universally trigger the same event - dbmapcoord 18, 30 ; S. S. Anne - dbmapcoord 10, 30 ; Faraway Island - dbmapcoord 26, 30 ; Citrine City +SSAnneTicketCheckCoords: + dbmapcoord 18, 30 db -1 ; end -; I know it looks awful but I use the individual ones to launch off the new ticket script. -; We don't need an S.S. Anne one, as I'm using a process of elimination check system. -OldSeaMapCheckCoords: - dbmapcoord 10, 30 - db -1 - -CitrineCityCheckCoords: - dbmapcoord 26, 30 - db -1 - VermilionCityScript4: ld hl, SSAnneTicketCheckCoords call ArePlayerCoordsInArray @@ -136,7 +116,6 @@ VermilionCityScript1: ld [wVermilionCityCurScript], a ret -; We call these four commands to stop text from autoskipping 4 times, may as well just make this. TheAutoskipStopinator: ld a, [wSimulatedJoypadStatesEnd] ; ensuring that the text doesn't autoskip. and a ; yep, here too. @@ -144,179 +123,6 @@ TheAutoskipStopinator: call EnableAutoTextBoxDrawing ; and here. ret -; So get this: If you check multiple tickets, there's a really janky crash. -; I can't be fucked fixing it, so let's force the player through the warp instead. -; Yes, I'm serious. -MovePlayerVermilion: - ld a, PLAYER_DIR_DOWN - ld [wPlayerMovingDirection], a - call UpdateSprites - ld a, $ff ; Firstly... - ld [wJoyIgnore], a ; No joypad inputs. No funny business. RLE is weird as fuck without it. - ld hl, wSimulatedJoypadStatesEnd - ld de, WalkIntoWarp_RLEMovement - call DecodeRLEList - dec a - ld [wSimulatedJoypadStatesIndex], a - call StartSimulatingJoypadStates ; By this point, we're auto-moving. - ld a, $0 - ld [wVermilionCityCurScript], a ; safety - ret - -WalkIntoWarp_RLEMovement: - db D_DOWN, 2 - db -1 ; end - -; ================================================================ -; THIS IS NO LONGER USED, KEPT IN CASE A BETTER WARP SYSTEM COMES UP. -; Alright, so I'll explain the issue. -; For some reason, all the warp methods that exist do not seem to like this system. -; Faraway Island would load but have botched collision and break when you leave. -; Citrine City would outright crash. -; Bank movements and stuff were tried but nothing seemed to work as desired. -; Instead, we use a triple-harbour method, which makes the city look more lively anyway. - -;VermillionCityScript_GetPassesInBag: -; Gets a list of Passes in the player's bag. -; Ripped and modified from the fossil guy -; xor a -; ld [wFilteredBagItemsCount], a -; ld de, wFilteredBagItems -; ld hl, PassList -;.loop -; ld a, [hli] -; and a -; jr z, .done -; push hl -; push de -; ld [wd11e], a -; ld b, a -; predef GetQuantityOfItemInBag -; pop de -; pop hl -; ld a, b -; and a -; jr z, .loop - -; ; A Pass is in the bag -; ld a, [wd11e] -; ld [de], a -; inc de -; push hl -; ld hl, wFilteredBagItemsCount -; inc [hl] -; pop hl -; jr .loop -;.done -; ld a, $ff -; ld [de], a -; ret - -;PassList: -; db S_S_TICKET -; db OLD_SEA_MAP -; db CITRINE_PASS -; ;db RAINBOW_PASS I planned this for a while, but the space wasn't there, and the scope was strange. -; db 0 ; end - -;PrintPassesInBag: -; Prints each pass in the player's bag on a separate line in the menu. -; ld hl, wFilteredBagItems -; xor a -; ldh [hItemCounter], a -;.loop -; ld a, [hli] -; cp $ff -; ret z -; push hl -; ld [wd11e], a -; call GetItemName -; hlcoord 2, 2 -; ldh a, [hItemCounter] -; ld bc, SCREEN_WIDTH * 2 -; call AddNTimes -; ld de, wcd6d -; call PlaceString -; ld hl, hItemCounter -; inc [hl] -; pop hl -; jr .loop - -;PassListings: -; ld hl, VermillionCityPassSelectionText -; call PrintText -; call VermillionCityScript_GetPassesInBag -; ld hl, wd730 -; set 6, [hl] -; xor a -; ld [wCurrentMenuItem], a -; ld a, A_BUTTON | B_BUTTON -; ld [wMenuWatchedKeys], a -; ld a, [wFilteredBagItemsCount] -; dec a -; ld [wMaxMenuItem], a -; ld a, 2 -; ld [wTopMenuItemY], a -; ld a, 1 -; ld [wTopMenuItemX], a -; ld a, [wFilteredBagItemsCount] -; dec a -; ld bc, 2 -; ld hl, 3 -; call AddNTimes -; dec l -; ld b, l -; ld c, $d -; hlcoord 0, 0 -; call TextBoxBorder -; call UpdateSprites -; call PrintPassesInBag -; ld hl, wd730 -; res 6, [hl] -; call HandleMenuInput -; bit BIT_B_BUTTON, a -; jr nz, .cancelledPass -; ld hl, wFilteredBagItems -; ld a, [wCurrentMenuItem] -; ld d, 0 -; ld e, a -; add hl, de -; ld a, [hl] -; ldh [hItemToRemoveID], a -; cp S_S_TICKET -; jp z, VermilionCityText3.playerHasTicket ; Saves time and less risk of bugs -; cp OLD_SEA_MAP -; jr z, .choseFaraway -; cp CITRINE_PASS -; jr z, .choseCitrine -; god bless the safari game and pokemon tower 7f for being the few times a forcewarp exists -; For some reason, these aren't working properly... -;.choseFaraway -; ld hl, EventVermillionCityOldSeaMap -; call PrintText -; ld a, FARAWAY_ISLAND_OUTSIDE -; ld [wDestinationMap], a -; ld hl, wd732 -; set 2, [hl] ; fly warp or dungeon warp -; call SpecialWarpIn -; jp SpecialEnterMap -;.choseCitrine -; ld hl, EventVermillionCityCitrinePass -; call PrintText -; ld a, CITRINE_CITY -; ldh [hWarpDestinationMap], a -; ld a, $6 -; ld [wDestinationWarpID], a -; call WarpFound2 -; jr .done -;.cancelledPass -; ld hl, PassRefuse -; call PrintText -;.done -; ret -; -; ================================================================ - VermilionCity_TextPointers: dw VermilionCityText1 dw VermilionCityText2 @@ -326,8 +132,6 @@ VermilionCity_TextPointers: dw VermilionCityText6 dw OfficerJennySquirtle dw VermilionBeauty - dw EventVermillionCityOldSeaMapGreeting - dw EventVermillionCityCitrinePassGreeting dw VermilionCityText7 dw VermilionCityText8 dw MartSignText @@ -362,36 +166,8 @@ VermilionCityTextSSAnneDeparted: text_end VermilionCityText3: - text_asm - - ; Checking the location that the script flagged earlier. - ; Instead of using an item checker, this is more effective and easy on memory. - ; Also, it doesn't get cross-threaded if you have multiples of the same thing. I had issues working around that one - I ain't a programmer by trade, unfortunately, I'm a TEFL student. - ; Anyway, the code kicks you to different versions of the same script; I've had them isolated to call text in a way that's easier architecturally. Otherwise, we're checking the item found every time, and I'm 90% sure that nicks a WRAM entry. - ; All in all: Yes, this is suboptimal, but I've been doing this for months. Sue me. - ld hl, OldSeaMapCheckCoords - call ArePlayerCoordsInArray - jr c, HasOldSeaMap - ld hl, CitrineCityCheckCoords - call ArePlayerCoordsInArray - jp c, HasCitrinePass - - ; If you have neither, this will continue as normal, see? - ; This is why we needed the child coords. - - ; Before the coord system, we used this with the unused pass listing code. - ; See where the issues arose? Possibly a neat exercise! - ;ld b, OLD_SEA_MAP - ;predef GetQuantityOfItemInBag - ;ld a, b - ;and a - ;jp nz, PassListings - ;ld b, CITRINE_PASS - ;predef GetQuantityOfItemInBag - ;ld a, b - ;and a - ;jp nz, PassListings - + text_asm + CheckEvent EVENT_SS_ANNE_LEFT jr nz, .shipHasDeparted ld a, [wSpritePlayerStateData1FacingDirection] @@ -428,13 +204,9 @@ VermilionCityText3: .end jp TextScriptEnd -.inFrontOfOrBehindGuardCoords ; This can be all at once don't worry. - dbmapcoord 19, 29 ; in front of guard - S. S. Anne - dbmapcoord 19, 31 ; behind guard - S. S. Anne - dbmapcoord 11, 29 ; Faraway Island - dbmapcoord 11, 31 ; Faraway Island - dbmapcoord 27, 29 ; Citrine City - dbmapcoord 27, 31 ; Citrine City +.inFrontOfOrBehindGuardCoords + dbmapcoord 19, 29 ; in front of guard + dbmapcoord 19, 31 ; behind guard db -1 ; end SSAnneWelcomeText4: @@ -457,93 +229,6 @@ SSAnneNotHereText: text_far _SSAnneNotHereText text_end -HasOldSeaMap: - text_asm - ld a, [wSpritePlayerStateData1FacingDirection] - cp SPRITE_FACING_RIGHT - jr z, .greetPlayer - ld hl, VermilionCityText3.inFrontOfOrBehindGuardCoords - call ArePlayerCoordsInArray - jr nc, .greetPlayerAndCheckTicket -.greetPlayer - ld hl, EventVermillionCityOldSeaMapGreeting - call PrintText - jr .end -.greetPlayerAndCheckTicket - ld hl, EventVermillionCityOldSeaMapGreeting - call PrintText - call TheAutoskipStopinator - ld b, OLD_SEA_MAP - predef GetQuantityOfItemInBag - ld a, b - and a - jr nz, .playerHasTicket - ld hl, EventVermillionCityOldSeaMapGreetCheck - call PrintText - jr .end -.playerHasTicket - ld hl, EventVermillionCityOldSeaMap - call PrintText - ld a, $4 - ld [wVermilionCityCurScript], a -.end - jp TextScriptEnd - -EventVermillionCityOldSeaMapGreeting: - text "I am looking for" - line "a certain map..." - done - text_end - -EventVermillionCityOldSeaMapGreetCheck: - text "Do you have it?" - done - text_end - -HasCitrinePass: - text_asm - ld a, [wSpritePlayerStateData1FacingDirection] - cp SPRITE_FACING_RIGHT - jr z, .greetPlayer - ld hl, VermilionCityText3.inFrontOfOrBehindGuardCoords - call ArePlayerCoordsInArray - jr nc, .greetPlayerAndCheckTicket -.greetPlayer - ld hl, EventVermillionCityCitrinePassGreeting - call PrintText - jr .end -.greetPlayerAndCheckTicket - ld hl, EventVermillionCityCitrinePassGreeting - call PrintText - call TheAutoskipStopinator - ld b, CITRINE_PASS - predef GetQuantityOfItemInBag - ld a, b - and a - jr nz, .playerHasTicket - ld hl, EventVermillionCityCitrinePassGreetCheck - call PrintText - jr .end -.playerHasTicket - ld hl, EventVermillionCityCitrinePass - call PrintText - ld a, $4 - ld [wVermilionCityCurScript], a -.end - jp TextScriptEnd - -EventVermillionCityCitrinePassGreeting: - text "Hah! I only serve" - line "strong TRAINERs!" - done - text_end - -EventVermillionCityCitrinePassGreetCheck: - text "Gonna need to see" - line "proof, shrimp!" - done - text_end - VermilionCityText4: text_far _VermilionCityText4 text_end @@ -563,8 +248,7 @@ VermilionCityText14: VermilionCityText6: text_asm - ld a, [wObtainedBadges] - bit 5, a ; after obtaining the marsh badge the ship returns + CheckEvent EVENT_BEAT_SABRINA jr z, .default ld hl, VermilionCityText15 ret @@ -665,26 +349,10 @@ OfficerJennyHowDoing: text_far _OfficerJennyText5 text_end -VermillionCityPassSelectionText: - text_far _VermillionCityPassSelectionText - text_end - -EventVermillionCityOldSeaMap: - text_far _VermillionCityOldSeaMap - text_end - -EventVermillionCityCitrinePass: - text_far _VermillionCityCitrinePass - text_end - EventVermillionCitySSTicket: text_far _SSAnneFlashedTicketText text_end -PassRefuse: - text_far _VermillionCityHarborRefuse - text_end - ; LGPE Beauty who gives you a Persian or Arcanine depending on the game. ; Here, we make it a Cats vs Dogs question and change based on that. ; The way it works is it makes the player catch the opposite Pokemon, and then get the one they picked. diff --git a/scripts/VermilionFerryDock.asm b/scripts/VermilionFerryDock.asm new file mode 100644 index 00000000..ab25821e --- /dev/null +++ b/scripts/VermilionFerryDock.asm @@ -0,0 +1,6 @@ +VermilionFerryDock_Script: + jp EnableAutoTextBoxDrawing + +VermilionFerryDock_TextPointers: + + text_end \ No newline at end of file diff --git a/scripts/VictoryRoad2F.asm b/scripts/VictoryRoad2F.asm index db08f49f..1947ff2b 100644 --- a/scripts/VictoryRoad2F.asm +++ b/scripts/VictoryRoad2F.asm @@ -72,7 +72,7 @@ VictoryRoad2F_TextPointers: dw VictoryRoad2Text3 dw VictoryRoad2Text4 dw VictoryRoad2Text5 - dw GyaoonText + dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText @@ -94,8 +94,6 @@ VictoryRoad2TrainerHeader3: trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_3, 1, VictoryRoad2BattleText4, VictoryRoad2EndBattleText4, VictoryRoad2AfterBattleText4 VictoryRoad2TrainerHeader4: trainer EVENT_BEAT_VICTORY_ROAD_2_TRAINER_4, 3, VictoryRoad2BattleText5, VictoryRoad2EndBattleText5, VictoryRoad2AfterBattleText5 -GyaoonTrainerHeader: - trainer EVENT_BEAT_GYAOON, 0, GyaoonBattleText, GyaoonBattleText, GyaoonBattleText db -1 ; end VictoryRoad2Text1: @@ -128,20 +126,6 @@ VictoryRoad2Text5: call TalkToTrainer jp TextScriptEnd -GyaoonText: - text_asm - ld hl, GyaoonTrainerHeader - call TalkToTrainer - jp TextScriptEnd - -GyaoonBattleText: - text_far _GyaoonBattleText - text_asm - ld a, GYAOON - call PlayCry - call WaitForSoundToFinish - jp TextScriptEnd - VictoryRoad2BattleText1: text_far _VictoryRoad2BattleText1 text_end diff --git a/text.asm b/text.asm index 301830fd..76225f76 100644 --- a/text.asm +++ b/text.asm @@ -289,6 +289,7 @@ INCLUDE "text/SilphGauntlet2F.asm" INCLUDE "text/SilphGauntlet3F.asm" INCLUDE "text/SilphGauntlet4F.asm" INCLUDE "text/SilphGauntlet5F.asm" +INCLUDE "text/SilphGauntlet6F.asm" INCLUDE "text/SilphGauntlet7F.asm" INCLUDE "text/CitrinePokecenter.asm" INCLUDE "text/CitrineMart.asm" diff --git a/text/BrunswickTrail.asm b/text/BrunswickTrail.asm index 3ed6d82e..3f503a90 100644 --- a/text/BrunswickTrail.asm +++ b/text/BrunswickTrail.asm @@ -10,8 +10,8 @@ _CaveGuy:: ; Used to describe GZap, but the beauty seemed funnier. Needed some l done _Lover1:: - text "ALICE: This spot" - line "is where she" + text "Here's the spot" + line "where she first" cont "confessed to me." para "Now it's by far" @@ -25,7 +25,7 @@ _Lover1:: done _Lover2:: - text "CHELSIE: I adore" + text "I absolutely love" line "visiting this" cont "TRAIL with my" cont "girlfriend!" @@ -71,7 +71,7 @@ _BrunswickEndBattleText2:: _BrunswickAfterBattleText2:: text "I saw a BIRD" line "#MON with huge" - cont "feet sprint past" + cont "legs sprint past" cont "me!" para "It almost blew me" @@ -118,10 +118,10 @@ _FakeTreeAttack:: line "to hack away..." para "But it was a" - line "CACTUS!" + line "CACTORMUS!" - para "CACTUS retaliated" - line "in a rage!" + para "It retaliated in" + line "a rage!" prompt ; Martha can do the text for her things... diff --git a/text/CopycatsHouse2F.asm b/text/CopycatsHouse2F.asm index a304352b..74590aa2 100644 --- a/text/CopycatsHouse2F.asm +++ b/text/CopycatsHouse2F.asm @@ -63,7 +63,7 @@ _TM31NoRoomText:: text_end _CopycatsHouse2FText2:: - text "It's a JAGG" + text "It's a SHARPOON" line "doll with cute," cont "round eyes!" done diff --git a/text/GiovannisRoom.asm b/text/GiovannisRoom.asm index dfcc5f4f..47684816 100644 --- a/text/GiovannisRoom.asm +++ b/text/GiovannisRoom.asm @@ -3,38 +3,39 @@ _GiovannisRoomText1:: line "EARTH - GIOVANNI" para "In this book, I" - line "will reveal" - cont "RHYDON's" - cont "highest form." + line "will reveal the" + cont "highest form of" + cont "RHYDON." para "Its name is" line "RHYPERIOR." - - para "However, it" + cont "However, it" cont "cannot be" cont "obtained with" cont "items found in" - cont "KANTO." + cont "KANTO naturally." - para "It needs an item" - line "called a" - cont "PROTECTOR." + para "A PROTECTOR is" + line "required, which" + cont "we managed to" + cont "import here." para "It unfortunately" line "fails to address" cont "RHYDON's poor" - cont "SPEED." - - para "Ergo, it cannot" - line "use my FISSURE" - cont "technique to" - cont "its complete" - cont "potential." - + cont "SPEED. Ergo, it" + cont "cannot use my" + cont "own technique," + cont "FISSURE, to its" + cont "full potential." done _GiovannisRoomText2:: - text "Aug 1st, 1975" + text "It's a torn-out" + line "page from an" + cont "old diary..." + + para "Aug 1st, 1975" line "I managed to" cont "get my first" cont "#MON." @@ -64,7 +65,7 @@ _GiovannisRoomText3:: para "PROTECTOR: ¥3,000" - para "GUARD SPEC: ¥4,200" + para "DIRE HIT: ¥5,200" para "DEVELOPMENT OF" line "TM27: ¥15,000" @@ -86,24 +87,3 @@ _GiovannisRoomText4:: para "1977?!" done - -_GiovannisRoomBattleText2:: - text "Hey! Intruders" - line "aren't welcome in" - cont "the BOSS's room!" - - para "I'm his last" - line "line of defence!" - done - -_GiovannisRoomEndBattleText2:: - text "Oww!" - line "Beaten!" - prompt - -_GiovannisRoomAfterBattleTxt2:: - text "What?! Are you" - line "serious? TEAM" - cont "ROCKET is" - cont "disbanding?" - done diff --git a/text/SilphGauntlet1F.asm b/text/SilphGauntlet1F.asm index 161af104..2a04628c 100644 --- a/text/SilphGauntlet1F.asm +++ b/text/SilphGauntlet1F.asm @@ -87,7 +87,7 @@ _SilphGauntlet1FEndBattleText5:: prompt _SilphGauntlet1FAfterBattleText5:: - text "TSUBOMITTO loves" + text "BELLIGNAN loves" line "eating bugs, so" cont "it's perfect" cont "for me!" diff --git a/text/SilphGauntlet2F.asm b/text/SilphGauntlet2F.asm index 6f249d9a..e5c67396 100644 --- a/text/SilphGauntlet2F.asm +++ b/text/SilphGauntlet2F.asm @@ -15,39 +15,18 @@ _SilphGauntlet2FAfterBattleText1:: cont "application..." done -; I am not sure if Junior should be here. -; At most, a later floor. He's meant to be Blue's little brother, no? -; Need a proper discussion on what to do with him, even the OG devs didn't know what to do. _SilphGauntlet2FBattleText2:: - text "Comment to be" - line "written." - cont "JUNIOR" - done - -_SilphGauntlet2FEndBattleText2:: - text "Comment to be" - line "written." - cont "JUNIOR" - prompt - -_SilphGauntlet2FAfterBattleText2:: - text "Comment to be" - line "written." - cont "JUNIOR" - done - -_SilphGauntlet2FBattleText3:: text "This is no place" line "to hike! Now I'm" cont "mad!" done -_SilphGauntlet2FEndBattleText3:: +_SilphGauntlet2FEndBattleText2:: text "Bah!" line "Too much!" prompt -_SilphGauntlet2FAfterBattleText3:: +_SilphGauntlet2FAfterBattleText2:: text "That CHIEF!" para "Always cutting" @@ -55,18 +34,18 @@ _SilphGauntlet2FAfterBattleText3:: cont "stand it!" done -_SilphGauntlet2FBattleText4:: +_SilphGauntlet2FBattleText3:: text "Umm..." para "Battle me!" done -_SilphGauntlet2FEndBattleText4:: +_SilphGauntlet2FEndBattleText3:: text "It's" line "no big deal..." prompt -_SilphGauntlet2FAfterBattleText4:: +_SilphGauntlet2FAfterBattleText3:: text "I don't get out" line "much..." @@ -76,18 +55,18 @@ _SilphGauntlet2FAfterBattleText4:: cont "always wanted..." done -_SilphGauntlet2FBattleText5:: +_SilphGauntlet2FBattleText4:: text "Hahaha! This is" line "great! So many" cont "rare #MON! Show" cont "me yours, now!" done -_SilphGauntlet2FEndBattleText5:: +_SilphGauntlet2FEndBattleText4:: text "Argh!" prompt -_SilphGauntlet2FAfterBattleText5:: +_SilphGauntlet2FAfterBattleText4:: text "The second I heard" line "of the #MON" cont "I could meet here," @@ -99,6 +78,24 @@ _SilphGauntlet2FAfterBattleText5:: cont "though!" done +_SilphGauntlet2FBattleText5:: + text "If I win this," + line "CHIEF will love" + cont "me for sure!" + done + +_SilphGauntlet2FEndBattleText5:: + text "No!" + line "Not here..." + prompt + +_SilphGauntlet2FAfterBattleText5:: + text "Huh? Why CHIEF?" + + para "I just want his" + line "money!" ; hahahahahaha + done + _SilphGauntlet2FBattleText6:: text "I'm here training" line "become the next" @@ -120,7 +117,7 @@ _SilphGauntlet2FAfterBattleText6:: line "powerful." para "Keep battling," - cont "and you will" + line "and you will" cont "surely succeed." done \ No newline at end of file diff --git a/text/SilphGauntlet3F.asm b/text/SilphGauntlet3F.asm index 0aa59832..9087b199 100644 --- a/text/SilphGauntlet3F.asm +++ b/text/SilphGauntlet3F.asm @@ -116,22 +116,5 @@ _SilphGauntlet3FAfterBattleText6:: cont "this in their" cont "fishing gear?!" done - -_SilphGauntlet3FBattleText7:: - text "If I win this," - line "CHIEF will love" - cont "me for sure!" - done -_SilphGauntlet3FEndBattleText7:: - text "No!" - line "Not here..." - prompt - -_SilphGauntlet3FAfterBattleText7:: - text "Huh? Why CHIEF?" - - para "I just want his" - line "money!" ; hahahahahaha - done \ No newline at end of file diff --git a/text/SilphGauntlet6F.asm b/text/SilphGauntlet6F.asm new file mode 100644 index 00000000..c757b0dd --- /dev/null +++ b/text/SilphGauntlet6F.asm @@ -0,0 +1,126 @@ +_SilphGauntlet6FBattleText1:: + text "Comment to be" + line "written." + cont "BROCK" + done + +_SilphGauntlet6FEndBattleText1:: + text "Comment to be" + line "written." + cont "BROCK" + done + +_SilphGauntlet6FAfterBattleText1:: + text "Comment to be" + line "written." + cont "BROCK" + done + +_SilphGauntlet6FBattleText2:: + text "Comment to be" + line "written." + cont "MISTY" + done + +_SilphGauntlet6FEndBattleText2:: + text "Comment to be" + line "written." + cont "MISTY" + done + +_SilphGauntlet6FAfterBattleText2:: + text "Comment to be" + line "written." + cont "MISTY" ; she idolises Lorelei and is an Elite 4 member in SW 97, a reference to that could be neat + done + +_SilphGauntlet6FBattleText3:: + text "Comment to be" + line "written." + cont "SURGE" + done + +_SilphGauntlet6FEndBattleText3:: + text "Comment to be" + line "written." + cont "SURGE" + done + +_SilphGauntlet6FAfterBattleText3:: + text "Comment to be" + line "written." + cont "SURGE" ; maybe comment on how him and Blaine fought in the war together? + done + +_SilphGauntlet6FBattleText4:: + text "Comment to be" + line "written." + cont "ERIKA" + done + +_SilphGauntlet6FEndBattleText4:: + text "Comment to be" + line "written." + cont "ERIKA" + done + +_SilphGauntlet6FAfterBattleText4:: + text "Comment to be" + line "written." + cont "ERIKA" + done + +_SilphGauntlet6FBattleText5:: + text "Comment to be" + line "written." + cont "KOGA" + done + +_SilphGauntlet6FEndBattleText5:: + text "Comment to be" + line "written." + cont "KOGA" + done + +_SilphGauntlet6FAfterBattleText5:: + text "Comment to be" + line "written." + cont "KOGA" ; have him mention Janine, maybe? + done + +_SilphGauntlet6FBattleText6:: + text "Comment to be" + line "written." + cont "SABRINA" + done + +_SilphGauntlet6FEndBattleText6:: + text "Comment to be" + line "written." + cont "SABRINA" + done + +_SilphGauntlet6FAfterBattleText6:: + text "Comment to be" + line "written." + cont "SABRINA" + done + +_SilphGauntlet6FBattleText7:: + text "Comment to be" + line "written." + cont "BLAINE" + done + +_SilphGauntlet6FEndBattleText7:: + text "Comment to be" + line "written." + cont "BLAINE" + done + +_SilphGauntlet6FAfterBattleText7:: + text "Comment to be" + line "written." + cont "BLAINE" + done + \ No newline at end of file diff --git a/text/SilphGauntlet7F.asm b/text/SilphGauntlet7F.asm index 0f6ffd34..ca64953a 100644 --- a/text/SilphGauntlet7F.asm +++ b/text/SilphGauntlet7F.asm @@ -96,7 +96,7 @@ _ChiefAfterBattleText:: _ChiefPCText:: text "It's a PC with" line "blueprints for" - cont "OMEGA!" + cont "OMEGADGE!" para "It was meant" line "for..." @@ -115,7 +115,7 @@ _ChiefPainting1:: done _ChiefPainting2:: - text "It's a picture" - line "of GYAOON, an" + text "It's a painting" + line "of GAWARHED, an" cont "extinct #MON!" done diff --git a/text/VermilionCity.asm b/text/VermilionCity.asm index 929c3d75..39ed7729 100644 --- a/text/VermilionCity.asm +++ b/text/VermilionCity.asm @@ -128,53 +128,6 @@ _VermilionCityText15:: line "has returned!" done -_RoingusText:: ; new NPC made as an inside joke, with a slight reference to Mew - text "I wanna discover" - line "a new species of" - cont "#MON someday!" - - para "If I'm the first" - line "to discover it, I" - cont "could name it!" - - para "I'm gonna call" - line "it... ROINGUS!" - done - -; Text for the new pass system. -_VermillionCityPassSelectionText:: - text "Which PASS do you" - line "want to present?" - prompt - -_VermillionCityOldSeaMap:: - text " flashed" - line "the OLD SEA MAP!" - - para "My, my. I haven't" - line "seen this in a" - cont "long time." - - para "Come. I'll take" - line "you there." - done - -_VermillionCityCitrinePass:: - text " flashed" - line "the CITRINE PASS!" - - para "Crikey!" - - para "Right this way!" - line "I can't believe" - cont "it..." - done - -_VermillionCityHarborRefuse:: - text "Alright! Have a" - line "nice day!" - done - _BeautyText1:: text "Hey! Do you like" line "cats or dogs?"