Commit graph

339 commits

Author SHA1 Message Date
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 f89d5b33d6 Many spreadsheet treemonsets applied 2024-07-29 22:01:01 +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 ce048df442 啊妈的
fixed the music
2024-07-29 15:34:20 +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
Zeta_Null b897aa5cd9 Route 49 Connections fix 2024-07-27 18:10:32 -04:00
Zeta_Null 6c86b4ff9e Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-27 16:47:05 -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 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
Zeta_Null e11c7e0f83 Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-26 18:48:31 -04:00
Martha Schilling b7099d8ee8 ROM builds now, yay!
- Fixed/improved dex entries for Calflac, Stromen and Terrados.

- Fixed Bipulla's shiny, giving it the one from the beta.

- Added Calflac's shiny and official back sprite.

- Fixed Folage's, Stromen's and Munchlax's back sprites.

- Added Munchlax's shiny.

- Fixed Terrados' front sprite, and gave it a shiny palette (currently a clone of Gyarados')

- Added temporary colours to the Gen 1 trainer imports.
2024-07-26 21:08:15 +01:00
Martha Schilling ac5f22ffaf Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-26 17:51:47 +01:00
Martha Schilling 5e61056e40 More sprites!
Terrados, Stromen, Dudunsparce, and Calflac this time.
2024-07-26 17:51:46 +01:00
Llinos Evans 36f25cbe7f palfixes
uhh can someone fix folage lol
2024-07-26 17:48:11 +01:00
Llinos Evans b4686d5fb5 Two more October sprites
Folage and Trebir!
2024-07-26 17:43:07 +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
Martha Schilling 71809acf1b SageDeoxys Sprites 1: Paradox edition
Adds a bunch of lovely sprites for KEP Mascot, Bad Santa and Lesser Smilodon.
2024-07-26 14:24:52 +01:00
Llinos Evans 33676d0f13 Decensoring the trainer sprites, elder pic
This decensors the Fisher, Beauty, Female Swimmer, Medium, and Sage sprites, to match the Japanese version. The Elder class will use the censored Sage sprite, though it's possible a demake of the HGSS one could be in order down the line.
2024-07-26 14:03:42 +01:00
Llinos Evans 0f63c1f1e2 RBY Trainer GFX
Still placeholders, but you can now build off these to GSCify them, and I guess it makes playtesting minutely more enjoyable.

Also added the student, jessie/james, and yujirou sprites, as well as made blaine have his default sprite, while copying his usual one to be used for chief.
2024-07-26 13:53:58 +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 fa99cbc839 Fix Sepia City flypoint
HOW WERE YOU BUILDING?????
2024-07-26 13:28:14 +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
Zeta_Null aea0948bbd Merge branch 'master' of https://github.com/ZetaNull/jep-hack 2024-07-25 18:57:49 -04:00
Zeta_Null 390a49c363 Chris sprite change because it was yelling at me about it not being indexed earlier. The palette is embedded or whatever now. 2024-07-25 18:57:42 -04:00
Martha Schilling 662aea5857 Update lickilord.asm...again
Compared to Lickitung now, Lickilord has +50 Attack, +30 Defense, +15 to Speed and Special Attack, and +10 to HP and Special Defense. Works for me!
2024-07-25 23:55:40 +01:00
Martha Schilling 343c99df30 Update lickilord.asm
Turns out Lickilord had a lower base HP than Lickitung. Let's fix that.

Compared to Lickitung now, Lickilord has +10 HP, +55 Attack, +35 Defense, and +30 Speed, while its Special stats go totally unchanged.
2024-07-25 23:15:42 +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
Misty 2a1e28d3c9
somehow forgot green lol
somehow forgot green lol
2024-07-24 19:17:20 -04:00
U-DESKTOP-IKOGN35\wazzu 4f2175e89f somehow forgot green lol 2024-07-24 19:16:03 -04:00