Commit graph

20 commits

Author SHA1 Message Date
Martha Schilling ef62d0a43f would you believe me if i told you this still isnt done
in the middle of a breakdown here but i'm committing this because I don't wanna have an overwhelming number of changed files like the Big One

- Fixed a bug where an item couldn't be picked up in Mt. Moon Crater

- Gave new cries to Leafeon, Glaceon, Perrserker, Gentlarva, Carapthor, Gorotora, Magnezone, Tangrowth, Tricules, Magmortar and Meltan. Pupal and Lickilicky also got new cries but they'll probably be changed later

- Changed Citrine's map slightly for hopefully the final time, removing the tall grass to allow the Old Man Glitch to work there

- Brought Pokemon Tower 5F back for some reason

- Moved the Rocket Grunt on Silph 11F closer to the Omegadge door

- 'Fixed' a warp issue on Faraway Island, can definitely be improved though

- Gave Gapdos 10 more base special because i forgot the first time

- Fixed a typo in Hitmontop's dex entry

- Fixed some inconsistencies in Gao and Gorotora's movesets

- Added the unused ice tiles to Seafoam Islands and Garnet Cavern (credit to Vortiene)

- Added a stats page to the Pokedex that displays base stats and the type of caught Pokemon (again, credit to Vortiene)

- Made Sandshrew more common in Mt. Moon

- Improved the 'already caught' icon

- uncapitalised all new instances of "trainer" in the text to make it more consistent

- HOPEFULLY fixed the issue where the SS Anne still couldn't be reboarded
2023-11-20 11:00:20 +00:00
Martha Schilling 508a4e790e The Big One.
Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you.

- Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them

- Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy.

- Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later.

- Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8.

- Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively

- Restructured the Pokedex a little. Don't worry, Lickitung's still number 108!

- All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones

- Removed Blastyke as a Game Corner prize, replacing it with Squeamata.

- Garnet Cavern is now properly listed as a dungeon map

- Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden

- Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent

- Finished Gauntlet 6F except for the trainer text (PvK please help)

- Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage.

- Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit

- Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke.

- New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone!

- Fixed a bug preventing the trade for Haunter from being accessed.
2023-09-19 23:34:25 +01:00
Llinos Evans dadd7ee6a6 Bug Fixes & Enhancements
- Most, if not all, Silph Co. warps have been fixed. Inappropriate ones have been removed.
- The Metal Coat can now be found where one corrupted Silph Co. warp was to fill dead space, and another is in the Power Plant, replacing Carbos.
- Bill now trades you Hisuian Arcanine after being saved.
- Bill's Grandfather now trades you Hisuian Electrode. Had to remove Crinkles, but Tangela is literally right next to Cinnabar, c'mon lol
- Toedscool can now be found behind Pallet Town, replacing Gloom and Weepinbell, making it more focused.
- Now you can't run from Omega! May expand this to more Pokemon depending on feedback and whether it's ok on processing. Main concern is making the run button too laggy - it raised some eyebrows.
2023-09-02 19:33:14 +01:00
Martha Schilling c5eff723b1 A couple of bug fixes
More still need to be done but I'm separating the commits so I don't get overwhelmed lol

- Fixes a bug with the Up-Grade NPC in Saffron. He now properly shows up only after defeating Giovanni.

- Fixes a bug where Silph could be entered before receiving the Poke Flute.

- Silph Gauntlet 5F has a complete remodel, more closely matching the original map found in the leaks.

- One of the Fuchsia Gym Trainers no longer uses a repeat Arbok.

- Wiglett and Wugtrio could learn Rock Slide via TM, which has now been fixed.

- Jacky uses a Porygon in place of Machop, as it ties into his polygonal, Virtua Fighter-inspired sprite.

- Chief uses a Gengar instead of Porygon2 to represent the Silph Scope.

- Omega's and Giovanni 2's levels have been toned down slightly.

- Lance now uses Crocky over Aerodactyl.

- Yujirou's non-initial teams have had their levels reduced to be the same level as the previously-fought Gym Leader, rather than the upcoming one.

- Updated README with additional credits.
2023-07-21 19:35:23 +01:00
Llinos Evans 0659fb1c65 Finishing Silph Co. 11F
That's a fair chunk out of my day...

This commit finishes everything about Silph Co. 11F. DON'T. TOUCH IT. Unless there's a bug, but OTHERWISE, do NOT touch it. Holy shit.

Here's everything featured;
- Jessie and James fight, ported over.
- Rocket grunt changed to the appointment one from the strange room on the other side that really shouldn't be there tbh
- Omega fight now doesn't have the "watch out" text as I needed to do a micro-optimisation TRUST ME it was NECESSARY (it was not, in fact, necessary)
- Giovanni now reuses Beedrill and has a generally stronger team, scaling with the fifth Rival fight.
- Omega refight has been added after some toiling with the Team Rocket intro text that absolutely should not have happened but did for some reason AAA
- Rocket trio text somewhat tweaked

Oh and I ported over the balance patch on the stats, including some neo-Cryithan onboarding.
2023-07-09 11:43:32 +01:00
emaskyesmogon d193a3dc14 Silph Co rerouting
This condenses Silph Co A LOT to make it easier to navigate. All warps have been tested.
2023-07-03 09:37:00 -06:00
Llinos Evans da13aa9a32 WIP Omega Event
So this isn't working very well. It's halfway there and worked exactly once with what I can only describe as a cosmic ray event.

Here's how it's intended to work: Right as you open the Card Key door, Omega comes barging through, having previously been fighting with Giovanni.

The walking and stuff seems to work, but there are three issues:
- Omega's battle doesn't start, causing a softlock. `call TalkToTrainer` seems to be the iffy point. Note that this code is usually used when talking to a static entity.
- The music bugs out as Omega walks over; this may be linked to the above problem.
- Once these issues are alleviated, Omega will have to disappear, but this isn't a massive deal.

Also includes a dev door in Red's room to easily access the event, and minor code cleanup with Viridian Pre-Gym and Oak's lab - just unnecessary comments.
2023-04-13 17:13:11 +01:00
May Evans 964bacd52a Re-enable silph warps
This is the bare minimum for Silph to function as a location. No complicated trick warp tiles yet.
2022-11-11 10:13:49 +00:00
emaskyesmogon 74c0622040 Silph Co
Warps and elevator commented out
2022-09-30 15:59:25 -06:00
MementoMartha 75d4e47586 Implementing static Crocky encounter 2022-09-10 18:43:00 +01:00
Rangi fc899e1906 warp_event warp IDs start at 1, like in pokegold/pokecrystal 2021-10-05 21:02:42 -04:00
Rangi d48a318dbf Align object_event coordinates
Fixes #336
2021-09-26 23:20:57 -04:00
Yoann Fievez 2c4f35848b
Unify map event gen1 gen2 (#335)
* Update sign to bg_event #289

* Rename warp to warp_event

* Replace object to object_event

* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
2021-09-26 21:56:09 -05:00
dannye 66377fca32 Fix file modes 2020-11-14 20:52:10 -06:00
Rangi 48da6c53be Align warp and sign coordinates 2020-08-21 12:04:49 -04:00
Rangi 4373aafac1 Use def_warps_to macro for automatic warp_to entries 2020-08-17 18:08:54 -04:00
Rangi e2c99f1910 Use def_* macros for automatic map event counts 2020-08-17 16:54:59 -04:00
Rangi 2454296d32 Update sprite names
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
2020-07-17 12:48:15 -04:00
TheFakeMateo 4ecff22f71 Deobfuscate exit warps on indoor maps 2020-07-15 18:12:58 -05:00
Rangi 55bb99580e data/mapHeaders -> data/maps/headers; data/mapObjects -> data/maps/objects
To do: Polished Map support for loading the objects
2020-07-03 18:19:56 -04:00
Renamed from data/mapObjects/SilphCo11F.asm (Browse further)