Commit graph

188 commits

Author SHA1 Message Date
Llinos Evans 0668db0ef0 Mt Moon Square House
This adds the Mt Moon Square House, faithfully recreated from GSC. I haven't yet sorted out the important details regarding the Crater Guard and such, though.

Making the map involved making a new desk tile and making house tile $36 be considered a counter tile. Hopefully there aren't any adverse consequences but I've never seen anything of that nature.

I noticed there are a ton of Clefairy text bits, so I refactored it to be a single line farcalled from `text_7.asm`. This also involved an interesting thing with the Pokemon Fan Club where the Pikachu fan has a Clefairy, so I fixed that too.

I figured that adding the dance was a little difficult right now, so we have Clefairys walking around instead.

I haven't figured out a good place to add the ladders yet (since there should be two entrances) but we'll figure that out eventually. It's plausible that we just make the Crater the southern warp, but I like how out-of-the-way the current one is.

Oh, and I fixed the Crater warps.

Overall, functional, but not finished.
2023-05-18 16:08:42 +01:00
MementoMartha 7e439981a2 A few tiny changes
- Gave Lorelei's room the cyan palette

- rearranged gym leader parties a little

- slightly better Tsubomitto sprite
2023-05-17 22:26:42 +01:00
Llinos Evans 8735785fd5 fix surf sprite issue
what a SILLY mistake that tutorial makes.
2023-05-13 18:36:43 +01:00
Llinos Evans 6d705fb489 Update sgb_border.png 2023-05-13 08:20:18 +01:00
Llinos Evans e28021b3db New SGB border
I altered the border to use RGBY sprites only. They're taken from various sources; the game corner, beta material, and so on. I directly downgraded Jigglypuff, Clefairy, Pikachu, Oddish, and Bulbasaur, which results in a really cool pre-GSC feel.

Also, fixed the Voltorb sprite. Had a palette thing left.
2023-05-13 08:14:59 +01:00
MementoMartha cdb00af812 A few minor changes
- Made Gym Leader levels more consistent

- Updated sprites, including a complete redo of Espeon's (based off the Gold sprite)

- Fixed an issue where Blue would have an incorrect team

- Changed Celadon Gym trainer text to accomodate for being a girl
2023-05-13 00:41:07 +01:00
Llinos Evans 36baa9e623 Boy/Girl option
This adds the boy/girl selection from later generations, using the pret tutorial and a spriteset from Pokemon Anniversary Red. I made some alterations, namely inserting the option later into the speech to be less clunky, and having the Nidorino become a Nidorina if you pick the feminine option.

I decided to make the third name option Seren, a common Welsh name for girls. It means "star", which is really cute! But...most people will probably say it's a Panel de Pon reference, which is cool too.
2023-05-13 00:08:39 +01:00
MementoMartha 2ec8bab272 Update sylveon.png 2023-05-12 06:23:06 +01:00
MementoMartha 6a9c452f7e Electivire and Glaceon remakes!
Also reworks Cinnabar Volcano slightly to make exiting possible lol
2023-05-08 23:16:10 +01:00
MementoMartha e1903f5479 Possible hide/show fix
I think this should fix some issues with hide/show, but I have no clue why.
2023-05-07 15:56:41 +01:00
MementoMartha febb20c418 Sprite updates!
Massive overhaul for Alolan Ninetales, updating Crobat's design slightly and some small shading changes on Slowking, mainly with its collar.
2023-05-06 18:11:28 +01:00
MementoMartha 48bf1bfe45 New Leafeon back sprite! 2023-05-03 08:48:59 +01:00
MementoMartha 5907eb1585 Update kingdrab.png
Another Albatross W!
2023-05-02 23:04:19 +01:00
MementoMartha f9b7f5baef Update kingdra.png
From the artist that brought you Leafeon, Kingdra 2.0!
(back sprite sold separately)
2023-05-02 20:54:19 +01:00
MementoMartha 16966745f1 Update leafeon.png
New front sprite for Leafeon based off the modern design. Back sprite still in the works, will add when finished :3
2023-05-02 16:41:40 +01:00
MementoMartha 1dbe226f77 New Galarian Articuno Sprite, and new Cinnabar Volcano map
(also a few other fixes, but they're not as important)
2023-05-01 00:47:09 +01:00
Llinos Evans b6dc6896c3 Cinnabar Volcano floors
This adds a map for Cinnabar Volcano's floors in the run-up to Moltres. I used a S.S. Anne style compression technique here, having 4 floors on a decently sized map that are just far enough apart for a player to never actually see them. This maintains their suspension of disbelief while giving us way more space to work with. I want to compress a lot of RBY maps like this if push comes to shove - there's a lot of places where this is possible.

In the interests of compression, I started using the Agatha bank again, as I removed a lot of maps from there when making bank 22. There's some space for maps.

Also I made 3 more blocks for cavern which caused it to overflow the bank it was in - fixed that by swapping with PreGym, which is probably much smaller.

Cinnabar Volcano hasn't been changed yet in the interest of Martha finishing that bit up.
2023-04-30 23:42:46 +01:00
MementoMartha 518f34a5eb New Umbreon sprite
Based off Silver's, also with updated palettes to reflect the modern design.
2023-04-30 13:41:07 +01:00
Llinos Evans 2a662e0ec1 Update arbok.png
French Orange had a better idea for the back part
2023-04-28 20:39:47 +01:00
Llinos Evans 83f6200c74 New sprites just dropped
A selection of Game Corner sprites retooled to be overworld Pokemon. I also placed Voltorb, Diglett, and Magikarp.
2023-04-28 19:11:49 +01:00
Llinos Evans 583847ae2c Citrine Mart
This adds Citrine Mart, which is battle-centric. It sells all the "strongest" items and makes Max Revives renewable.

I made a specialised tileset for Citrine Mart, combining the old and new styles to make something that feels right.
2023-04-28 03:08:54 +01:00
Llinos Evans 108fb01070 Brunswick groundwork, misc. changes
The groundwork for Brunswick Trail events has been done. Wild data, Cactus event, and Zapdos-G events are set up, plus an NPC. This also makes the Fake Tree sprite available.

I made the warp at the tunnel in Brunswick goes directly to Celeste Hill and back. Warp tile made functional.

Many bugs right now:
- Cactus doesn't disappear after battling it. Also, making this work how I want it to is hard.
- Pokemon are encountered on every tile, which is likely because it's considered to be indoors. In trying to fix this, I seemed to completely screw up the maps, so this isn't being committed. Handle this with care.
- I made a spriteset specifically for Citrine, but it doesn't seem to be working for Brunswick, likely because Brunswick is an indoor map and thus isn't just taking it.

Misc. changes:
- Moved Sandy Shocks to a 4% encounter slot in Mt. Moon Crater to be equal to Scream Tail.
- Restored the proper translation for the "rotten PRESIDENT" scientist, courtesy of Dr. Lava and Nob Ogasawara.
2023-04-27 04:08:27 +01:00
Llinos Evans 2f82c377fe Ok the fight works now
Issues:
- Player only walks one space for some reason
- After battle text doesn't happen, so no Candy Jar

Otherwise, almost finished.
2023-04-25 00:47:19 +01:00
Llinos Evans b4b08d0612 Brunswick Trail
To-Do List for Brunswick Trail:
- Galarian Zapdos event (give hide/show data)
- Tunnel to Celeste Hill (tileset moment)
- Couple by the sea
- Fake Tree (Cactus, may need a spriteset)
- Wild data (needs doing)
- Maybe a few trainers?
2023-04-24 00:43:05 +01:00
Llinos Evans 9b387cab7e Expanding on Pokemon icon usage
This adds Pikachu, Cat, and "Small Bird" menu icons. The cat has a custom animation done by myself.

The Jigglypuff in the Pokemon Centre now uses the new sprite, nice 'n' pretty. Officer Jenny is also in Cerulean. The Pokemon from Melanie's house in Yellow have been put in Mr. Fuji's House, given the purpose of the house in RB is different. I think it ends up fitting very nicely.

Chansey has been given its proper sprite in Fuschia. Yellow didn't actually do this, as Chansey doesn't have a walk cycle, causing the stuff that exists to go unused. I wanted it, though, so I had Chansey just not walk and turn around. Oh, and it's in all the Pokemon Centres now. Yeah, that's a...lot of changed files.
2023-04-23 21:25:45 +01:00
Llinos Evans 09ad875023 Finish Rocket House, Yellow sprite backport
Some big dubs for KEP today. This commit backports the Yellow overworld spriteset, and also adds the cat sprite for Meowth. This allows Jessie and James to use their overworld sprites in the Rocket House and serves as groundwork for backporting their other events.

There are altered Daisy and Nurse Joy sprites that may or may not warrant usage. That can be discussed.

Naturally, this also means there's a ton of overworld sprites to use elsewhere. Revamps of the "Bulbasaur house" in Cerulean and the Surfing Pikachu sprite change come to mind.

An & symbol has been backported from GSC for Jessie and James's trainer class as well.
2023-04-23 17:59:28 +01:00
Llinos Evans 78d3ed63f2 Citrine Rocket House
This map is pretty much finished, save for the map sprites for Jessie, James, and the unused Cat (aka Meowth) being imported, as well as an & symbol. This adds everything else - the marts, the Rocket Trio fight, the meeting music, the tileset, the trainer class for Jessie/James, I could go on. A ton of work well-done.
2023-04-22 20:49:19 +01:00
Llinos Evans 437602bf21 hm m yes carapthor
Altered the back sprite to be accurate to beetle wing cases, and changed the S.S. Anne Gentleman to use Carapthor (and Mr. Rime).
2023-04-22 17:07:05 +01:00
MementoMartha 594e4d7b80 moving Pudi, Hinaazu and Betobebii sprites 2023-04-22 12:22:46 +01:00
MementoMartha 027d9b4ee5 Kokana, Kasanagi and Carapthor!
A three-stage Bug line that mirrors the Caterpie and Weedle lines, being an old design for Weedle's evolutions. Pudi, Hinaazu and Betobebii have been removed, though.
2023-04-22 12:20:29 +01:00
dannye 772520c2c2 Merge branch 'master' of https://github.com/pret/pokered 2023-04-19 20:04:38 -05:00
MementoMartha 8ce4472f7d Polishing Celeste Hill a bit
Also added a small house on Route 1 which we can use for testing maps
2023-04-19 10:19:20 +01:00
Llinos Evans 91d47bef0e Celeste Hill & tileset
This adds the baseline stuff for Celeste Hill. The map, the tileset, and so on. No events or warps are currently available.
2023-04-18 17:30:57 +01:00
MementoMartha bfcc8de9f4 Goodbye Para, hello Taaban 2023-04-18 14:57:43 +01:00
MementoMartha c92b422b62 adding Taaban sprites 2023-04-18 13:37:48 +01:00
MementoMartha a6065bd576 Update parab.png 2023-04-18 07:37:23 +01:00
MementoMartha 19762488ae Updated a few sprites 2023-04-17 22:44:11 +01:00
Llinos Evans aa84414cba Update overworld.png
It said it changed so I'm just making sure nothing stupid was edited by accident
2023-04-17 19:37:40 +01:00
Llinos Evans 094869ab5e Citrine geography rework, Metal Coat
Lots of things here. Citrine now has its own tileset featuring content from the prototype asset leak. This includes new grass, signs, and so on. Lots of tinkering had to be done to make it look good, but it does! Collision and everything is done, but grass needs to animate properly. I'm committing as-is because making the grass animate is actually very difficult.

Also added the Metal Coat and fixed the issues with prior evolution methods - evo items first, level-up second. It is currently unobtainable.
2023-04-17 18:40:30 +01:00
Llinos Evans 7e8c16c5a6 Viridian Pre-Gym populated
This finishes Viridian Pre-Gym save for making trainers see you.
2023-04-15 19:50:49 +01:00
MementoMartha bb65963836 reworked disobedience, also new Tsubomitto sprite
turns out the last time we tried removing disobedience, pokemon wouldn't attack. also reworked the texts to remove references to it, as well as some SS Anne stuff
2023-04-12 12:03:40 +01:00
MementoMartha c7499a1fd2 Removing MissingNo to make room 2023-04-09 20:41:31 +01:00
MementoMartha 3d7d98c894 Adds in the rest of the regional forms
Also, need to fix an issue with the dex.
2023-04-09 16:56:30 +01:00
MementoMartha eda2d0db01 Sprites for the final regional forms
(also some updated sprites for Gapdos and Goltres. Gonna finish these up soon)
2023-04-09 15:02:04 +01:00
MementoMartha 4baf396498 Dugtrio-A and Ninetales-A! 2023-04-08 14:59:04 +01:00
MementoMartha dc4fe39707 actually adding the next batch of regional forms
Includes Golem, Rapidash, Exeggutor and Marowak.
2023-04-08 01:16:52 +01:00
Llinos Evans ed1ced807b Regional Trades!
- Regional trades now dummy out the "-A" thing etc so they look nice
- Added Celadon, Saffron, Viridian, and Vermillion regional trades
- Added Galarian Sidegrade trades to the S. S. Anne, but Perrserker and Sirfetch'd specifically don't work. I have zero clue why, as they work the same as the rest.
- Corrected grammar in the "Happy" text when you finish a trade
2023-04-08 01:05:15 +01:00
MementoMartha 24602dc972 Adding a few new regional form sprites
Also fixed an issue with the giant rat. He clearly makes all the rules.
2023-04-08 00:23:55 +01:00
MementoMartha 64a9fdbf00 A few Alolan forms!
Adds Raticate, Raichu, Sandslash and Persian. Also updates Hitmontop's sprite.
2023-04-06 12:29:09 +01:00
Llinos Evans 2299dcdc0e Bug fixes from playtest
- Puts back Channelers to allow progress for now; currently goes to undefined places
- Tweaked two trainer parties with odd mons
- Jessie/James sprite in proper place
- Put little girl text back because it caused a problem
- One Celadon Gym cut tree removed to allow cut-less progress
- Fixed the rival picking the wrong team vs eevee
- Fixed the rival loading wrong in s.s. anne
2023-04-06 02:22:34 +01:00