Commit graph

85 commits

Author SHA1 Message Date
Llinos Evans abaff60797 Refactor Giovanni's Room, restore Rocket Hideout B1F
With the way KEP is shaping up, the Rocket Hideout can easily stay with little issue. I don't expect it to be a problem at all. Therefore, in the interest of keeping Lavender Tower's progression the same, it's being restored. I do expect some Lavender Tower floors to be nommed, though.

I expect Silph to also be salvageable but I also really hate Silph.

Oh, also, the Game Corner guard has been buffed. He sucks. They call that a guard??
2023-05-02 02:48:41 +01:00
Llinos Evans 084e03efa1 Warps, ArticunoG, refactored Garnet 2F
I messed up Garnet Cavern's 2F name for some reason

Also added all the warps which are, ironically, exactly the same as the international Cerulean Cave. Added the event for Galarian Articuno but gee I hope the constant skip doesn't cause any issues
2023-04-30 19:12:59 +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 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 d5708ef12e Citrine Pokecenter, trade refactoring
I am tired of doing the Legendary wing event, so I'm populating Citrine City.

Some notes;
- I refactored the In-Game Trades to match their nicknames and re-distributed them.
- I swapped Fuschia's bench guy for the third unused one meant for the safe house, but I may outright restore these.
- I refactored the Pokecenter Hidden Objects to all use the same set - they're clones of each other, so this works out. This saves a TON of bytes and works fine.
- I placed the Harry trade for Kadabra/Alakazam in Citrine Pokecenter as it feels right for such a powerful Pokemon to be post-game.
2023-04-28 00:48:09 +01:00
MementoMartha ba78014ec6 Silph Gauntlet 4F trainers!
Includes the same healing pad that was in Lavender Tower, as a reward for getting halfway! Trainers can't currently see you, which I'll fix once I've added the trainers on 2F and 3F.
2023-04-27 19:55:35 +01:00
Llinos Evans f65e0dd3bf Groundwork for Galarian Bird event
This adds the first half of an event where you will find the Galarian Birds. It is not finished yet.

It currently bugs out when Galarian Zapdos tries to run away and I don't know why. Frame-by-frame, it seems to be when the player has to move. I've tried different things to make this less bad, but they don't work.

Here's how it's meant to go:
1) Articuno flies away (done)
2) Zapdos barges past the player like Silver does in GSC (bugs out)
3) Moltres moves in front of the player and engages (not done)

If anyone has a better way to do this, please let me know!

Minor changes;
- Connection for Brunswick-Citrine looks nicer
- Celeste has a few changes to make the event run easier.
2023-04-27 18:00:47 +01:00
MementoMartha 0b334abbf3 Silph Gauntlet 1F trainers!
Currently working fine except the trainers can't see you, which I'll try fixing soon
2023-04-25 03:15:43 +01:00
Llinos Evans ca1cc6af90 Some progress on the Chief fight
Right now I'm facing a weird bug where if you enter, you get the quote, but the fight doesn't start and it happens while you're stepping for some reason. Very odd.
2023-04-24 23:22:35 +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 2f01628cd9 Groundwork for Tradeback Move Tutor
Currently the move tutor is a little bit broken - the IDs are 1 above how they should be. Shell speculates that it's searching at the table starting from Kangaskhan due to the way the decrements shake up but it may just be making things more complicated than they are.

Big cheese code is `PrepareTradebackMoveList`, it's where things are mucking up.

Also, the code can be significantly optimised, as it's currently being adapted from the function above, `PrepareRelearnableMoveList`; It doesn't need to check levels, for example.

Note that the relearner functions properly, so use it as a reference. I may have removed something important.

Technically, we could have NO_MON as an entry which may make things shake out properly. But I'd rather have a proper fix.
2023-04-23 06:11:05 +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
dannye 772520c2c2 Merge branch 'master' of https://github.com/pret/pokered 2023-04-19 20:04:38 -05:00
MementoMartha 8ab3e1f2be Added Underwater Tunnel!
This is a cave that connects Bill's Lighthouse and Route 10, only accessible after Surf is obtained. Contains a static Dragonite as a reference to the anime!
2023-04-05 12:31:11 +01:00
May Evans bd23dfa61e Many, many tweaks (Move Relearner!)
- Move Deleter and Move Relearner are added, featuring updated code from Shin Pokered, which took the code from Mateo's Red++ hack. They replace the Trader in Celadon University. The code has been updated quite a bit to fit the modern standards of pokered.
- The Trader has been moved to the trade room in Cinnabar Lab, which is thematically appropriate.
- Eevee's L1 learnset now appropriately features Tail Whip; this was a mistake made by Martha when porting Yellow learnsets.
- Fast Text cursor slot is fixed
- New ROM Bank stores the new maps as it got full when adding the move relearner/deleter - Maps 21 will still have space though.
- WRAM has been fiddled with, please please read the notes if you edit the Move Relearner area, it needs quite a bit of space.
- Wild data for Mt. Moon and Route 22 has been tweaked a little bit.
2023-04-02 19:56:44 +01:00
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 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 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 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
Rangi f58dbe3849 Require rgbds 0.6.0 2022-10-02 21:14:23 -04: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 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
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 a1e009abb3 Dex entries! 2022-08-31 19:26:41 +01:00
May Evans 0c9da85a51 seems this is needed? 2022-08-31 17:45:23 +01:00
Rangi a66adbcc5c Sync Pokédex rating text with pokeyellow 2022-07-10 19:26:18 -04:00
Rangi b945988a0a Names for more SECTIONs 2020-07-07 14:45:24 -04:00
Rangi c9c59dc343 Reorganize constants/
To do: add comments associating constants with data and code
2020-07-03 12:44:47 -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
Nog-Frog 9c01ebc147 Change wGrassRate to wLinkEnemyTrainerName 2020-06-02 12:39:06 +03:00
Nog-Frog 39f0bcb987 Change "Set to box" to "Sent to box" 2020-05-26 15:14:46 +03: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
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
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 3a6a300da4 sync text 2016-06-12 10:11:31 -07:00
YamaArashi fd2235e678 sync engine code with pokeyellow 2016-06-12 00:52:13 -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
IIMarckus adc6a3aac7 Clean up script labels in marts and Pokémon Centers. 2016-04-08 19:04:36 -06:00
yenatch b852fe5b42 Use rgbasm -D in the makefile. 2016-02-17 15:33:01 -05:00
YamaArashi 8a5a7d8e68 fix typoes 2016-01-09 03:03:55 -08:00
PikalaxALT cd3eb9867b Fix a typo 2016-01-05 21:55:39 -05:00
IIMarckus 4c5c791264 Define text banks relative to the first one. Clean up address comments. 2015-12-06 20:52:46 -07:00
dannye 38065a744d No more W_ 2015-08-30 21:38:41 -05:00
YamaArashi 599a6aeaaf named battle and learn move variables 2015-08-14 00:36:06 -07:00