Commit graph

686 commits

Author SHA1 Message Date
Martha Schilling e6763371e4 AI Improvements
This fixes some of the issues with the current AI system to make them better. In short:

- Most Trainers should correctly recognise when a move is not very effective, and not use it. If they have a supereffective move and a regular-effective move, they will slightly prioritise the supereffective one, but not always use it like in regular RBY. This prevents the Lorelei softlock, for example.

- Trainers won't attempt to set status effects on Pokemon that already have one, won't try recovering at full health, and won't attempt to set up multiple Reflects or Light Screen

- Certain high-level trainers will recognise when a Pokemon does not have a status, and will try to inflict one if so. This makes Agatha's, Erika's and Koga's team types much more effective.

- Youngsters and Cue Balls no longer pick moves randomly and will actually give it some thought

- Brock and the Engineers now recognize type effectiveness, Students do not given how early they're encountered.

- General improvements to move choices for all Gym Leaders, E4 and Shinjuku Jacky.

We're almost done.
2024-01-05 13:59:27 +00:00
Martha Schilling 185e598a2e PureRGB move enhancements + Nasty Plot and Fake Tears animation fix
Just a bit more to go! Added improved animations for the following moves, mostly taken from Vortiene's PureRGB hack:

- Struggle (user now shakes before attacking)
- Fire Punch (added sound effects)
- Ice Punch (added sound effects)
- ThunderPunch (added sound effects)
- Swords Dance (increased duration by adding an unused subanimation)
- Fairy Wind (changed sound effect)
- Jump Kick (much more detailed, user's sprite dips down before attacking, and the hit is carried upwards)
- Rolling Kick (user now shakes before attacking)
- Thrash (user now shakes before attacking)
- Iron Head (changed sound effect)
- Poison Sting (added new graphic that looks like a needle being fired at the opponent)
- Twineedle (added new graphic that looks like a pair of stingers being fired at the opponent)
- Pin Missile (added new graphic that looks like a needle being fired at the opponent)
- Hydro Pump (the first half of the attack now looks more like a blast of water instead of two rising colums of water)
- Ice Beam (screen briefly brightens when used, added sound effects)
- Blizzard (added sound effects)
- Aurora Beam (screen briefly brightens when used)
- Submission (much more detailed animation that shows the user falling back to the ground after the attack)
- Draining Kiss (added Lovely Kiss' animation to the first half of the attack so it wasn't a clone of Absorb)
- Growth (increased duration by adding more subanimations)
- PoisonPowder (the palettes temporarily darken slightly when used)
- Stun Spore (the screen temporarily lights up slightly when used)
- Sleep Powder (the screen temporarily lights up slightly when used)
- Dragon Rage (increased duration by adding more subanimations)
- Rock Throw (changed sound effect slightly)
- Agility (user now shakes when used)
- Night Shade (the screen inverts colours temporarily when used)
- Recover (changed sound effect slightly)
- Focus Energy (reused its unused animation)
- Egg Bomb and Magnet Bomb (sound effect changed)
- Spike Cannon (added new graphic that looks like a needle being fired at the opponent)
- Amnesia and Nasty Plot (completely new animation that doesn't reuse the confused animation)
- Kinesis (completely new animation, looks more like a psychic move now)
- Hi Jump Kick (much more detailed, user's sprite jumps up before attacking, then lands afterwards)
- Dream Eater (changed sound effect, now has HP drain animation
- Sky Attack (changed sound effect and subanimation)
- Dazzling Gleam (the screen now turns wavy like Psychic after the initial flash)
- Hyper Fang (the screen flashes for a moment when the attack lands)
- Tri Attack (added the fire, ice and electric elements present in later animations, but note that the move still has no secondary effect)
- Fake Tears (completely new animation that involves the user literally shaking and crying)
2024-01-03 21:41:24 +00:00
Martha Schilling 60beb4fb97 we're so back
it's no longer jojover

jojobear you legend thank you for figuring this out
2024-01-01 20:44:50 +00:00
Martha Schilling 75c66e5069 Update main.asm
lol it actually builds now
2023-12-21 14:27:54 +00:00
Martha Schilling 508a4e790e The Big One.
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

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

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

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

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

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

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

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

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

- Garnet Cavern is now properly listed as a dungeon map

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

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

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

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

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

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

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

- Fixed a bug preventing the trade for Haunter from being accessed.
2023-09-19 23:34:25 +01:00
Llinos Evans 4de0a13543 So it "works"...
This now, technically, works.

However, the Battle Tent was seemingly made with the assumption trainers are Pokemon, which our hack has moved from. I've made it so it can load it as a trainer battle properly, but you will deathwarp. I need to implement a scripted loss system.
2023-05-13 19:07:16 +01:00
Llinos Evans ec61a039b8 Battle Tent Port
This is...most of the stuff necessary for the Battle Tent to work. I've faithfully restored most things so far, including doing a few grammar tweaks.

Main issue is that we get a really strange softlock when the Pokemon selection menu comes up. Not sure why, but point is, it can't progress to the next bit for debugging like this. Committing now to ask for assistance.
2023-05-13 02:50:31 +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
Llinos Evans 53e96553dd Fix evolution bug
Caused by `base_stats.asm` not being in the same bank aa `evos_moves`.
2023-05-02 21:59:08 +01:00
Llinos Evans 4d40fe09f0 Groundwork for Garnet Cavern
Currently just uses the RG Unknown Dungeon map, which should be changed accordingly. The warps and stuff outside of basic entry aren't implemented.

Has a halved encounter rate compared to other maps, which matches the idea that caverns don't sustain much wildlife.

Mt Moon theme may not be used in the final product.
2023-04-30 17:06:44 +01:00
Llinos Evans 760121d8fd Adding the last of the used moves
Dark Void and friends aren't in and probably won't be, I dunno yet.

I think Kowtow Cleave is really badass so I gave it to Night Slash too.

Scream Tail and Barunda now have Disarming Voice, which also has its own sound, which is basically Sing but a bit different.

Fake Tears was given its own subanimation to account for the fact it's basically a Water Gun used on yourself.

The FIGHT debug function helps a lot with this whole thing, so test with that.
2023-04-29 21:00:17 +01:00
Llinos Evans 4ca269c429 Fix overflow & brunswick
Added a unique bank for evos_moves, which includes tradeback move tutor data.

Also, fixed brunswick's map parameters.
2023-04-24 00:58:56 +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
dannye 772520c2c2 Merge branch 'master' of https://github.com/pret/pokered 2023-04-19 20:04:38 -05:00
Llinos Evans 77fd55ea49 Add regional trades, break trade limit
All over the place! S.S. Anne doesn't work properly though.

Thanks to Chatot4444 for bypassing the trade limit.
2023-04-09 18:56:19 +01:00
May Evans 4669dbc53a Extra trainer classes, new bold P
I changed the P image to match the font used in the prototype assets.

Also, because Yujirou has a pic all alone in that one bank, I added the other 4 beta trainer classes that never got used. They're all ready to be used, just need teams and a place to go, but I want to address trainer line-ups last code-wise.
2023-04-04 19:28:02 +01:00
May Evans eb46fbdaf6 Pikachu/Eevee Mode Part 2
Thanks to Frrf for helping me fix the broken code I initially sent in. This commit refines the mode so that the Oak Lab cutscene is finished and the party picking process is all concrete.

Also, given Surge is a fight, the S.S. Anne Pikachu rival can have Raichu, surely...

Also, the UnusedNames files were, in fact, needed...otherwise, the item names get all corrupted. Probably left some code behind.

So we officially have a new funky mode!
2023-03-28 19:07:51 +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 efe2d446a1 Item Descriptions!
Added using this tutorial:
https://github.com/pret/pokered/wiki/Item-Descriptions
Credit to Rangi for the baseline code!

Updated Candy Sack -> Candy Jar as discussed a while ago too.
2023-03-08 03:27:32 +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 a8f7c62ffe Fixing the recover bug! :D
Also some minor text and trade updates, too
2022-10-13 17:18:23 +01:00
Rangi f58dbe3849 Require rgbds 0.6.0 2022-10-02 21:14:23 -04:00
emaskyesmogon fe4dc821fd Talk to Use Cut. Strength and Surf 2022-09-07 17:09:12 -06:00
emaskyesmogon 5944210393 Eevees and More
Adds the five eeveelutions we don't have, evo items for Glaceon and Sylveon, fixes Rhyperior's dex entry, renamed the Super Rod to Fishing Rod, and commented out the OW Crocky/Kabutops for now
2022-09-01 08:37:35 -06:00
MementoMartha a1e009abb3 Dex entries! 2022-08-31 19:26:41 +01:00
MementoMartha 1ef523b2f5 Improving the picture system 2022-08-31 18:17:14 +01:00
dannye 66377fca32 Fix file modes 2020-11-14 20:52:10 -06:00
Rangi 407b813250 Separate splash screen, intro, and credits (like pokegold/pokecrystal) 2020-08-28 09:54:57 -04:00
Rangi cd71ae03af Separate move/battle animation data from move data (to do: further identify animation data labels+constants) 2020-07-16 19:50:48 -04:00
Rangi 4b4ad9894e Disassemble the BLUEMONS.GB debug ROM 2020-07-15 13:35:39 -04:00
Rangi b945988a0a Names for more SECTIONs 2020-07-07 14:45:24 -04:00
Rangi f9dc42a740 Factor out Mew's pics and base data 2020-07-03 22:59:12 -04:00
Rangi a5375a0805 Factor out graphics INCBINs from main.asm to gfx/*.asm 2020-07-03 17:43:55 -04:00
Rangi 62e137f6ce Factor out data/sprites/ 2020-07-03 16:58:55 -04:00
Rangi ccb01731fe Make suggested edits:
- data/mapWilds -> data/wild/maps
- diglett_sculpture.asm -> book_or_sculpture.asm
- relocate some audio/music constants
2020-07-03 15:57:35 -04:00
Rangi e882708b85 Split up engine/events/hidden_object_functions 2020-07-03 13:23:51 -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 87ef75c173 Add engine/movie/oak_speech/ subdirectory 2020-07-03 01:11:23 -04:00
Rangi 881e005970 INCLUDE "engine/pokemon/bills_pc.asm" in main.asm, not audio.asm 2020-07-03 01:09:58 -04:00
Rangi f275790aec Add subdirectories to engine/ similar to pokecrystal 2020-07-02 23:30:21 -04:00
Rangi 209ecc1919 Merge pic/ into gfx/ 2020-06-27 21:43:32 -04:00
Rangi d5089d3c62 Organize gfx/ 2020-06-27 21:43:32 -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
Rangi c779602459 Rename map files, labels, and constants to be consistent and work with Polished Map 2019-01-01 23:33:10 -05:00
luckytyphlosion dcaca64f5e Clean up pre-linkerscript remnants. 2018-11-18 18:29:24 -05:00
Pokeglitch 9b6f57832e Another map header fix 2018-07-28 15:56:50 -04:00
Pokeglitch ae2c1036ea Fixed some map header files 2018-07-28 15:51:17 -04:00
yenatch f75049feef Use rgbgfx and c tools instead of the submodule. 2018-03-10 18:53:04 -05:00
Remy Oukaour 819b678909 INCBIN don't start with tabs 2018-01-29 12:05:06 -05:00