Commit graph

217 commits

Author SHA1 Message Date
May Evans 71de0f07a5 Groundwork for Viridian Pre-Gym
This map is fully functional but has a lot of bits to iron out, as well as a need for Gym Trainers. I'm also not wholly satisfied with Yujirou's team; maybe remove Eevee?

Yes, I designed an entire tileset for this. Fear me. Bow before me. Actually, don't, this was beyond rational thought.

Current issues;
- Yujirou's sprite doesn't work properly.
- Needs Gym Trainers (hell)
- Yujirou needs an event for being beaten, the refight, and more.
2023-03-30 02:12:45 +01:00
May Evans 57d79f43ed Up-Grade NPC
Seems to interact oddly with Saffron but I believe this is because of the way Team Rocket works. The event itself works fine.

Also added the Up-Grade, as before, Porygon was evolving via Trade.

Uses text referencing LGPE, and has a similar location.

Because of the sprite limit in Saffron, the Pidgeot NPC has been removed.
2023-03-29 23:47:26 +01:00
May Evans c759efdeea Rework CeladonU Trainers
This refactors the Celadon University trainers to ensure that they process properly without the odd memory leak-y thing I did before. Overall works the same, just works for the intended purpose.

I also applied what I learned to Professor Oak, giving a Yes/No prompt and adding some pre-battle music as I originally intended.
2023-03-29 17:41:45 +01:00
May Evans 0226ba9579 Pikachu/Eevee Mode
So some bits of this are untested, but the base starters are unaffected. I had to work a lot with the sprite limits so Oak's lab has been changed a bit.

This adds a Pikachu and Eevee "mode" to the game, allowing you to pick them as starters. When doing so, the Rival will always pick the opposite.

There are some glitches;
- Picking Charmander makes Blue erase himself from existence
- Picking from anywhere other than the front of the table may have odd results.
- Oak has to be shown in the lab at the start from now on for some reason; side effect of removing the dexes, there's definitely a fix for this.
These are from me not finishing the ball picking process - it was a little weird.

Parties based on starters have been updated but I had to cut out a lot of unused trainer slots.

Also the unused names were removed.
2023-03-25 16:02:23 +00:00
May Evans 22236d2072 Add Dubious Disc Salesman
This adds the Dubious Disc Salesman to Cinnabar Pokemon Centre. I chose this area because it's late in the game and it seemed a bit iffy to constantly have to go with Pokemon Centres not in towns. Cinnabar has some connection to Silph, so it makes more sense than just balancing.

There are probably improvements that could be made (eg. a quote as you buy) but the salesman code is surprisingly brittle so I'd rather not break stuff for hours for something that already works perfectly fine.
2023-03-06 05:14:19 +00:00
May Evans bcb67db573 Bill's Garden, add Rowan NPC
Rowan NPC added to Cinnabar Lab, just a little cute thing.

Bill's Garden could see many revisions, what's here is the bare minimum. Here's what's done:
- Nidorino NPC blocks it off and is unlocked in the post-game. This currently contradicts the myth - I have a plan for this soon.
- Wild Pokemon are the "non-reproducibles" given in Stadium; starters and eevee are mandatory given those were common in the myth
- Hisui forms should be added when possible
- I had to remake Martha's map in the forest tileset so leaving would be possible
- Everything is at a point where it functions
2023-03-03 10:41:28 +00:00
May Evans 86f6151a17 A few cool changes
- Pokemon Mansion has a Guard NPC now
- Professor Oak now plays the Champion theme when you fight him.
2023-02-24 00:05:16 +00:00
May Evans a85c26b7d3 LOTS of things
- Replaces the Old Rod with the Candy Sack, an item to evolve Meltan into Melmetal. Meltan and Melmetal aren't in yet.
- Improves Gym Leader and Elite Four AI by a lot. They still use items, they're just better. Fixes XSpecial use while we're at it; before, it didn't actually increase the stat...
- The Scarlet Book now takes up both shelves, one section for each Paradox Pokemon. I also moved the bookshelf so it looks nicer.
- Text in Celadon University has been reduced significantly, taking up less memory and being a bit more RBY-like. It has also been made more accurate (thanks to Daiginjo for translating my booklet!)
- The Magikarp researcher in Celadon University now gives TM Dragon Rage (no longer unused!)
- Added a guard for Mt. Moon Crater.
- Removed TrainerNamePointers, Blank Leader Name Code, and Dakutens/Hakutens using a guide published by YakiNeen.
- PP no longer uses a shitty graphic and is instead properly implemented into the font, optimising the status screen. Also displays in-battle which is kinda cool.
- Lorelei, Bruno, and Agatha now play the Gym Leader theme, not just Lance.

Still unsure how to fix Celadon University's trainers, all I know is a lot of the information should be taken from the Oak fight I did. The code is radically different and doesn't call trainer headers at all. You'll likely want to start from scratch.

The Mt. Moon Crater Guard's text is a little wonky, not sure what's up there. May have been from the way I accessed Mt. Moon in testing. Anyway, if you want to mess around feel free.
2023-02-19 06:25:33 +00:00
MementoMartha a3f3763f4d New sprites, a few bug fixes/tweaks
All of the Ubers have sprites now (goodbye Lion Pory2!), fixed a small bug I made on Route 19 when resizing Cinnabar, and some minor text updates/fixes.
2023-02-08 17:13:44 +00:00
May Evans cef7b12780 add old rod reference
seemed funny in my head, also indirectly references magikarp jump if you look REEEEEEALLY into it
2022-12-24 23:14:45 +00:00
May Evans d31edda1da Add Prof. Oak post-game fight
This was surprisingly easy to add, albeit a bit awkward. I learned how to add trainer battles without headers this way, so I may go back to CeladonU and restructure with this in mind.

This commit adds a fully functioning Professor Oak fight, using the Rival party choice script as a launchpad. You can desynchronise the choices easily, just a few number changes. I used the S. S. Anne 2F and Route 22 scripts to hodgepodge it together.

Because of how I did this, Oak is fully re-fightable, taking inspiration from XY Serena's daily re-fights.

I tried to add a Yes/No prompt, but it would still pull you into the fight, presumably because it's calling a beforebattle script before the code. It's a bit of a hassle and my CeladonU code sucked, so I decided to leave it out for now.

It's intended to be unlocked once you enter the Hall of Fame, thus that change there. That hasn't been tested properly so uhhhh *shrug*
2022-12-12 05:22:41 +00:00
May Evans b7973444b2 Myriad of changes!
This is a pretty hefty commit, so let's break it down.
- Fixes Pokedex entries for Bittybat, Bulbasaur, and Shellder.
- ...presumably fixes the options menu.
- Adds a Fishing Group and water wild data to Diglett's Cave, also reduces the encounter rate. More to come.
- Modifies parties, including evolving Rival 2's starter.
- Attempts to fix the Ultra and Safari Balls by making `BallFactor` 4, which appears to be the intended number. Tests yielded positive results.
- Restores a ton of Japanese references that got removed in localisation, including some errors.
2022-12-11 21:40:43 +00:00
May Evans 1042a9759b Finish the Pewter Museum of Science
This fixes all the bugs with the Scarlet Book and Sada. Thanks to Vortiene for the help!
2022-12-06 00:20:10 +00:00
May Evans 9ed18b1d8f Work on the Scarlet Book & Wild Data
* Wild data added to the Mt. Moon Crater
* CoolTrainer NPC (young Sada) added to the Pewter Museum of Science.
* [EXPERIMENTAL] Added the Scarlet Book to the hidden item list for the Pewter Mueseum of Science.

Notes;
* This commit will not work without SV Pokemon being implemented.
* The Scarlet Book has not been placed correctly. The tileset for the museum doesn't load properly in Polished Map, so I'm kind of stumped. Neither has Sada.

Things to do:
* Add an NPC to Mt. Moon B2F that blocks off the crater, along with a warp there. NPC should disappear when you have 8 Gym Badges.
2022-12-05 01:49:52 +00:00
MementoMartha 2b3da5e254 A few fixes + added Blahaj cameo
Copycat now has a Jagg plushie in her house, referencing the amazing IKEA shark.

(note that KEP is not sponsored by IKEA)
2022-11-04 11:12:44 +00:00
MementoMartha bb319e89b3 A few minor fixes
Alters a few bugged texts, still need to fix Faraway's entrance tile
2022-10-29 23:01:34 +01:00
May Evans 86f111e5d7 Revamp Pokemon Mansion B2F
This was hell to do. There is still one bug in there, and that's the item pickups don't work for some reason. I don't know how these work honestly so if anyone wants to sort that go ahead.

Anyway, some stuff on the map;
- Currently, a warp from B1F leads there, which is intentionally non-returnable. The player walks through the whole map to get to the warp panel. A walk of humanity's shame, if you will. A warp for where the player is meant to go will be necessary later.
- Lore from Japanese media, particularly the first movie's interpretation of Mewtwo, is included. This is based on context clues on its canonicity from LGPE and other bits.
- A clue on how to get the Old Sea Chart is not-so-subtly included.

The MissingNo. event is unfinished, I intend for Martha to deal with that. The text intentionally lacks a "done" bit to force an unpredictable error; I believe this is inconsequential gameplay-wise and should make for a good opening quote when fighting it.

Oh, and Faraway Island has Mankey, Butterfree, and Primeape as find-able Pokemon now. This should be expanded upon later.
2022-10-17 16:57:42 +01:00
May Evans 97cb4cfaf3 Add another CeladonU NPC
This is a reference to another bit of the Tamamushi booklets, where they talk about the Pokemon that can fly without wings.

Also, shortened one of the text chains. In general, they need to be much shorter.
2022-10-17 13:09:14 +01:00
May Evans fce6c3221c Add Pokemon Mansion B2F
Very dissatisfied with the map as-is. Needs a lot of work, possibly another tileset based on the `interior` one. I tried adding one but came across constant problems and the one I came up with kind of sucked. No events or warps yet.
2022-10-16 12:10:50 +01:00
May Evans 78ae4e9029 Move Mew, add Old Sea Chart, add wild data
I am 90% sure something will bug out, can't test the map right now for obvious reasons. Tested everything else, though.

Mostly copied data from Cinnabar Volcano while commenting out Vermillion Dock Mew info to move it.

Wild data has been added along with a fishing group, just dummied out slots.

Old Sea Chart is a clone of the Citrine Pass which is all it needs to be. It is obtainable near the truck.
2022-10-16 09:05:26 +01:00
May Evans 4cc05243ed Free roaming from Cerulean, add Faraway Island sign
- Replaces tiles east and west of Cerulean so you can roam back to Mt. Moon and over to Rock Tunnel with no issue.
- Adds the Faraway Island sign, with a - "JI" bit to represent Mr. Fuji. This was in the Japanese release, but never got translated internationally. "I depart" may need fine-tuning, as it implies he died; this was a mistranslation, obviously.
- Added a text bank for the Mew encounter to make Martha's job easier later.
2022-10-16 07:46:08 +01:00
MementoMartha a8f7c62ffe Fixing the recover bug! :D
Also some minor text and trade updates, too
2022-10-13 17:18:23 +01:00
MementoMartha a05796ece5 Citrine Pass and a few little tweaks 2022-10-02 17:16:30 +01:00
MementoMartha 2c81593537 more fixes 2022-10-01 13:15:58 +01:00
MementoMartha 830c3c3b1d more back door edits 2022-10-01 13:03:53 +01:00
MementoMartha a10c48a514 fixing a bug, adding a trainer 2022-10-01 12:23:58 +01:00
MementoMartha 91344e05e8 Rocket hideout improvements/changes 2022-10-01 11:38:00 +01:00
emaskyesmogon 46c41f4f2b Running shoes reminder
Just so players know they exist cause who reads READMEs?
2022-09-29 20:26:19 -06:00
May Evans fcf6e26692 Add Giovanni's Hideout
This is part of the removal of the Rocket Hideout. Floor 1 is repurposed to be a lore-centric room for Giovanni's character, located in Viridian Gym. I plan to have the Protector and TM Earthquake moved here.

The TM26 item pickup doesn't work for some reason. Otherwise, it's complete.
2022-09-30 00:02:23 +01:00
May Evans 3494836bdb Merge branch 'master' of https://github.com/PlagueVonKarma/kep-hack 2022-09-28 15:59:19 +01:00
May Evans 4e9399bed5 more things for celadon u 2022-09-28 15:58:30 +01:00
MementoMartha 04d66ade5e minor text fixes 2022-09-28 15:18:06 +01:00
May Evans 5bb215ec23 revert 2 bug fixes due to issues, add to celadon U
the ghost without silph scope fix doesn't work due to a codebase change, and the night shade wiggly animation causes a bank overflow

celadon university has 3 more books detailing lore from one of the old pokedex books
2022-09-28 14:50:54 +01:00
May Evans 19d5f2293c Add trainers to Celadon University, add two new salesmen, etc
Overall completes Celadon University sans a problem with sprites being a bit corrupted until you leave. New Magikarp Salesman-esque events in other pokecenters which is kinda neat
2022-09-27 16:06:13 +01:00
MementoMartha 89bb05b2dc added roingus girl and new cinnabar quiz questions 2022-09-27 15:26:37 +01:00
MementoMartha 4eaae2ab9d Adding Cinnabar Volcano, editing a few encounters 2022-09-27 12:09:22 +01:00
May Evans 0b65243c75 Add more to Celadon University
This adds;
- Text and stuff on the interior to add some really nice worldbuilding
- Trainers outside that you can fight with repeatedly.

The trainers need yes/no menus but I can't figure it out for the life of me. If anyone can do it, lemme know!
2022-09-27 01:48:52 +01:00
MementoMartha f74055e77b Removing version differences, and adding Mew 2022-09-25 14:03:04 +01:00
May Evans 9e4e07ec82 Add Celadon University
Has the map connections, warps, and maps all done. A single person is there right now; Prof. Westwood V, as a reference to the early worldbuilding. I'll work on this more as time goes on.
2022-09-24 13:20:58 +01:00
MementoMartha e5038016b0 Mostly map edits and a few other tweaks
Underwater Tunnel is a new area that links Route 25 to Route 10, basically just being a straight tunnel needing Surf to traverse.

Also given Seafoam Islands and Lorelei's room an unused palette that gives it a more icy feel
2022-09-17 23:42:19 +01:00
MementoMartha 75d4e47586 Implementing static Crocky encounter 2022-09-10 18:43:00 +01:00
MementoMartha e9b9fc324a Fossils and Fishing Rod tweaks
Moved the (Super) Fishing Rod over to Pewter, Decilla now comes from the Old Amber and Aerodactyl has a new fossil
2022-09-06 11:57:02 +01:00
MementoMartha 93e1e4c2f5 A few small tweaks
Misty, Brock, Red and Blue use their Yellow sprites, and Sea Cottage has been changed to Bill's Lighthouse from the anime.
2022-09-06 07:17:36 +01:00
emaskyesmogon b429b2ce2f Genderless protags
Easier than adding gender options
2022-09-03 18:02:15 -06:00
May Evans 0c9da85a51 seems this is needed? 2022-08-31 17:45:23 +01:00
May Evans c1d2bc7678 more fixes 2022-08-31 15:50:28 +01:00
Rangi a66adbcc5c Sync Pokédex rating text with pokeyellow 2022-07-10 19:26:18 -04:00
Rangi 927b5a4700 Identify Pokédex rating text 2022-07-10 19:16:17 -04:00
Rangi 7ee8a6509e wcf4b -> wStringBuffer 2021-08-28 17:02:20 -04:00
Yoann Fievez a448ac897d Clean many labels of scripts of all gyms 2021-05-31 20:41:10 +02:00
Rangi 594c58a289 Revise some map scripts, mostly for getting items 2020-07-16 11:19:05 -04:00
Rangi 139a28ff99 Port pokecrystal's formatting of text commands and special characters 2020-07-04 21:14:46 -04:00
Rangi b29e5ee203 Add subdirectories to data/ similar to pokecrystal
Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.
2020-07-03 11:51:00 -04:00
Rangi 4b853ad676
Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251)
Each new file builds its own .o, along with separate main.o and home.o, which necessitates many more "exported::" labels.
2020-06-27 15:32:24 -04:00
Rangi 0a62d48df2 Move more tables from engine/ to data/
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
2020-06-23 17:50:50 -04:00
dannye 9a8811b492 Misc minor clean up
spotted by comparing against pokeyellow
2020-05-24 18:59:05 -05:00
Matt 1978a37e19 document vermilion gym 2020-05-05 21:28:19 -04:00
Matt 8210dca8e5 label npc conditional text 2020-05-03 14:41:11 -04:00
Rangi c779602459 Rename map files, labels, and constants to be consistent and work with Polished Map 2019-01-01 23:33:10 -05:00
Víctor M. González 5c39c6c5cb Replaced all instances of $52, $53, and $5A with "<PLAYER>", "<RIVAL>", and "<USER>" respectively. 2017-07-30 18:46:53 -03:00
YamaArashi 6f1ac06e03 pull some bank 1 code out of main.asm 2016-09-17 17:37:32 -07:00
dannye 70dde9d96b Clean up redundant labels
fix trainer header numbering
2016-07-20 00:40:04 -05:00
YamaArashi 3a6a300da4 sync text 2016-06-12 10:11:31 -07:00
dannye 48e0125bd6 Remove some leftover address comments 2016-06-12 01:42:19 -05:00
YamaArashi 7f34e28f24 remove address comments 2016-06-11 17:24:04 -07:00
IIMarckus 3425fd6ef8 Sync somewhat with pokeyellow. 2016-06-08 05:45:50 -06:00
IIMarckus 674b4dcc4a Remove the Beach House option. 2016-06-07 23:55:55 -06:00
pikalaxalt 31b118ab42 Merge branch 'master' of https://github.com/pret/pokered 2016-05-13 17:59:46 -04:00
IIMarckus adc6a3aac7 Clean up script labels in marts and Pokémon Centers. 2016-04-08 19:04:36 -06:00
IIMarckus 72790bcbac Clean up labels and trainer headers for overworld Pokémon. 2016-04-06 20:58:45 -06:00
PikalaxALT 1980a5befc Macrofy sprite status data in WRA0 2016-01-29 11:20:47 -05:00
Marcus Huderle 1a5a108bdf Label elite four scripts more completely. 2015-12-18 20:03:09 -08:00
IIMarckus f33bd1d89e Improve diffability with pokeyellow; remove address comments and ifs. 2015-12-06 14:04:42 -07:00
dannye 38065a744d No more W_ 2015-08-30 21:38:41 -05:00
dannye fb0a630c06 More joypad constants 2015-08-11 00:34:32 -05:00
YamaArashi 525f1b96f3 named CountSetBits output variable 2015-08-07 04:24:06 -07:00
YamaArashi 7f6d0d49b6 more naming variables 2015-07-24 20:27:59 -07:00
YamaArashi 04a6c306dc clean up wram aliases 2015-07-23 06:07:44 -07:00
YamaArashi c169073eed misc 2015-07-18 21:58:55 -07:00
U-Daniel-PC\Daniel 3cd3efd060 Name the last of unnamed text 2015-06-12 11:00:25 -05:00
yenatch 26227cc45f Clean up type names. 2014-12-10 20:07:01 -08:00
stag019 b08a0b860a Fix unclosed quotes. 2014-11-04 20:22:18 -05:00
IIMarckus 5ea1d8a61f Labels for Fuji in Pokémon Tower. 2014-10-26 21:00:29 -06:00
IIMarckus b17d958e60 Add more text changes from Yellow. 2014-10-24 01:50:40 -06:00
IIMarckus a36e090d43 Add parts of the Safari Zone entrance script from Yellow. 2014-10-17 22:47:31 -06:00
IIMarckus 7db2fe99f8 Add more from the beach house. 2014-10-17 08:13:51 -06:00
IIMarckus a3d3f8324a Kill version.asm. 2014-10-17 02:42:32 -06:00
IIMarckus 00049b6f39 Fix typo in previous. 2014-10-10 02:01:47 -06:00
IIMarckus 6e14461fa6 Add a lot of Yellow text changes. 2014-10-10 01:46:06 -06:00
yenatch ea05c44163 Add macro TX_BCD for printing BCD numbers.
This fixes some more static wram addresses.
2014-05-27 11:16:05 -07:00
yenatch 40c17c906b Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".

Label overleads are still an issue.
2014-05-26 22:04:39 -07:00
U-Fish-PC\Daniel f29c4e473e Misc relabelling 2014-05-21 11:58:18 -04:00
U-Fish-PC\Daniel 1a0992a2f1 Merge branch 'master' of https://github.com/huderlem/pokered into pull-data
Conflicts:
	main.asm
	text.asm
	text/maps/route_22.asm
2014-05-19 16:05:19 -04:00
U-Fish-PC\Daniel 82ffb336a9 Pull more data out of main.asm 2014-05-19 08:05:48 -04:00
U-Fish-PC\Daniel 24c01b09bb Pull map scripts out of main.asm 2014-05-18 14:19:10 -04:00
U-Fish-PC\Daniel 1e86625c87 Pull most data out of main.asm 2014-05-16 19:50:38 -04:00
Marcus Huderle d218d1972a Documented/Labeled Route 22 scripts. 2014-05-13 10:43:09 -05:00
IIMarckus 65e7657318 Add labels and comments to the Fan Club. 2014-04-21 02:12:25 -06:00
IIMarckus d036e24ae1 Improve comments/labels for Silph Co 7F. 2014-04-19 23:31:59 -06:00
IIMarckus 199ec815c6 Label a Route 11 gatehouse script better. 2014-04-19 21:44:51 -06:00
U-Fish-PC\Daniel f8452ebeb8 Use dimension constants in warp data and add map name consisntency 2014-04-05 10:47:23 -04:00
yenatch 1b9ee46af9 Get rid of globals.asm. Use ::s to export labels between objects.
globals.asm was a hack that:
- gave rgbasm an extra 100k lines to read
- increased reliance on the python preprocessor
- made the makefile a mess
- gave object creation an extra step
- wasn't even necessary

This speeds up build time by at least a third.
2014-01-27 16:24:13 -05:00
yenatch 0368685611 Split out move names 2014-01-23 15:38:10 -05:00
yenatch fbda25d3d8 Split out the rest of map text 2014-01-23 15:34:42 -05:00
yenatch 7762afaf99 Split out route text 2014-01-23 00:22:31 -05:00
yenatch 6e5476d420 Even more map text 2014-01-22 23:37:40 -05:00
yenatch bf743815fa Silph Co 1f text was actually somewhere else 2014-01-22 19:07:39 -05:00
yenatch 9da43a2311 Move city and town map text into text/maps 2014-01-22 18:58:57 -05:00
yenatch 31f074542b split out a bunch of map text 2014-01-22 17:47:55 -05:00
yenatch b52bcd6597 split viridian and oaks lab text into text/maps/ 2014-01-22 17:46:46 -05:00
yenatch b452726f9a rename existing map text files and put them in text/maps/ 2014-01-22 17:38:14 -05:00
yenatch 7a69bfaa92 text macros in pokedex entries 2014-01-22 00:56:48 -05:00
yenatch fea5be4699 rename and add some text macros
cont replaces next, and next becomes a generic newline.
para replaces page (now used for pokedex entries).
dex ends a pokedex entry.
2014-01-22 00:55:41 -05:00
yenatch 2ac15d2475 text macros in text/ 2014-01-21 21:09:32 -05:00
IIMarckus 18bf34ec0b Split large chunks of text into separate files, and improve Makefile.
hg-commit-id: 59e6e303019d
2011-12-26 18:40:25 -07:00
IIMarckus eac73b32e6 Treat apostrophes specially, since they’re combining characters.
This will need to be changed a bit if there are ever cases in‐game
where ’m, et cetera do NOT get combined into one character.
Maybe doubling it up to be treated as a single character (’’).

hg-commit-id: c90b7888ad5a
2011-12-21 02:50:47 -07:00
IIMarckus 450949763c Add Japanese text entry and Pokédex entries.
hg-commit-id: 8de61c31d46c
2011-12-21 00:31:01 -07:00