Commit graph

100 commits

Author SHA1 Message Date
Martha Schilling f9bbabbcca WE ARE TEAM ROCKET, YOU CANNOT BEAT US
- Adds a slightly remade version of the Rocket battle theme that plays when fighting Rocket Grunts, Jessie & James, and Giovanni (1 and 2)

- Giovanni 3 and Chief now share a new battle theme composed by myself and LuciShrimp, which is a slower, more intimidating remix of the regular Rocket fight theme.

- Gave Giovanni 3 his own trainer class, allowing for better AI routines and smarter move choices.

- Removed Giovanni's name from the Viridian City Gym statues to keep his identity a further secret. It also made more sense than in vanilla.

- Gave the postgame Morimoto fight a better selection of moves.
2024-01-06 17:11:31 +00:00
Martha Schilling fe651a7668 jojobear, our saviour
took out 4 bugs in one go, absolute legend
2024-01-02 11:17:58 +00:00
Martha Schilling 543ea46d8e Koichi unique trainer class!
Well, 'unique' is VERY loose here. He looks and behaves identically to a Black Belt still, just with a proper name and a higher payout. He replaces the unused Junior class.

In addition, I've brought back the text on the scrolls on the back wall in the Fighting Dojo that were accidentally inaccessible for a while.
2023-12-24 22:18:00 +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 f6cdf8d428 Legendary Theme Demake
It's done! This took a lot of work on LuciShrimp's end, mainly due to CrystalTracker issues.

This fixes the synchronisation issues seen in the previous iteration, dramatically improves the loop point, and has various other shifts to make it much easier on the ears.

I'm glad we chose to use the Mew version of the theme from Emerald, it feels much more complete!
2023-08-22 15:46:22 +01:00
Llinos Evans 77261d1dd6 Tweaks
Legendary theme hadn't received the proper rename, that's fixed. Also, this theme now plays for Snorlax and the Power Plant Voltorb/Electrode, just like LGPE.
2023-07-23 21:24:32 +01:00
Llinos Evans 08b976a08b FRLG Legendary Battle theme
LuciShrimp strikes again! A demake of the Legendary Battle theme from FireRed/LeafGreen.

This theme is set to change down the line, possibly taking elements from the Emerald theme Mew uses to differentiate itself more. Mainly committing as the infrastructure has been put in place.
2023-07-23 21:06:28 +01:00
Llinos Evans 41e7439496 Fix Mewtwo theme play issues
Mewtwo's theme wasn't playing properly because I am silly and forgot to add a `jr .playSong` so it doesn't fall through. Also, it needed to be before the wild check. Now it works as expected.

This also has the latest version of the Mewtwo theme by LuciShrimp, which is reaching a pretty amazing state.
2023-06-25 20:09:52 +01:00
Llinos Evans 9a24ec74d8 Vermilion Beauty Bug Fixes & more
- Vermilion Beauty no longer skips text to hand you your Pokemon
- Vermilion City text boxes are fixed
- Cancelling TMs and causing crashes when trying different ones is fixed (thanks to some old code by BlueZangoose, it was a vanilla bug!)
- Minor enhancement to the Candy Jar that seems to make Meltan more stable.
- Fixed a fallthrough error that caused Mewtwo's theme to play for every wild encounter (very cool, but also oops)
2023-06-22 18:54:25 +01:00
Llinos Evans c445892d7f S.S. Anne healer and other bits
This adds the S.S. Anne healer from FRLG that's notorious for gaslighting newer players who just think she's there.

This also adds an extremely early Mewtwo theme. It's far from finished, just happens to be in this commit as I was testing it in debug - thanks to Luci for working on this!

Updated bug list as well with things my friend Crunter found.
2023-06-21 21:06:08 +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 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 afc8d3caf0 DIGDA
This adds Digda01 and Field06 to the music repertoire, and has Digda01 be used in Diglett's Cave, as God intended.
2023-04-20 07:02:13 +01:00
dannye 8021cbdf04 Merge branch 'master' of https://github.com/dannye/pokered-crysaudio 2023-04-19 21:08:01 -05: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 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
dannye ebeb442fef Remove even more unnecessary original audio files
to avoid any possible confusion
2022-12-28 20:55:33 -06:00
dannye 3f691fcb21 Merge branch 'master' of https://github.com/pret/pokered 2022-12-28 17:38:38 -06:00
MementoMartha f74055e77b Removing version differences, and adding Mew 2022-09-25 14:03:04 +01:00
MementoMartha 6bc7108ac6 removing new music data for now 2022-09-01 02:52:49 +01:00
May Evans 109eb664d5 add the headers..?
this...should work
2022-08-31 16:14:38 +01:00
May Evans 445512b27e Add Field6 & Diglett's Cave
Credit to zumiisawhat!
2022-08-31 16:10:36 +01:00
May Evans c1d2bc7678 more fixes 2022-08-31 15:50:28 +01:00
Rangi bbb0e7e82d
Use the same music headers as pokecrystal (#382) 2022-08-11 21:23:08 -04:00
dannye bef36398c9 Update comment 2022-07-15 05:46:22 -05:00
Rangi 8f81e71f19 Identify some .asm_* labels 2022-07-10 21:11:03 -04:00
Rangi cc98f28227 Replace "branch" labels in SFX files with local names 2022-07-10 20:26:20 -04:00
Rangi d8c6817279 Replace "branch" labels in music files with local names 2022-07-10 20:26:20 -04:00
vulcandth 6b5be9129c
RGBDS syntax updates (#358)
New MACRO and DEF syntax
2022-06-06 17:25:31 -04:00
Rangi 157b593561 Use dn for wave instrument samples, like pokecrystal 2021-11-06 13:24:19 -04:00
SatoMew b155e59ffa Restore extra line breaks 2021-05-01 21:54:19 +01:00
SatoMew e2a70c9c43 Incorporate the suggested fixes 2021-05-01 20:42:12 +01:00
SatoMew ed11bfeca1 Identify the unused cry that was carried over to GSC 2021-05-01 15:44:43 +01:00
dannye 7c1825158f Remove noise instrument copies 2021-04-17 22:23:17 -05:00
dannye 218993bd19 Fix sound reset in PlayBattleMusic
the id check bandaid in _PlayMusic is no longer necessary
2021-04-11 12:14:22 -05:00
dannye 5eff10358e Merge branch 'master' of https://github.com/pret/pokered 2021-04-10 22:38:40 -05:00
Rangi 2954013da1 Trim extra newlines from some files 2021-04-08 12:51:25 -04:00
dannye b2afaae7ab Fix remaining uses of fade 2021-03-30 01:06:32 -05:00
dannye 37d3ba4b39 Fix alternate starts/tempos 2021-03-29 22:30:01 -05:00
dannye 3508dc8e1d Remove last few red audio variables 2021-03-29 00:42:28 -05:00
dannye c1278c478e Fix pokeflute in battle sfx
and other small improvements
2021-03-28 23:23:45 -05:00
dannye 459b5bd615 Misc clean up and small improvements 2021-03-28 02:23:54 -05:00
Rangi 95ec2cf039 Verify data table and name list sizes with assertion macros
Fixes #312
2021-03-25 16:44:41 -04:00
dannye e8dd755e18 Merge branch 'master' of https://github.com/pret/pokered 2021-03-23 01:19:51 -05:00
SatoMew 6989cdb8c6 And extend this principle to the filename as well 2020-11-30 21:17:38 +00:00
SatoMew f99446fccb Be consistent with the unused and unreferenced terminology 2020-11-30 20:09:51 +00:00
SatoMew 330fa33236 Rename the unreferenced fanfare's constants 2020-11-30 01:39:49 +00:00
SatoMew a7dca30971 Identify what became GSC's Key Item fanfare 2020-11-29 21:10:36 +00:00
dannye 66377fca32 Fix file modes 2020-11-14 20:52:10 -06:00