Commit graph

251 commits

Author SHA1 Message Date
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 1ecdf6d1d4 whoops blue wasnt blue in part of the cutscene lol 2024-07-21 03:44:33 -04:00
Zeta_Null b63a10d0ce mild improvements to tilesets + blue is blue now 2024-07-21 03:34:53 -04:00
Zeta_Null 6e6d2aeede Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-20 20:09:29 -04:00
Zeta_Null 1388755b7f cave tile tweak for winners path 2024-07-20 20:09:23 -04:00
Llinos Evans 9f29e38e59 Blue's Lab First Pass
This largely finishes the Blue's Lab commit from last night, adding all the bits and bobs to make the first initial cutscene. This essentially puts all the first plot threads into place: Impostor Oak, the Nihon League, and so on. This stuff is stupid unorthodox, I expect it to be an uphill battle.
2024-07-20 12:56:20 +01: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
Martha Schilling 6816e6bd8e Nuuk sprites 2
Adds sprites for Electivire, Magmortar, Honchkrow, Porygon-Z and Wyrdeer!

Had to rearrange some things in both main.asm and layout.link but hopefully it won't break anything...
2024-07-19 17:02:36 +01:00
Llinos Evans 54cff4bf0b why were these there? oh well 2024-07-19 12:05:35 +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 85ed8efe18 Nihon Pokegear Map Revision
Given the entry point is Indigo Plateau East, we don't need the map to look like this.

Tentatively using...
2024-07-17 23:28:42 +01: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 98822c5c97 All of my basically complete sprites that need animation work 2024-07-16 22:41:11 -04:00
Martha Schilling 3ef4ee30b7 Nuuk sprites 1
Adds Nuuk's lovely sprites for Azurill, Leafeon, Glaceon, Sylveon, Magnezone, Togekiss and Farigiraf. Adjustments were made to Farigiraf's shiny palette to more closely match the official colours.

Fixed a glitch with Luxwan's palette.

Also, updated the README with additional sprite credits.
2024-07-16 17:17:20 +01:00
Martha Schilling a291a6a45a GSC-style Fossil Aerodactyl/Kabutops sprites
Entirely done by yours truly! (With some help from Llinos on sorting out Aerodactyl's wing)

Also fixed the Pokedex fill command in the debug room.
2024-07-16 16:14:25 +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 0adf7b3c87 ...That was supposed to use the other grey. Oops 2024-07-14 11:15:42 -04:00
Zeta_Null 701bfda18c singular colored pixels are from hell 2024-07-14 11:10:07 -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 dadb188393 More accurate News Machine
Turns out it's that massive...thing.

The screen is all fuzz, but it seems like it was meant to change.

We ought to include this stuff
https://www.youtube.com/watch?v=CmvFT4PLAMQ&ab_channel=H%C3%A1%C4%8Dky

But it's hard, so I haven't done it (yet).

I don't think people would kill us if it was just this, but with random quotes from the time period, but...
2024-07-13 10:44:40 +01:00
Llinos Evans e8b342c8b8 ah woopsie daisy pardon me oh good heavens
fixed some warps and an error preventing it from building oops oh noes
2024-07-13 10:33:35 +01:00
Llinos Evans e61255bbf1 PCC enhancements (and GS Ball restoration)
This adds a bunch of PCC-related stuff to the building, most notably the GS Ball, making Celebi obtainable natively.

Chances are, we would repeat this for the MysticTicket and Mew.

This restores a bunch of text and adapts it to various bits and pieces. Of course, a lot still needs to be done. Very happy with how it's turning out, though!
2024-07-13 10:28:14 +01:00
Zeta_Null 9a54c174ef Zeta Discovers Pokepic 2024-07-13 01:00:42 -04: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