Commit graph

253 commits

Author SHA1 Message Date
U-DESKTOP-IKOGN35\wazzu 89ea76e75e Challengers Approaching! 2024-07-24 18:07:16 -04:00
Zeta_Null 4f728f1697 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-24 17:21:59 -04:00
Zeta_Null 9a0858971d White city exists now 2024-07-24 17:21:50 -04:00
Llinos Evans 8f81afde08 ah! kurt was very interesting!
His trainer class was タマしょくにん - basically "Ballsmith". let's give him that!
2024-07-24 20:47:31 +01:00
Llinos Evans 66c71c1a97 PvK has the goods
This adds a ton of overworld sprites, some from KEP, others from SW97/99, for you all to mess around with. It also adds the prototype trainer sprites from SW99 to use with the old trainer classes, though some don't have modern GSC shading.

Unfortunately, the SW99 trainer sprites need palfixing and my PC can't be fucked running it for some reason.

Lots of potential here, particularly with making Mediums now use their distinct sprites, and having Channelers to fit into the mix. I'll be using these when fleshing out the Haunted House and Lavender Crypt.

South Guy still doesn't have a name, so internally, they are called such.

Green from KEP/TPP Anniversary Red has been imported too, because she's awesome like that.

Yes this commit has the cat sprite. All rise for the best thing ever.
2024-07-24 20:40:44 +01:00
Llinos Evans 5b889aedaa Update Lickilord & Jungela learnsets
Taken from SW97, seemingly an oversight. I think they should be there, the slow levels are pretty fitting if you're a "no u got stoned L ratio die" guy
2024-07-24 08:39:23 +01:00
Llinos Evans c31ef9c3cb Kazeppelin can be broken again
idc if the jep ouers think it's broken they can just ban it
2024-07-24 06:37:58 +01:00
Zeta_Null 2e8ae9cf14 Nihon mart is red now. 2024-07-23 16:59:41 -04:00
Zeta_Null 2c4c8e1a34 Old/Sepia City tweaks 2024-07-23 15:38:27 -04:00
Zeta_Null 930573db0f Merge branch 'master' of https://github.com/ZetaNull/jep-hack
# Conflicts:
#	data/tilesets/nihon_old_attributes.bin
#	data/tilesets/nihon_old_metatiles.bin
#	maps/OldCity.ablk

Just going to redo what I did after this whoops
2024-07-23 15:17:46 -04:00
Zeta_Null 9c53a93df0 Minor tileset tweaks and SGB color tweaks 2024-07-23 15:08:03 -04:00
Llinos Evans 8ec7b027fd Sepia School
Adds a prep-style school to Sepia City, which talks about all those super intricate GSC mechanics. It also gave it the May98 front porch and sign.

I like to imagine they all have their little Munchlaxes being trained up, maybe stockpiling on Ultra Balls to catch their first Zapdos too.
2024-07-23 15:24:55 +01:00
Llinos Evans e944e11479 Old City is now Sepia City, two houses
Earl now lives in Sepia City and alludes to White City, family house added too. City renamed Sepia City.
2024-07-23 12:50:30 +01:00
Llinos Evans 4eb81eec25 OId City
This implements Old City, the Honey Grandma's House, and its Pokecenter+Mart. Bunch of other bits and pieces not added yet, need to figure out the lore for them.

Honey Grandma is designed to make it easier to get important Pokemon, rather than give access to anything new. Thus, she's Nihon-locked by being an Old City resident. Martha's Perfect Rod will follow this trend.

Gold Berry tree exists to make them renewable in-game, I think this is very important.

The flypoint seems bugged.
2024-07-22 23:40:53 +01:00
Martha Schilling aa970c326e
Update ball_colors.asm
Added the Safari Ball, and made the Friend Ball a bit lighter.
2024-07-21 23:47:11 +01:00
Llinos Evans d3fbd1f846 Safari Game battle type & bug fix
This adds the restoration of the Safari Zone from Pokemon October. There isn't a proper place for this yet, but there will be soon!

It seems to have issues with tiles, which I am assuming to either be the tilemap clearing or something relating to Zeta's custom ball palettes, since I had to add the Safari Ball. Can you get to that, @ZetaNull?

2ff835730b

also fixed the unnumbered route errors.
2024-07-21 23:36:56 +01:00
Llinos Evans bcfafaaf83 Honey Pot & Grandma
Ported from Pokemon October.
8114fead91
1a6f3e4f03
d00cd6fafd

Alterations have been made in that the treemonset has been diversified a bit further, having Munchlax like in DPP. They're L60, intended to be used in Nihon.

I haven't placed the grandma in the region yet, intending for her to be in Old City.
2024-07-21 23:00:43 +01:00
Martha Schilling 29c3858f45 Unnumbered Route? Not anymore!
Route 66 is what we've assigned it.
2024-07-21 22:57:44 +01:00
Martha Schilling 608863c365 Update dex_entries.asm
Shit, needed to push this too. Also fixed a glitch involving Pressio and Donmarin's entries.
2024-07-21 22:49:58 +01:00
Martha Schilling fe1911b5c8 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-21 22:48:33 +01:00
Martha Schilling 12928cfc81 Minor spelling mistake :)
It's KazAppelin. Whoops.
2024-07-21 22:48:31 +01:00
Zeta_Null 1b84dd0a52 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-21 16:57:27 -04:00
Zeta_Null 6757a7652a SGB color mode stuff!
dark caves don't currently work correctly, need to look into a fix
2024-07-21 16:57:20 -04:00
Llinos Evans 0075e0d0ba bug fixes
fsr silent hills's connections are a bit buggy uhhh
2024-07-21 17:11:04 +01:00
Llinos Evans 61aeb76705 Nihon Gate maps/tileset
This adds the Nihon Gate tileset and gives Nihon its own gate style.

Kanto can be done another time.
2024-07-21 16:32:20 +01:00
Llinos Evans bf65943f9e fuck 2024-07-21 09:54:32 +01:00
Llinos Evans e7ee37a1d9 New teams for E4, Kanto Gym Leaders, etc 2024-07-21 09:53:04 +01:00
Zeta_Null b63a10d0ce mild improvements to tilesets + blue is blue now 2024-07-21 03:34:53 -04:00
Zeta_Null 1388755b7f cave tile tweak for winners path 2024-07-20 20:09:23 -04:00
Zeta_Null cdbaf2fe2a Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-19 21:30:43 -04:00
Llinos Evans 30e57c9e38 Blue's Lab Groundwork
So the scenes are massively unfinished and need some bug fixes, namely;
- Make the Silent Hills scene load properly.
- Finish the interior scene; have the player walk into the map.
- Make the scene loading in the second Blue's Lab room load properly (same issue as Silent Hills)

Main issues come from the events not working like RBY:
- You cannot be walked directly into a warp!
- Coord events don't seem to trigger scenes on their own and I'm just kind of perplexed by it.

If anyone more experienced wants to take a stab at it, by all means! This is looking really good!
2024-07-19 23:42:49 +01:00
Llinos Evans 13a253073b Winner's Path modifications
- Added a Strength Switch puzzle to floor 2, which took an unhealthy amount of time to do. This is possible in GSC but requires a lot of extremely hacky solutions. There is a glitch that causes the boulder not to move once on the switch if you reload the map but I have been doing this for 3-4 hours, shush.
- Added a depressed switch tile to accomodate the new functionality.
- New switch collision type for boulder puzzles.
- Removed a lot of unused/unreferenced stuff that isn't necessary in Crystal to save space.
2024-07-19 11:48:04 +01:00
Llinos Evans 980b8dc47a Bug fixes
- Fixed a bug where you couldn't walk through one of the Kanto rock tiles
- Fixed a bug where you couldn't go back through the Winner's Path cave exits
- Fixed a bug where some trainers would glitch when walking on Silent Hills mapgroups
- Optimised the Silent Hills spriteset
- Modified Painter Dali and Super Nerd Gregg's teams
- Modified Winners Path's wild data to feature L56 Chanseys for use with the Repel Trick.
- Fixed some text so it scrolls better
2024-07-19 08:19:25 +01:00
Llinos Evans 289b250e89 Unnumbered Route
This route is unnumbered for now, because it's technically the last Nihon Route (numbered 23 in-prototype) and I don't know how to number it yet. It's easily find/replaced once we're sure, anyway.

Wild data uses the prototype's plus a couple edits, levels are kept low as you're actually entering here.

It's official: Nihon is connected to Johto and Kanto now!
2024-07-18 17:51:01 +01:00
Llinos Evans aa67d01582 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-18 16:15:51 +01:00
Llinos Evans 157bfdc15b Winner's Path outside & connected
This makes and connects Winner's Path Outside to Victory Road Gate. Also fixes bugs in Winner's Path that caused signs to crash the game.

Next, making the route that connects to Silent Hills, and reintegrating Mt. Silver!
2024-07-18 16:15:40 +01:00
Martha Schilling b705dbf6ae Caretorker!
Sprites from Pokemon October, shiny palette by me, and I also gave it a cry that I think works.
2024-07-18 16:13:32 +01:00
Zeta_Null 28f2bcdcd9 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-17 20:55:46 -04:00
Zeta_Null e7db7084df pokecenter tweaks (consistent shadows across regions) 2024-07-17 20:55:16 -04:00
Llinos Evans 7ef292a431 (very rough) Winner's Path
This implements Winner's Path into the game, complete with trainers and wild Pokemon. There's still a lot to do, though.

The Debug Lady that gave Celebi now gives Furret because it gets all the important HMs, which we need to...test things. Naturally, you have all the badges now too!
2024-07-17 23:12:24 +01:00
Zeta_Null 4b9ed6021d Blue Forest Tweaks 2024-07-17 13:38:03 -04:00
Llinos Evans 2dd7fb99db Cave tileset tweaks & initial winner's path
This adds some RBY elements to the Cave tileset - including some rocks, a button, a sign(!), and the ice tiles. I've modified the rocks so they work with the tileset in-practice, I really liked using these in KEP. I've put together a really really really basic Winner's Path that'll be sorted out one day...
2024-07-17 16:02:43 +01:00
Llinos Evans f58959fbc4 Blue Forest map drawn
This adds all the necessary blockset pieces and such to Blue Forest so it can function. I'm not sure about the trees, but seemingly, neither was Zeta.
2024-07-17 15:21:00 +01:00
Llinos Evans e552a0f152 Fix some map spawns
When you die or fly to one of these places you don't get absolutely fuckin plastered anymore thank me later
2024-07-17 14:21:11 +01:00
Llinos Evans 3c79717bbd marking well proton correctly
we need to make him an executive and/or change the rocket classes up at some point...
2024-07-17 13:26:49 +01:00
Llinos Evans 4359b66dce ah, this too
This makes Route 2 play the "Road to Viridian City" theme instead of the Viridian Forest theme, which is accurate to how things work in RBY, FRLG, and LGPE. HGSS uses Route 3, but that's cringe.
2024-07-17 13:17:23 +01:00
Llinos Evans 1b77f551f1 Viridian Forest fixes and enhancements
- Fixed various tile port issues and made various visual enhancements. Now generally closer to the Kanto styled Viridian Forest.
- Added Lass Ikue, a trainer referencing Ikue Otani, to the area where the Yellow Lass was. Required updating the spriteset but it seems fine.
- Added parties for all the trainers, which were missed on the initial import.
- Fixed various inaccurate capitalisations.
- Fixed gate warps. Considering adding a Honey girl here if we ever do that?
- Restored various RBY NPCs in the Pewter and Viridian gates to the forest, saying largely the same stuff. Just keeps things move lively.
2024-07-17 13:12:28 +01:00
Llinos Evans 2a8f18ca8d Egg Ticket exchange!
This restores the old Egg Ticket functionality, albeit without the funky animation. I renamed the area the Ticket Corner on that account. Lore relating to it has been restored.

I also fixed the fossil items (they're regular items now) and updated the readme.
2024-07-17 11:17:12 +01:00
Zeta_Null 82f9dab3fa Viridian forest works! Kind of. It's still a little screwy but you can get to it now. 2024-07-14 20:20:48 -04:00
Zeta_Null cff26c7af9 fossil guy adjustments 2024-07-13 18:08:08 -04:00
Zeta_Null 2c9d23b788 More Pewter Museum stuff 2024-07-13 16:58:26 -04:00
Zeta_Null 6129c24faf Museum tweaks
also route 45 had an unreferenced script that was causing issues so I commented out part of it
2024-07-13 15:31:42 -04:00
Zeta_Null 3a5f9e0db8 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-13 15:05:04 -04:00
Zeta_Null 913850d433 Trainerpic command and Fossils 2024-07-13 15:04:17 -04:00
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