Commit graph

673 commits

Author SHA1 Message Date
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
AntonioND 52adb844de Revert "Fix floating sections"
This reverts commit cec6e6e2fb.

Signed-off-by: AntonioND <antonio_nd@outlook.com>
2017-03-21 01:12:49 +00:00
AntonioND cec6e6e2fb Fix floating sections
This is needed to prevent rgblink from moving them around in future
releases.

Signed-off-by: AntonioND <antonio_nd@outlook.com>
2017-03-14 21:45:45 +00:00
YamaArashi bf67f7174d split code out of main.asm 2016-12-31 17:23:54 -08:00
YamaArashi c2381bb3e6 split bank 1 into files 2016-09-17 18:17:57 -07:00
YamaArashi 6f1ac06e03 pull some bank 1 code out of main.asm 2016-09-17 17:37:32 -07:00
dannye 7c01509b6b Merge branch 'master' of https://github.com/pret/pokered 2016-07-18 01:32:24 -05:00
dannye 80bae03975 Clean up text commands 2016-07-18 01:17:03 -05:00
YamaArashi bcb251261d sync tileset WRAM labels 2016-06-12 01:07:52 -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 674b4dcc4a Remove the Beach House option. 2016-06-07 23:55:55 -06:00
dannye 5facf8377a No more wram_constants.asm
unfortunately, this means manually declaring the wEnemyMon1 party struct
2015-08-30 22:05:50 -05:00
dannye 38065a744d No more W_ 2015-08-30 21:38:41 -05:00