Commit graph

93 commits

Author SHA1 Message Date
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
Rangi 76289dfda0 Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal 2020-07-17 15:58:06 -04:00
Rangi 30ecbf6ea3 SONY -> RIVAL 2020-07-17 13:27:27 -04:00
Rangi 7306c1dc2d Define constants for audio commands 2020-07-16 13:25:02 -04:00
Rangi f37cf959c9 Clean up some data, using macros for multiline list entries 2020-07-14 13:32:09 -04:00
Rangi 772fcc7588 Specify the ldh instruction, don't turn ld into ldh 2020-07-06 19:03:05 -04:00
Rangi 6ef36800b0 Replace raw hex values with HRAM constants
To do: turn constants into labels and use ldh
2020-07-03 22:22:09 -04:00
Rangi 9878f01e29 Organize macros/ like pokecrystal
While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
2020-07-03 16:37:47 -04:00