Commit graph

75 commits

Author SHA1 Message Date
Llinos Evans 8e9f9d8657 rev 2025-07-25 17:59:04 +01:00
Llinos Evans 555a96597e revert underwater 2025-07-25 17:57:05 +01:00
Llinos Evans 919250bd73 revert 093bda0 2025-07-25 17:31:12 +01:00
Zeta_Null 95b59dfa8d Stalls + map tweaks 2025-07-24 16:12:29 -04:00
Llinos Evans 6ea2aaba50 Fix the dumb stupid tileset problem
I can't believe I did thattttttt BWAAAAA
2025-01-03 15:13:11 +00:00
Zeta_Null 1c9dafa527 Water Sport doesnt Work Commit 2
I forgot the Sunglow Well underwater files, whoops
2024-12-29 22:13:37 -05:00
Zeta_Null 2207e15bc7 Water Sport doesnt seem to work correctly? 2024-12-29 22:11:46 -05:00
Zeta_Null 29fc26f144 underwater tileset shit, brings number of errors down to 20
it's currently missing the custom palette but if I did I'd need to fuck with the code for it anyway when I add it properly when this stuff works so I dont think that's a big deal
2024-12-29 16:50:30 -05:00
Llinos Evans 093bda0253 Strong Arm, Water Sport, and more HMs.
This adds Rock Climb functionality to Strong Arm and Dive functionality to Water Sport, as discussed in the server. HMs have been added, but we need 16bit Items to add Wind Ride, and I haven't finished their functionality.

The Rock Climb tile is a bit terrible, it's not easy to notice. Maybe change so that it works well with yellow or another colour?

This does not build due to issues with effect_commands.asm, but since Zeta is meant to be working on the mapping and Water Sport anyway, it seems to be up his alley.

I ported over much of the underwater assets Rangi was using as they looked very pretty. I imagine it'll be fun to utilise going forward. May as well, right?

I shall now lay down in a dark room.

Review: c21561ea71 (diff-5508f3b794fc68821ba35e94b6a293b2aaaa16c02a1b34fac70d03fd2f74c4b2R113)
2024-12-28 06:26:01 +00:00
Zeta_Null 63558a935f I forgot files. whoops 2024-12-21 16:07:54 -05:00
Zeta_Null f98a639b52 WIP Sunglow City (missing some shit, remind me to get to it later) 2024-12-20 23:52:18 -05:00
Zeta_Null 2e053211ec ITEMFIX: I hate working with WRAM
CHANGES ARE COMMENTED IN WRAM.ASM, IF ANYTHING BREAKS, CHECK THERE.

Not thoroughly tested but I've yeeted some unused shit in WRAM to be able to fit Misc WRAM 1 back in the right bank.
Side note but according to pret if a ds has a blank space above and below it then it should be unused? May be wise to double check this
2024-12-13 01:00:32 -05:00
Zeta_Null 52a8f2cf20 Aventurine City, Bank Split, Initial KEP Fuchsia Port
Had to split bank 2 because I ran out of unreferenced code to comment out when adding Aventurine

Fuchsia was pissing me off so I applied the changes from KEP when adding the safari zone graphics, though it's not currently super close to what it was like in LGPE

Aventurine is very early stages but it's in there :V
2024-12-09 22:29:07 -05:00
Zeta_Null 5e703191ce More White City Stuff 2024-11-13 13:46:38 -05:00
Zeta_Null 6373ba855f White city 2024-11-12 19:19:22 -05:00
Zeta_Null 9a80501cd1 Ruddy Town!
we're probably going to need to split bank 2 eventually I am running out of unreferenced code to comment out lol
2024-11-07 16:55:20 -05:00
Zeta_Null 4aaf325c76 Ruddy map draft. Currently unimplemented. 2024-11-02 13:15:24 -04:00
Zeta_Null 40dc3352b2 More official Nihon mart stuff 2024-10-30 19:07:54 -04:00
Zeta_Null c724dd3977 Route 53; needs refinement and lacks encounter data
Right side of the map is visibly slightly cut off. Whoops. I'll probably adjust it later. Left side is fine, though.
2024-10-29 00:58:15 -04:00
Zeta_Null 1d464d7dd4 I fucking forgot to include route 52's files, whoops
Also comes with the map for route 53, though unimplemented.
2024-10-28 22:24:27 -04:00
Zeta_Null cf1489967f Route 52 (Needs encounter data) 2024-10-28 15:32:57 -04:00
Zeta_Null fd15675a67 palfix just in case 2024-10-28 14:21:53 -04:00
Zeta_Null 1729f91f26 Whoops I fucked up a thing lol 2024-10-28 14:20:32 -04:00
Zeta_Null 7a6d9b3b46 Coral City (High-Tech) 2024-10-24 18:12:34 -04:00
Zeta_Null 71739fddc2 some fine-tuning with the nihon maps 2024-10-24 03:02:10 -04:00
Zeta_Null eb10621ac6 I dont understand why that was making the error it was but yeah okay I guess we're good here 2024-10-23 02:11:35 -04:00
Zeta_Null 42357756bc some fairly minor nihon tweaks 2024-10-22 19:44:06 -04:00
Zeta_Null c84c56eb86 Quiet Cave Tileset 2024-10-20 02:36:28 -04:00
Zeta_Null 3949670f4f Begin work on the Kanto Safari Zone.
Some maps are broken up or edited to allow for seamless transitions instead of needing several warps. (Area 1 is split vertically, Area 2 needs a horizontal split. The connection between area 1 and 2 also will have to be shifted up from where it is in RBY to prevent border blocks showing up where they shouldn't.)
2024-10-16 14:58:11 -04:00
Zeta_Null 1dc596e162 Three Island layouts 2024-10-14 16:12:59 -04:00
Zeta_Null 2964cc14fa Haunted house work 2024-09-14 15:25:17 -04:00
Llinos Evans 6e832f06d8 Haunted House groundwork
Adds the Haunted House with wild data, warps, and most of the house itself done.

Gengar Doll is set to be a boss fight, needs walking sprites among other things.

BG events need a bit more fleshing out.

Needs integration for the loose board mechanic.

Otherwise extremely fleshed-out.
2024-08-15 20:49:25 +01:00
Zeta_Null 28a1d3061c Stairway tiles 2024-08-14 17:53:10 -04:00
Llinos Evans 0dd22ececa Summer Beach House (buggy!)
This adds the Summer Beach House from Pokemon Yellow to Route 19, in an effort to make Kanto a bit more interesting.

The code for teaching Pikachu is very buggy right now and someone should check it out. I usually throw code out if it isn't functional but this seems extremely close to working.
2024-08-04 02:27:27 +01:00
Zeta_Null 150708bbd3 Sevii Islands Work 2024-08-01 17:51:41 -04:00
Zeta_Null 1e0220bf06 Sevii bullshit at 3 AM
- Sevii islands tileset
- One Island mapping
- Sevii islands SGB and roof colors
2024-07-30 03:09:24 -04:00
Llinos Evans 6d7f07292b Jacky's House (& Jacky & Knuckles)
This adds various house tiles that allow the creation of the game house from SW97. It's been heavily altered to include the SNES (from RBY), Virtual Boy, and N64.

Here, you can fight Jacky once a day to farm Gold Leaves, which will be currency for a Move Reminder. It should refresh just fine but definitely give it a closer look, I'm not exactly confident.

I also made a start on a GSCified sofa but it looks kinda weird.
2024-07-27 13:54:53 +01:00
Llinos Evans 6b12b3d992 Lavender Crypt puzzle maps
The connections between maps, as well as Dokuroar's boss battle, are not finished. However, everything else is, including the warps themselves. My brain is just a bit too small for a puzzle like this, so I require assistance.
2024-07-26 16:55:36 +01:00
Llinos Evans 675e112bee Sepia Museum
It's an art museum where you can get your legendary beasts sculpted for now, though I haven't added the functionality. There's a world where it could be for any Pokemon but that implies we make individualised icons...
2024-07-26 01:49:14 +01:00
Llinos Evans cd08f11fa4 Sepia City Gym & badge infrastructure
Nihon badges now count and Sepia City has its Gym Leader. All fully functional.

I've also distributed the transfer-exclusive Kanto Pokemon items to their relevant owners, plus the Polkadot Bow.
2024-07-25 15:29:35 +01:00
Zeta_Null 9a0858971d White city exists now 2024-07-24 17:21:50 -04:00
Zeta_Null 9c53a93df0 Minor tileset tweaks and SGB color tweaks 2024-07-23 15:08:03 -04: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
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
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
Zeta_Null 28f2bcdcd9 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-17 20:55:46 -04:00