Commit graph

199 commits

Author SHA1 Message Date
Llinos Evans 21ca035aa1 Restore some lore and make Eon Mail and Egg Tickets obtainable
The Egg Ticket still needs its function to be usable, but is now at least obtainable in some way. This makes Buena's Password much, much more interesting.
2024-07-13 11:11:19 +01:00
Llinos Evans 36d0916e8e Pewter Museum of Science
Most things are now done. Blockset is presentable, so expansion can be done with time.

Things not done:
- Scarlet/Violet Books (I want to do these like Bill's favourite Pokemon PC from RBY)
- Computer things for a fossil machine (Take from the Oak Lab tileset I sorted in KEP?? Or do what the RoA place does? Both require tileset modifications and map expansion)
- Aerodactyl/Kabutops fossil displays.

Pretty good, huh?
2024-07-12 23:33:26 +01:00
Zeta_Null bd29d71e81 Pewter Museum
Works pretty okay but floor 2 is bugged. Don't go there right now unless you're trying to fix it.
2024-07-12 16:34:52 -04:00
Zeta_Null a0334348ce Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-12 13:40:23 -04:00
Zeta_Null 362eea36d6 Lavender Crypt/Haunted House tileset + other tileset improvements
- Lavender Crypt/Haunted house tileset added with custom palette
- Sideways cave added to one of the Nihon tilesets for the sake of quiet cave
- Citrine tiles added to kanto tileset. I forget if I was totally finished with it but it's probably fine
2024-07-12 13:40:16 -04:00
Llinos Evans 03162890a2 Route 49 - Old City Gate
- Added the gate for Route 49 and Old City in preparation for adding it
- Fixed a glitch in Quiet Cave where a PokeFan/Beauty would become Jesus
- Made the exit to Quiet Cave clearer

Kris experiences a microaggression in the gate because it's funny
2024-07-12 18:20:35 +01:00
Martha Schilling 9cc59ef14c Update descriptions.asm
Adds a newer description for the Egg Ticket we're planning to re-implement.
2024-07-12 12:11:53 +01:00
Llinos Evans 264e680290 PokeCom Center
This replaces the Goldenrod Pokemon Centre with the PCC. Further implementations haven't been made yet, it just exists.

Things to implement:
- Egg Ticket exchange
- GS Ball
- Regional trades
- Unreferenced text

Need to pay a closer look when I have actually got my PC with me...
2024-07-12 12:02:10 +01:00
Llinos Evans d8d111abf5 Fossil scientist is now functional tm
There's a couple bugs here and there, but it's good enough and I think the bugs are related to how I tested it.

Doesn't use specials because it seems to just cause comical glitches to occur.

The Museum and Ruins of Alph fossil guys will talk differently, implying they're different individuals. The Museum one talks like in HGSS, the RoA one talks like the RBY one and comments on the Unown researcher's lack of care for fossils.

Also reused some PokeCom centre lore.
2024-07-12 11:23:25 +01:00
Misty Cass 0b7b88d954 Gambling, Breeding, and Ressurection: My Kinda Night 2024-07-11 22:15:38 -04:00
Martha Schilling 577cd5d353 Reverting the changes I made to Rock Slash
Because fuck balancing, this is fun.
2024-07-11 23:38:35 +01:00
Llinos Evans 68436820a1 Fossil Scientist groundwork
This means the ROM won't build until Feradactyl and Decilla are implemented. Thanks Misty!

Event will activate on any NPC so long as you do this:
```
	faceplayer
	opentext
	special FossilScientist
	waitbutton
	closetext
	end
```
2024-07-11 22:19:08 +01:00
Llinos Evans 0923b49ca4 Berry Forest!
Worked on the map and added wild data. It's mostly Kanto stuff as it was in FRLG - the Sevii Islands are Kanto after all. Slowking in the water because there's not really anything else and it's kinda neat. Shuckle is in by Misty's suggestion.
2024-07-11 20:49:09 +01:00
Llinos Evans 0083f7a549 Altering Cave wild data and mapdev
This gives Altering Cave its appearance and wild data according to the current spreadsheet revision.
2024-07-11 18:54:34 +01:00
Llinos Evans 967e87462f Route 48 deets
Now has wildmons, a map, and a few signs.

It seems the map usually has street stalls, so we would need tiles made for this before the map is in a presentable state. Any ideas?
2024-07-11 11:53:01 +01:00
Llinos Evans fc0c97f3ad Lavender Crypt
Very barebones - just placed in the Soul House with wild data and so on.

Will add more when the tileset is improved.
2024-07-10 12:42:53 +01:00
Llinos Evans 91e1763395 Breakable rocks now have items, add Club Fossil 2024-07-10 11:06:37 +01:00
Misty Cass 03332bd5f2 A Bunch of Cool Dex Entriesgit add --a! 2024-07-10 00:02:17 -04:00
Llinos Evans d633cfbaa4 Like 40 new maps
The aim was simply to make the rom build with EVERY currently posited map in it. This adds EVERYTHING.

Ground rules;
- All temp maps are 10x10 cave tileset goons with nothing in them
- Connections are NOT done
- Fishgroups and music are likely incorrect and/or unfinished
- No wild data

This is extremely achievable, as numerous unreferenced maps are unused in the block and script banks. Makes doing this a cinch!

All of this basically means: You can get creative now and start brainstorming what to do with all these maps. Get them fleshed out, connected, and...not being nothing. It's like ordering in a bunch of blank canvasses. Go nuts!
2024-07-10 01:50:43 +01:00
Llinos Evans ae81f290d2 Buu and Grenmar? Nowaynowaynoway!
This required me to scrap some unused content from `load_font.asm`. However, this is only really a temporary fix - we need to decouple footprints.asm from it and make it load from separate banks to keep going.

Look at how Pokemon sprites are loaded for reference.
2024-07-09 20:20:51 +01:00
Llinos Evans b62062a82c marking b1f union cave onix for departure
no one is looking for 5% onix in the bottom of union cave have a grenmar instead
2024-07-09 19:17:05 +01:00
Llinos Evans d4e7821ec1 AHA! GOTCHA, YA LITTLE RAT! 2024-07-09 19:11:48 +01:00
Llinos Evans 4cbd8ab7c4 Minor grass tweaks
- Yanma is no longer available at night on Route 35.
- Ilex Forest has nighttime Kotora and some slight night encounter reshuffles.
- Mt. Mortar is given a slight wallop over the head, levels are dampened down a chunk.
2024-07-09 19:07:19 +01:00
Llinos Evans d336fdb9da Trainer tweaks
Increased Johto frequency a tad and added some more interesting bits.

I have labelled a bunch of unused trainers and put in some questions/prompts for further improvements

Levels NEED looking at by someone better than me (hi misty how r u)
2024-07-09 16:21:43 +01:00
Martha Schilling 12a828d981 Gavillain, stop messing with the poor Magnemite
This should hopefully fix a glitch where Magnemite was using Gavillain's stats and sprite dimensions.
2024-07-09 14:42:02 +01:00
U-DESKTOP-IKOGN35\wazzu ba90104879 Some Light Prep 2024-07-09 00:01:50 -04:00
Llinos Evans f8bd02f62d 9 more Pokemon!
Toedscool, Toedscruel, Blottle, Pendraken, Kolta, Balumba, Magnetite, Magnezone, and Gavillain.

Balumba has a small chance to hold a Fairy Feather, which makes it vaguely obtainable.

Kolta is now found in the day in the Burned Tower, whereas Houndour is seen at night. Technically balances it, right?

Gavillain is a rare Dark Cave encounter on the Blackthorn side, dragons and all that.

Balumba is a rare encounter in the National Park!
2024-07-08 12:45:26 +01:00
Llinos Evans 603073234a Implement Bug Catching Contest changes
I am really not sure about Tricules and Scizor being here, it's just so early...we can give it a whirl though. The day restriction alone seems to be enough of a balancing measure.

Added Heracross since we want that increased Johto frequency.
2024-07-08 00:31:13 +01:00
Llinos Evans 1e629ebc1a 11 new trainer classes
This adds the lost RBY trainer classes and a few unused ones. No sprites because I keep messing up the alpha channels among other things. I shall simply ask Martha.

Also spruced up the readme slightly.
2024-07-08 00:14:17 +01:00
Llinos Evans f53559e4e4 regional trade dialogset
Could be tweaked but is overall solid. Now ready to be used whenever.
2024-07-07 22:40:15 +01:00
Llinos Evans 1db44be609 Easier Rock Smash rates
Why did I do 90-10 splits??? Increase that Johto frequency smelly
2024-07-07 09:35:57 +01:00
Llinos Evans 62bdbe2a1b Terrados & Bug Fix
Fixes Molambino and Luanbo not evolving properly (oops) and adds Magiprey/Terrados. Since there's no place to put Magiprey in Johto or Kanto, this'll likely be a Nihon exclusive. Got some stuff in mind!
2024-07-07 09:27:46 +01:00
Llinos Evans b451ca81ce Charmada!
This required moving the base stat and cry files. Not tested, so someone ought to check...
2024-07-06 19:45:20 +01:00
Llinos Evans 4972915076 Luxwan
Now the random farfetch'd are worth catching!

Also I fucked up the channels on the sprite can someone get that
2024-07-06 18:16:45 +01:00
Llinos Evans d191b9c60b Uh oh...it's weirduck.
He's finally here. Performing for you. And he has a very, very funny face.
2024-07-06 17:43:35 +01:00
Llinos Evans 2f19d364ab Minor wild data changes
distributes qatu, stritcheel (making it correspond with remoraid), disturban, and ribbito; previously added by misty

also hi from paris
2024-07-06 17:01:06 +01:00
Martha Schilling a5f7d81202 The Rise of Dokuroar
Perhaps a little biased that I'm finishing this one first, but this one's my personal favourite BetaMon.

- Sprite from Pokemon October currently

- Changed the Debug Mode second encounter to a shiny, so easier shiny form testing can be done
2024-07-04 11:25:28 +01:00
Misty afbd0f7680
Violet Waters and Lush Trees! (#19) 2024-07-04 10:28:47 +01:00
Llinos Evans a03a7e4f7a Wild encounter updates
This boosts the levels on tons of encounters and distributes more Johto Pokemon (plus newly-added ones). Still a long way to go. More stuff labelled too.
2024-07-03 19:33:26 +01:00
Llinos Evans 5b831b6e81 Togekiss!
No sprite yet - someone will need to catch that
2024-07-02 11:52:43 +01:00
Llinos Evans c6b2bf0885 woohoo it's orfry 2024-07-02 11:31:10 +01:00
Llinos Evans ca092d9bd1 note 2024-07-02 10:41:18 +01:00
Llinos Evans 5f1e087fc2 ope 2024-07-02 10:28:48 +01:00
Llinos Evans 97612374a2 These need IDs on em!
Which are done with the capslock names!
2024-07-02 10:19:21 +01:00
Martha Schilling 4d0a61454c Bug Fixes, missing files, the ROM builds now 2024-07-02 10:15:48 +01:00
Misty Cass 8be411a6b6 Violet to Ilex - Setup 2024-07-02 01:09:42 -04:00
Misty Cass c209addf0b TEST 2024-07-02 00:15:27 -04:00
Martha Schilling 2bc2bbe800 Nihon Base Stats
Think this is all of them?
2024-07-02 01:05:45 +01:00
Llinos Evans 8968a9158f paradox base stats
scream and shox are done it seems
2024-07-02 00:25:11 +01:00
Llinos Evans 0aed6dcf50 Nihon & Paradox Part 2
Martha is handling the base stat files!
2024-07-01 23:56:05 +01:00
Llinos Evans 9f000f98f4 Nihon & Paradoxes Part 1 2024-07-01 21:26:31 +01:00
Martha Schilling af83085749 Gen 6+ Experience System
Makes the EXP. Share into a Key item and gives it to all party members.

Changed several item descriptions to be less garbage

Made the Dragon Fang boost attack like it should (Dragon Scale is left unchanged)

The Lottery now gives you a Lucky Egg if you win 2nd Prize, the EXP Share is still obtained from Mr. Pokemon
2024-07-01 18:58:19 +01:00
Martha Schilling 7554222e3c Random additions because Martha was bored
- Gave the Debug Room its own name and placement on the map, simply being '?????' and up in the top-left corner of Nihon.

- Added a feature where the shiny palette of a Pokemon can be seen by pressing Select on the Pokedex screen.

- Added preliminary sprites for Belledam, Bipulla, Burgela, Coinpur, Jungela, Pupperon, Stromen, and Tricules.

- Added preliminary shiny palettes for Bipulla, Bellignan, Burgela, Coinpur, Jungela and Tricules

- Changed Debug Room's layout again slightly

- Added another NPC to the Debug Room that gives you a bunch of useful items when spoken to, mainly all of the HMs and Apriballs, plus some Master Balls, Rare Candies and more.
2024-03-26 21:58:13 +00:00
Martha Schilling 44db4d67ed New and improved Poke Ball colour palettes 2024-03-26 10:11:57 +00:00
Martha Schilling adb9e3c540 Kirk, Shuckie and the Antique Pot
- Adds Pockle, an evolution of Shuckle based on cut data from early 1999. Uses a custom sprite reminiscent of Shuckle's early 'pot' design, with the base sprite being used in Pokemon October, then heavily edited by me.

- Reworked the Shuckie event entirely. Shuckie is now 5 levels higher and holds a Berry Juice, and their OT has been changed to the better name used in HGSS. Kirk now no longer takes Shuckie back from you after a day, instead giving you an incentive to raise Shuckie's friendship. Once you raise it high enough, he gives you the Antique Pot, which (currently) acts like an evolution Stone for Shuckle.

- Kirk now no longer checks for the species as well, allowing the sidequest to be completed immediately by showing him an evolved Shuckie. This does mean that this can be bypassed with the right OT and ID, but you basically need ACE or RNG manip to achieve that so its a non-issue.
2024-03-26 00:26:25 +00:00
Martha Schilling 393f2d7f1b why's there no south wind smh
- Adds WInd Ride, complete with a unique (and frankly, a bit over-the-top) animation. Learned by Shi-Shi at L1 and L70.

- Gave Aeroblast and Sacred Fire to Lugia and Ho-Oh respectively at L60, so that a Move Reminder isn't required to teach them those moves.
2024-03-22 00:26:23 +00:00
Martha Schilling 51a7593d6f These Fires be Gouging, yo
The bolts are also raging but they look fucking dumb so who cares

- Adds Gouging Fire and Raging Bolt, complete with sprites and learnsets. Gouging Fire was done by Zeta_Null, and Raging Bolt was done by Albatross, who did a great job at making the giraffe-necked smilodon look less ridiculous.

- Added a proper dex entry for Wake, based on the ones added in SV's Indigo Disk DLC.

- Fixed a bug with Lickilicky and Lickilord's dex entries where they weren't terminated correcly

- Made Rock Slash less obscene, now acting like Stone Edge without the raised crit chance.

- Changed the layout of the Beginning World (Debug Room) ever so slightly.
2024-03-15 20:56:55 +00:00
Misty 0721a89fea WE FORGOT WYNAUT 2023-11-19 03:20:34 -05:00
Misty 3ec32bd3d2 Feedback Fixes! 2023-11-19 02:24:44 -05:00
Misty 3d3bf94175 The Road To Violet City! 2023-11-19 01:31:28 -05:00
Misty 2da479b93c The Road To Violet City! 2023-11-19 01:21:35 -05:00
Misty 4b32634369 The Road To Violet City! 2023-11-19 01:18:49 -05:00
Misty e85c0ac4d6 The Road To Violet City! 2023-11-19 01:09:06 -05:00
Misty a9163e91f4
ASM Batch 6
11 new Base Stat files in order to prepare for additions up to Violet City!
2023-11-13 20:46:42 -05:00
Llinos Evans 5e55e217be Revert "Gym Scaling proof of concept"
This reverts commit 442b9b9956.
2023-11-05 12:21:28 +00:00
Llinos Evans 442b9b9956 Gym Scaling proof of concept
pokecrystal requires a very different approach to gym scaling. This is based on the phone code.

Could absolutely be revised in a myriad of ways.
2023-11-05 12:14:20 +00:00
Llinos Evans 19191608f3 why is she so smart 2023-11-04 11:34:49 +00:00
Llinos Evans be434c287e Cal and Silver's Houses
This covers everything but Blue's Lab.

Cal's House has Cal play the role of SW97 Gold, with his mother lamenting his leaving and his brother Ken praising his travels.

Silver's House is a carbon copy of the original. It's worth noting that Silver is less of an arsehole in SW97, so things could change wrt dialogue. This also violates some canon: It's heavily implied in HGSS onwards that Ariana is Silver's mother, chiefly because of her hair. It's worth noting that this hasn't been fully substantiated, and in GSC itself, Ariana has brown/purple hair in all interpretations, which is the basis for the theory. This warrants further discussion.
2023-11-04 11:19:21 +00:00
Llinos Evans aa3de1dbe2 Fully dynamic Pokecentres
This adds the Kanto Pokemon Centre maps, which combined with the Nihon versions, means every region has its own layout. This should make for some very immersive gameplay, no?
2023-11-04 09:29:49 +00:00
Llinos Evans c3065bd046 Nihon Pokemon Centre for Silent Hills
This adds the Pokemon Centre infrastructure for Nihon and Silent Hills's one.

For all future Nihon Pokemon Centres, they must refer to the 2F one for the warp, and the map blocks for 1Fs should use the Nihon variant.

Kanto will follow suit (eventually). The aim is to make a more immersive region structure.
2023-11-04 04:40:36 +00:00
Llinos Evans ebab1da7b4 Route 49_2
This completes the SW97 demo content, featuring translated text!
2023-11-04 02:54:06 +00:00
Llinos Evans e7fb81e28e Quiet Cave
This adds Quiet Cave, with all the relevant details. Wild Pokemon still don't appear, though.

I defined it as a route, as if it were a cave, the Pokemon would jump out anywhere, regardless of grass.
2023-11-04 01:47:45 +00:00
Llinos Evans 9c824b3c5e Nihon Route 49, Folage, and Barreau
This commit adds Nihon Route 49. It has everything necessary to work, but the wild Pokemon don't seem to spawn. I've added infrastructure that should allow this to happen, and it works for Kanto, so I am presuming that some other tomfoolery is at work.

I've also added Folage and Barreau, and implemented Folage into the Headbutt Tree table. This was to give them to the Bug Catcher on the route.
2023-11-03 22:17:30 +00:00
Zeta_Null e9cab6db16 Snowy tileset palettes + Blue Forest start 2023-11-03 17:34:54 -04:00
Zeta_Null 2a3547c22e Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-11-02 15:53:54 -04:00
Zeta_Null 452e2ecb0f Nihon Tilesets
Blocks aren't set up properly yet but ASIDE FROM THAT
2023-11-02 15:53:47 -04:00
Llinos Evans bd35a6c862 Cubburn and Palssio families
This adds the Cubburn and Palssio families; Silent Hills can start proper development from here.
2023-11-02 14:37:12 +00:00
Llinos Evans 4c1d1132aa Cliff Cave & bits
This fully adds Cliff Cave itself. The rest of the route isn't there, but you can access the cave via the Debug Room, featuring a crudely made cave structure.

I've also modified the Rock Smash wild data to feature some additional Pokemon. The Beach has a 20% Corsola, and Dark Cave has a 20% Phanpy, among other bits. Level scaling has also been applied.

The Cliff Cave music isn't right, I believe...but I don't know what it's actually meant to use, I haven't played HGSS since it was current gen.
2023-11-02 12:00:07 +00:00
Zeta_Null 48590894b2 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-11-01 17:27:18 -04:00
Zeta_Null 5e86c93aa7 Nihon Map but GOOD 2023-11-01 17:27:11 -04:00
Llinos Evans a91b7fd2a1 Rock Smash, but good
Adds new rock smash wild data categories. Somehow, the functionality for this existed in-game, they just...didn't use it.
2023-11-01 21:23:39 +00:00
Zeta_Null d9bc71f5de Sinjoh Ruins test track!
Not broken up about it if we decide to just go with a demake of the original song for the sinjoh ruins but if we want a more original one here's a thing I slapped the fuck together lol

Currently plays in the Debug Room.
2023-11-01 00:38:02 -04:00
Zeta_Null e8482b7991 DEBUG ROOM!! 2023-10-30 17:44:30 -04:00
Zeta_Null bb95a16dcc Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2023-10-30 12:04:48 -04:00
Zeta_Null 1a919e157a Partial pewter museum fix attempt (still broken. Can't tell why) 2023-10-30 12:04:41 -04:00
thornAvery b0ae5b0c6d
Pokegear Map Fix + Minor Fixes (#13)
* pokegear townmap shows correct region + doest OOB

* fixed route data
2023-10-30 16:01:11 +00:00
Misty 5d1bf81944 Merge remote-tracking branch 'upstream/master' 2023-10-29 18:08:50 -04:00
Misty Violet d76255ec9f Stretchy Vines, Stretchier Tongues! 2023-10-29 17:57:22 -04:00
Llinos Evans 0f76cfc488 17 new Pokemon!
New Pokemon have been added and distributed across the region.

Leafeon
Glaceon
Sylveon
Coinpur - Night time on early routes over Rattata. I want to make an argument for branch evolving into Moibelle at night or if female.
Perrserker - Unobtainable for now.
Gentlarva - Ilex and Viridian Forest.
Pupal - Evolve Gentlarva.
Carapthor - Evolve Pupal.
Kotora - Mt. Mortar outside, Viridian Forest.
Gaotora - Evolve Kotora
Gorotora - Evolve Gaotora
Raitora - Evolve Kotora
Bittybat - Union Cave and other early routes.
Paraspor - Ilex & Viridian Forest
Vulpiii - Route 36, Burned Tower 1F
Annihilape - Trade Primeape
Pupperon - Route 36, Route 37, Burned Tower B1F
2023-10-29 21:41:15 +00:00
Llinos Evans e150889975
Merge branch 'master' into master 2023-10-29 17:39:31 +00:00
Llinos Evans dafc4aada7 Gorochu
This is the first use of the placeholder graphic. Works like a charm - copypaste the folder whenever you add something new.

This required me to change the layout.link for cries but it seems to work just fine. Earthtron cry is now available for use on other Pokemon, which I think could be neat for Shi-Shi.
2023-10-29 14:13:11 +00:00
Llinos Evans ca8608a0c9 Restore Remoraid to Route 44
Free my mans

also why did they keep this unused lmao
2023-10-28 20:06:48 +01:00
Misty Violet 672cefbd96 The Big Bad Bugs and the Lunar Lord! 2023-10-28 01:46:11 -04:00
Llinos Evans 56bf3ef2b0 Finish Lake of Rage "town"
Well, sort of. There's still a lot you can do with Pryce's House, it needs more things.

I want to make it so Pryce only appears when the Red Gyarados has been defeated. Maybe he can give a TM or something too.

This commit does the following;
- Fix the weird landmarking because I was a dumb stupid idiot.
- Adds all the relevant signs.
- Adds Pryce's House over where the gym was. Just a cute, quaint little place.
2023-10-28 00:03:23 +01:00
Llinos Evans c1fa88db2a Running Shoes, new readme, Munchlax
This adds a readme with credits so far. Make sure to keep this updated so everyone knows what is and isn't done!

We also get the Running Shoes feature from the tutorial, finally making debugging bearable given how laggy Crystal's overworld can be at times.

Oh, and Munchlax.
2023-10-27 21:59:33 +01:00
Martha Schilling 143fa7f521
Merge branch 'ZetaNull:master' into master 2023-10-27 18:06:34 +01:00
Martha Schilling 245680d2ca Update evos_attacks_johto.asm 2023-10-27 18:05:55 +01:00
Llinos Evans 5669dce327 Kanto level buffs
This makes Kanto Pokemon be ~L30 minimum, then L40 from L20 onwards, then L50 from L30 onwards.
2023-10-27 17:49:00 +01:00
Llinos Evans 4c292d29b1 Route 45 encounter update
Increases frequency of Phanpy encounters to be morning/day and replace Geodude in that time span. Adds 5% Jigglypuff from Silver that was removed (you'll see a lot of silver additions, it was a very based game)
2023-10-27 17:28:18 +01:00
Martha Schilling 37fbf884f3
Merge branch 'ZetaNull:master' into master 2023-10-27 17:09:09 +01:00