Commit graph

72 commits

Author SHA1 Message Date
Martha Schilling 27bda7052d Two new(?) music tracks
I was gonna push the rest of the 1.3 stuff at the same time, but these are probably the biggest additions so I'm committing them now just to be safe.

- Made a variant of the Gym Leader battle theme that's pitched down a bit, using it for the battles against the Elite Four (basically what Diamond and Pearl did for its own Elite Four theme). Oak uses it too, given his apparent involvement with the Pokemon League as shown by the email in his lab and his history with Agatha.

- Also, a slower, heavier pitched version of the Rival's encounter theme has been added, which I'm thinking will play in his Pokemon League room if it gets used. This one currently can't be heard in-game, it's just in the files and will stay there until 1.3 comes out or until it gets cut.
2024-02-02 21:07:13 +00:00
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 5859ea25ea Giovanni's Room theme
okay look I did this months ago and now I'm finally pushing it

This gives Giovanni's Room its own theme, which is a slower-tempo version of the Rocket HQ theme that's missing channel 1.
2023-12-27 22:18:23 +00:00
Martha Schilling 9c35a2c12c oh my god why did i forget to push this
- Added LuciShrimp's amazing demake of the Area Zero theme! Plays in Mt. Moon Crater.

- Lickilicky now has access to Explosion and Selfdestruct.

- Sirfetch'd forgot how to Fly.

- Steelix is now even more susceptible to getting BubbleBeamed to death since it now has 10 less base Special.

- Small changes to a handful of trainer parties.

- Changed some encounter tables, mainly making Ramoose more scarce and Tangela more common.

- Blissey, Magmortar and Rhyperior all receieved updated sprites by Albatross!

- Jynx also receieved an updated sprite, giving it the purple skin it has in later generations.

- Minor level changes.

- Updated README.
2023-11-03 13:20:31 +00: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
Martha Schilling 85e1701879 okay this should be okay now
clearly I messed up somewhere
2023-07-11 00:40:58 +01:00
Martha Schilling f6efd42dd8 Revert "Initial Citrine City music"
This reverts commit ea3727e5b5.
2023-07-11 00:38:55 +01:00
Martha Schilling 5c18ca9f75 Initial Citrine City music
- Citrine City uses its own music track, being a revamped version of the unused trading music that was thought to be a town theme for several years. Could still use some work though.

- Improved Crocky's sprite a little, giving it the proper dimensions and improving the hairstyle a tiny bit

- Fixed an issue with Sylveon's Level 1 learnet
2023-07-11 00:38:22 +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 86230c64f1 New Citrine map architecture, Kinchou01
This adds all the required architecture for the new maps to work, as well as Kinchou01 to play when in Celeste Hill itself.

This doesn't add the events, though.
2023-06-14 22:49:03 +01:00
Llinos Evans 082e581d81 Mt Moon Square, Jessie & James Backport
This adds Victory4 in its original form over Mt. Moon Square's music, which could possibly have the initial jingle removed. I noticed the GSC version was being used, which wasn't ideal.

Mt. Moon Square's map is added, with accessibility where the Crater's originally was (for now). One warp on the south part of the map doesn't go anywhere (actually it's a glitch city). The shop and Clefairy event aren't done yet.

The Mt. Moon Crater Guard has been removed with the pretence of re-adding him on the Square map once it's finished.

I'm trying out having the text in the raw script file without farcalling, which seems to be more optimal than doing it the way the devs originally did it. The Battle Tent does this too.
2023-05-15 19:26:42 +01:00
Llinos Evans 16e3c69ee8 Giovanni uses his unused theme, and more!
This update does a good few things. Giovanni now uses his unused encounter theme in all pre-fights, which is followed by the regular evil trainer theme when you're about to fight him. This feels very correct. His team has also been minorly altered.

I backported LGPE's pre-fight monologue for Giovanni in Rocket Hideout B4F. Adapted for RB's story, of course, no Cubones here. The original text is very awkward and abrupt, and it also makes the encounter theme feel much more effective in delivery. I think a lot of people can appreciate this.

I also backported Jessie and James for Rocket Hideout B4F while I was at it. I had to change their event script quite a bit for it to fit, and their walking seems...awkward. Regardless, it's functional. The rest will be done with time.

To make future dev door testing easier, I'm keeping all warps I've previously used in comments.
2023-05-05 04:48:58 +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
MementoMartha 707e3ae7a9 Lavenbar Island-Town
This is an attempt to recreate the music in the video below. Still unfinished as the new channel isn't in sync.
(https://www.youtube.com/watch?v=60toSFxt_Jo&t=59s)
2023-04-20 21:28:48 +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 5357fee84f Update TCG2 songs
they actually don't sound half bad now!
2023-01-14 00:09:25 -06:00
dannye fc059d36af Remove the inc_section macro
the idea is nice, but it thwarts make's dependency change detection
2022-12-28 21:25:19 -06:00
dannye 3f691fcb21 Merge branch 'master' of https://github.com/pret/pokered 2022-12-28 17:38:38 -06:00
Rangi f58dbe3849 Require rgbds 0.6.0 2022-10-02 21:14:23 -04:00
Rangi bbb0e7e82d
Use the same music headers as pokecrystal (#382) 2022-08-11 21:23:08 -04: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 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
dannye e8dd755e18 Merge branch 'master' of https://github.com/pret/pokered 2021-03-23 01:19:51 -05:00
SatoMew ae0e2fd194 Fix reference to unused_fanfare.asm 2020-11-30 21:34:29 +00:00
SatoMew a7dca30971 Identify what became GSC's Key Item fanfare 2020-11-29 21:10:36 +00:00
Rangi bc287b9b80 Some formatting changes 2020-10-19 20:26:35 -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 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
dannye 6574881cda Use generic names for noise instruments
coming up with satisfactory names is hard, besides this will improve compatibility with crystal
2019-07-28 17:29:35 -05:00
dannye 20c4116788 Update audio macro names
change audio channel numbers from 0-7 back to 1-8
change all note macros back to single note macro
todo: fix comments with old macro names, update noise macros/instrument names
2019-07-27 23:21:39 -05:00
Rangi f99a715fae Replace some hard-coded values with constants 2019-07-07 00:44:21 -04:00
dannye e538d12236 Update home/audio.asm from pokecrystal 2019-04-21 19:37:53 -05:00
dannye 735d5bd4c2 Manually merge pokecrystal audio files
and remove more CrystalComplete leftovers
2019-04-21 15:13:17 -05:00
dannye 094594bffb Remove leftovers from CrystalComplete 2019-04-14 13:41:06 -05:00
dannye b1108ba91e Merge branch 'master' of https://github.com/pret/pokered 2019-04-13 17:21:23 -05: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
dannye 7a9a1b1e55 Fix typos in comments 2017-06-24 15:01:43 -05:00
dannye 87eed68710 Insert Crystal audio engine and music
most credit goes to Sanqui
2017-05-07 15:30:08 -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
dannye 5207a14af3 Redo audio header macro 2016-07-27 22:08:13 -05:00
dannye 84c7985e67 Fix sound effect channel numbering
mostly so that sound effects that only use the noise channel are
labelled 'Ch7' instead of 'Ch1'
2016-07-27 19:30:57 -05:00
dannye a51037eeee Remove the last address comments
except for wram.asm and sram.asm
also delete unused yellow file
2016-06-12 02:19:44 -05:00
YamaArashi 7f34e28f24 remove address comments 2016-06-11 17:24:04 -07:00
dannye 38065a744d No more W_ 2015-08-30 21:38:41 -05:00
dannye dfc152d667 No more $C8
Use OPP_ constants separate from trainer constants since
valid opponents can be all Pokemon and trainers
2015-08-10 11:09:16 -05:00