Commit graph

270 commits

Author SHA1 Message Date
Zeta_Null 1729f91f26 Whoops I fucked up a thing lol 2024-10-28 14:20:32 -04:00
Llinos Evans 5d9cf1aac2 Populate Coral City
Added various NPCs and signs to Coral City, giving some lore and such. Very basic and barebones.

I also added some extensive notes on what the city is meant to be, it's very misunderstood.
2024-10-27 10:59:35 +00:00
Llinos Evans 94436d0ef6 Fixed build issue, flypoints for coral/savoy, populate savoy
Savoy City is now full of savvy younglings ready to bombard people with old slang. I wanted it to be a capitalistic hellscape where all the young ones trying to keep up with the trends. A few older people, as well as those entering, do not appreciate the babel.
2024-10-26 23:09:40 +01: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 54c72fd12e Mart music and Music credits + Sepia Tweaks 2024-10-23 14:14:49 -04:00
Zeta_Null c00670604d Gate. 2024-10-23 02:51:43 -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 8a8e17cf01 Wait hold on did I fuck up the asm file here somehow 2024-10-23 01:37:42 -04:00
Zeta_Null da5862a041 Savoy City Map. Files arent properly included yet because for some reason things just don't build when I try. 2024-10-23 01:34: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 83c8b7a0e7 Kanto Safari Zone Maps finished. Also whoops I forgot to include the maps last time 2024-10-17 02:48:50 -04:00
Zeta_Null 0d1b70ee56 Kanto Safari Zone Area 2 2024-10-17 02:05:36 -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 bb65f6a796 Whoops I forgot to save part of the thing for the four island connection lol 2024-10-15 21:29:29 -04:00
Zeta_Null fc56ea0fda Basic four island stuff. Get to unused routes later 2024-10-15 21:26:07 -04:00
Zeta_Null 541c3dcdff Whoops I forgot to finish this lol 2024-10-15 14:27:33 -04:00
Zeta_Null 1dc596e162 Three Island layouts 2024-10-14 16:12:59 -04:00
Zeta_Null 8b9927bc6f Three Island and properly implement nihon region check for the trainer battle theme (double check this doesnt accidentally also effect sevii) 2024-10-12 17:52:52 -04:00
Martha Schilling ab6051a5d5 "33 colors are indeed more than 4"
Fixed the build issues caused by Zach's newly pushed sprites having too many colours.

Also, adds my version of the GSC-style Soldier sprite.

Also also, gave Dokuroar a slight weight increase to give it a better catch rate for the Heavy Ball.

Also also also, touched up the Dokuroar cutscene a bit (it now shakes the floor with each step, it moves slower, and its walking animation now animates correctly.)
2024-10-10 21:26:50 +01:00
Martha Schilling 9207bacc96 Vermilion City Eusine event fix
This makes the Vermilion City event where Suicune runs off a lot smoother. It now only activates once, Eusine loads correctly, and all the sounds play without overlap.
2024-09-20 19:38:19 +01:00
Martha Schilling 38dc9a11dd King of the Crypt
Dokuroar, in all of its skeletal glory, has been added to the bottom of Lavender Crypt as a static encounter. It doesn't move when you interact with it, though...at first.

Also, gave Dokuroar a 100% chance to hold a Thick Club (it's MADE of bones, come on), a Snorlax-level catch rate, the Slow EXP group, a decent exp yield, and a very, VERY slight stat update.
2024-09-17 21:18:22 +01:00
Zeta_Null 848c79784f Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-09-14 15:25:29 -04:00
Zeta_Null 2964cc14fa Haunted house work 2024-09-14 15:25:17 -04:00
Llinos Evans 60d337d272 putting together the progression 2024-09-02 19:06:43 +01:00
Llinos Evans f196adc8a1 just so i can do this on my laptop tmoz 2024-09-02 01:53:51 +01:00
Llinos Evans 42566c651a Initial HGSS-style Suicune Progression
Still need to set up the events properly. It's gonna take a while and a lot of testing. This makes the Clear Bell unnecessary and makes the Radio Tower director hand over a Master Ball instead.
2024-09-01 21:19:53 +01:00
Misty 06ba5dad31 Distributing New Moves and the Rise of the Clubtail 2024-08-31 18:23:39 -04:00
Llinos Evans d240c4b046 bits n bobs 2024-08-31 00:19:38 +01:00
Llinos Evans d8acbafc75 Stat exp., DV, & Hidden Power display
s/o Crystal Legacy for their DV & Hidden Power display code, which got this off the ground. Credited aptly.

I modified what they had with Stat Exp, but the menu is a little jank and scrolling is buggy. Someone wanna pick that up?
2024-08-28 14:01:06 +01:00
Misty b1cbf46ec6 Fairy Moves and Correcting an Oops 2024-08-27 00:25:56 -04:00
Llinos Evans e7a672a3a6 hi thorny 2024-08-27 03:31:07 +01:00
Llinos Evans 1f0cc46814 Anims for Uppercut, Coin Hurl, and Strong Arm
Uppercut reimagines KEP's clusterfuck of an animation, reversing Karate Chop and then reworking the sounds

Coin Hurl works like the Poke Ball toss, and then spits out coins on-hit. Looks sort of like Acid in practice. This was weirdly complicated to implement as I had to disentangle the throw animation from the Poke Ball toss in Game Freak fashion.

Strong Arm does the "metal" starting animation, then does its best Rollout into DynamicPunch impression.
2024-08-26 23:39:23 +01:00
Llinos Evans 8e9d1e933f 3 anime reference trainers
This adds Duplica, Ritchie, and Casey to various Kanto areas, aiming to make the routes a bit more populated. They're also quite strong.

Minor rewrite on Silver's Victory Road quote to legitimise the lack of trainers, just like HGSS.
2024-08-26 09:57:49 +01:00
Martha Schilling cbf8cbb18c Hyoshu-Yang & Hyoshu-Yin (Rework)
A rework of the immediately previous rework. Huh.

Changes the Komainu name to Hyoshu, and implements the Yin form too, complete with stats, moves, and a very WIP sprite.
2024-08-23 21:57:52 +01:00
Llinos Evans 8643d40ab1 Komainu-Yang (Rework)
This reworks Shi-Shi into Komainu, a legendary Pokemon more in-touch with the mythology surrounding its design origins. It'll have two forms, centred around the yin/yang, considering its origins. See spreadsheet for more information.

Also rip fly shi-shi
2024-08-18 17:23:19 +01:00
Llinos Evans 0f7ce337f5 ROM builds, assign music, update Tanobi/Trustan/Foxfire
This updates the file structure so the ROM builds properly. It also updates the base stat files of Trustan, Tanobi, and Foxfire (name tbc), and updates Tanobi's name as was meant to be done a while ago.

I've also assigned Luci's music as she describes in her track files.
2024-08-18 15:23:29 +01: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
U-DESKTOP-IKOGN35\wazzu 34025863fd War Crimes and Ghost Times 2024-08-09 00:36:53 -04:00
Llinos Evans edccae1d74 Channeler Squad
This adds the Channeler trainers to Lavender Crypt and updates Mediums and Channelers to use the `PAL_NPC_EMOTE` NPCPAL. Over to you, Misty!
2024-08-08 17:37:51 +01:00
U-DESKTOP-IKOGN35\wazzu 5d3be2b0f1 Some Extra Notes 2024-08-06 21:52:02 -04:00
U-DESKTOP-IKOGN35\wazzu 6e7f38d64c Lavender Crypt Syndrome 2024-08-06 21:45:01 -04:00
Misty 12750cfc53
Merge branch 'PlagueVonKarma:master' into master 2024-08-06 18:04:43 -04:00
U-DESKTOP-IKOGN35\wazzu f899121bda The Elite... Two? 2024-08-06 18:00:23 -04:00
Llinos Evans 4432dd4d2f Sevii Region groundwork
This adds the baseline infrastructure to account for the Sevii Islands, while also fixing a couple of bugs. Zeta, please read the commit carefully!

Only real issue I noticed was that scrolling on the town map is infinite in all three new regions, implying there's something in `pokegear.asm` I haven't accounted for.

I've also ret'd the ezchat order and gen1 orders out of existence to reduce the sheer amount of 8-bit warnings. This abolishes gen1 compatibility (though this was already a bit fucked) in exchange for actually being able to debug things in a reasonable timeframe.
2024-08-06 15:30:37 +01:00
Zeta_Null 7d587205b5 Stromen Animation Tweak 2024-08-04 20:30:28 -04:00
Llinos Evans 892e8fc6b1 Summer Beach House fixes, evo moves (bugs!)
Evo moves commit is unfinished and doesn't work properly. Script in evolve.asm has details.

Summer Beach House now teaches Pikachu Surf and has two issues; one is that backing out of teaching Pikachu causes issues (basically, it only goes a correct way if you say yes), and the teaching menu uses tiles from the overworld because I am stupid.

Are you a bad enough dude to fix these bugs?
2024-08-04 14:40:07 +01: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
Llinos Evans 88390e8282 Gamer Girls exist now
This adds the Game Boy Girl sprite from the RG asset leak, allowing for a bit more diversity among traders. Should be good!
2024-08-03 18:28:09 +01:00
Zeta_Null 150708bbd3 Sevii Islands Work 2024-08-01 17:51:41 -04:00
Zeta_Null e2b7782861 SGB Palette improvements and fixes!
- Spaceworld-ish SGB morning palettes
- Flash caves work now
- Menu Account displays without bugged colors
- Also small Mt. Ember tweaks and a collision fix
2024-08-01 01:09:22 -04:00
Zeta_Null 1d41bfa2f8 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-31 15:28:36 -04:00
Zeta_Null 33d68feaf3 Mt. Ember (Outside)
Currently have a ledge edited to let you get through to the top of the map. Interior, Summit, and warps not set up yet.
2024-07-31 15:28:30 -04:00
Llinos Evans 29b742cb6b Dex entry enhancements
Began the arduous process of giving old Pokemon new dex entries. Like KEP, the main aim is using media not from the mainline games, giving players new insights into the lore surrounding them. New Snap, Ranger, Carddass, TCG art, and more are all on the table. Carddass is prioritised for Gen 1 Pokemon considering its obscurity and...well, general insights into how the Pokemon act, it's pretty awesome.

I've also taken to enhancing some of the existing dex entries!
2024-07-31 12:31:19 +01:00
Zeta_Null 4035bf36f0 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-30 19:00:19 -04:00
Zeta_Null 1c6fb9f07c Kindle Road
- It's added
2024-07-30 19:00:03 -04:00
Llinos Evans 1bc5644edc Bug Catching Contest gives a funny Gligar
If you win the Bug Catching Contest, the man will give you an Earthquake Gligar.

The code that gives it a special move is a bit fucked up because I tried to add a Farfetch'd function, but I can't be bothered to finish the functionality because I'm stupid (it is actually quite easy I'm just lazy)
2024-07-30 20:53:14 +01:00
Zeta_Null d765610c04 TREASURE BEACH
just some basic map layout and connections shit
2024-07-30 14:03:33 -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 8d9afdcd2b Committing old shinkai progress
It's in a better state than when it started soooo
2024-07-30 01:11:00 +01:00
Llinos Evans b8a6a6bfde defeated female leaves
this makes the step counter and safari ball giving processes work but it still doesn't have the process of kicking the player out, nor does it display in the menu.

I also lost my mind trying to figure out how the screen flash bug works and gave up
2024-07-30 00:50:28 +01:00
Llinos Evans 4417b67d18 remove unreferenced code and ban shishi from tower 2024-07-29 22:30:16 +01:00
Llinos Evans 19fcd7d5be Winner's Path gets Rock Smash wild data
whoopsie daisy i forgotti

labelled as victory in case victory road wants it too

pupitar seems fitting since it's a very competitively-centred mon
2024-07-29 21:56:11 +01:00
Llinos Evans 76c497dd99 Partial Safari Game implementation
This adds some infrastructure for the Safari Game, specifically;
- The guards who let you in; the ticket is given and Safari Balls are provided; you also get the leaving early and so on. Bit janky at times.
- Infrastructure for the step system, albeit unfinished; the steps aren't initially counted and there's no kicking out process yet.

All in all, it's now playable, but the loss conditions are not yet finished. I shall now lay down in a dark room.
2024-07-29 18:42:40 +01:00
Llinos Evans b64504b9fd The Safari Zone is now functional!
This adds a clause into the wild encounter setup that sets the Safari BattleType if you're within the relevant landmarks. Therefore, all that's now needed is a way to check the Safari Balls in the player's bag before kicking them out, which should be easily triggered by looking in their bag.
2024-07-29 17:15:27 +01:00
Llinos Evans 5ef2108ce4 Fix Rocket Music bug, add Ariana/Archer to places
This fixes the executive music bug and ensures Giovanni also gets it. I removed the female Executive since it's usually just Ariana. Can use it another time if something comes up, but right now, no need.
2024-07-29 16:03:21 +01:00
Llinos Evans d55f848761 HGSS-style first rival fight
Now the rival doesn't awkwardly say his name is ???, using the trainer card from HGSS instead. Includes the funny lookaround gaffe among other bits. Changed the trainer class as well, making it seamless.
2024-07-29 15:30:04 +01:00
Llinos Evans a4044f0929 Naming mother restored!
The act of naming your mother was restored by adding a name substitution system to WRAM, thus allowing the Dude to occupy a slot naturally. I believe Red and Blue's names are unused too, but just to be safe, I left them alone. Using this means we can technically have battles that substitute names all the time, so this is really neat.

Reworked the first rival encounter scene to have him treat you like an idiot, blurt out what you name your mother, tease you, and piss you off. Arguably flows better than the original and makes more sense. Also, now the mother's name is placed in various spots.

Only concern really is seeing the default name in the phone contact. Feel free to change that if you want, but it's hard to place due to situations where the player leaves without talking to her, so take care!
2024-07-29 14:23:59 +01:00
Llinos Evans 30af5bc815 Decoration shop import
Unsure where to place these yet, made something on the spreadsheet to find my bearings. All I know is I want it!

I had to change `endtext` to an sjump as we don't actually have that script in our ROM. Polished is very different to pokecrystal. Luckily, everything else went off without a hitch.
2024-07-29 12:55:59 +01:00
Llinos Evans a0ac80db46 Unown Doll...thing
This'll be replaced with something better eventually.
2024-07-29 11:18:21 +01:00
Llinos Evans cb1ab6d41d one last zoinks
this isn't needed because the text is already opened beforehand
2024-07-28 17:55:11 +01:00
Llinos Evans bb3ffe1e7b Optimise Jacky's text
This fixes some minor jank and overuse of opentexts
2024-07-28 17:47:53 +01:00
Llinos Evans 43b4e91528 bah 2024-07-28 17:41:47 +01:00
Llinos Evans cb86156311 zeta bug fixes
oops
2024-07-28 17:36:00 +01: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 7114109368 Route 50
This adds Route 50 to the game, as well as Jacky, albeit without the gate or house that you can warp to within.

I decided that the game house will be where Shinjuku Jacky hangs out this time! He'll battle the player and give them uhhh idfk you figure it out

Also I don't know what to call West City. It's a rather sea-blueish colour, sort of like duck egg blue. Sort of a Pacific Teal, right? I need another gay person to give colour ideas.
2024-07-27 11:34:14 +01:00
Llinos Evans b51fbdf753 nihon cut fix
You need to input the replacement blocks and such when using cut! Same for whirlpool!
2024-07-26 17:33:16 +01:00
Llinos Evans 0089f7894b uhhh
warp fix and wild data
2024-07-26 17:03:46 +01:00
Llinos Evans 4f3b61bb07 oop
just making sure the warp connections to actually access the three entry points works proper
2024-07-26 17:00:05 +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 6b22dba5ba no more deadnaming
also shortened some text about kurt that was a bit irrelevant and long for a gate
2024-07-26 13:48:19 +01:00
Llinos Evans 5ed8e23f7a Cleaning up a couple of old references 2024-07-26 13:30:08 +01:00
Llinos Evans e43decef70 Pokemon Pagoda
This gives Sepia City all of its locations.

The pagoda uses references to the Five-Story Pagoda story from 1891, with Sages using various 成语 translated into English.

This also adds the Elder class, assigning it to Li and (now) Roen.

The Elder in the pagoda is not yet battle-able as I haven't really fit anything into the story. No cutscenes, etc, it's all too early.
2024-07-26 13:17:15 +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
Llinos Evans 7a5cbd31dc White City progressgating
This commit adds some events to the White City gate that prevent the player from getting too ahead of themselves. I've also expanded Route 66 and Winner's Path so you don't get that ugly gate ending too early.

Oh, and Cal has his teams and some notes for the future chucked in.

The player needs to dumpsterfuck Green to access White City now!
2024-07-25 12:55:45 +01:00
Zeta_Null 6c2a1d2707 Hey do you like this new gate. What do you mean it's 3 in the morning. 2024-07-25 02:58:36 -04:00
Zeta_Null 0161dc096d Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-24 23:36:05 -04:00
Zeta_Null 56554e2558 Spaceworld SGB palettes for Nihon! 2024-07-24 23:35:23 -04:00
Llinos Evans 37980e84d0 Lots of new trainer classes & pics, port kep cries
This adds Tohjo Giovanni, Archer, Ariana, Prof. Blue, and fixes various bugs with my last commit. Also fixes the bug with Chris's img not having an embedded palette.

I also ported over all the KEP cries that are available as a bunch were incomplete or seemingly being remade.

Next step is to integrate much of this.
2024-07-25 02:18:19 +01: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 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
Zeta_Null d9f6aaa557 Lickilord sprite ingame and animated 2024-07-24 11:33:30 -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