Commit graph

20 commits

Author SHA1 Message Date
Thorn Avery 163b1b060c Battle Tent: working! (for real this time!!) 2023-12-21 15:11:21 +11:00
Thorn Avery f126a26243 Battle Tent: working! (assuming union is ok) 2023-12-20 18:49:51 +11:00
Thorn Avery 8e03534fc6 WIP Battle Tent: BCD Add not working :( 2023-12-20 18:18:16 +11:00
Thorn Avery 27f898e583 WIP Battle Tent: winnings based on streak 2023-12-20 17:29:21 +11:00
Thorn Avery 1b0b7a281c WIP Battle Tent: winnings based on streak 2023-12-20 16:58:51 +11:00
Thorn Avery 12b5fb8f8e WIP Battle Tent: win counter on each battle 2023-12-18 20:01:57 +11:00
Thorn Avery 86ede20d97 WIP Battle Tent: win counter displayed text 2023-12-18 19:45:24 +11:00
Thorn Avery ce2d9ec06c WIP Battle Tent: win counter 2023-12-18 19:04:33 +11:00
Thorn Avery 2a6c2604bd WIP Battle Tent Fix 2023-12-18 17:11:30 +11:00
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
Llinos Evans 138bfd7042 Multiple bug fixes
* Moves the Mystery Box activation into Event Constants. This means that now, the Mystery Box activation is handled in the save, preventing some jank from happening when resetting.
* The "don't switch off the box yet" variable is now always unset after entering a map. Meltan itself allows the variable to keep being re-set, which is super handy. Now, whenever you enter and exit maps, it'll work properly.
* Flying, using an Escape Rope, and using Dig, all now unset the Mystery Box. If for some reason everything fucks up, this'll fix it.
* Fixed a text bug with the scientist in Celadon University.
* Fixed a menu alignment issue with the Vermilion Beauty.
* Attempted to fix the Battle Tent exit. Failed. This is a really, really bad bug, hopefully this gets sorted sometime.
2023-08-31 02:48:01 +01:00
Llinos Evans 48b25069f8 Fix Mt Moon Square NPCs, new Battle Tent system
This fixes the issue with Mt Moon Square's NPC text and changes the Battle Tent to a continuous system.

The Battle Tent's new system circumvents the issue with wBTStreakCnt while providing the player with more agency. They'll get constant prize money after each battle and can abandon the challenge at any time. It may feel more grindy but in my opinion works just as well.
2023-05-20 04:57:46 +01:00
Llinos Evans 7ebb4d02a4 Battle Tent done!
So it turns out that the code used in Factory Adventure *or* the TPP Anniversary Repository, by all accounts, should not actually work. Like, no, really, it ends up loading 0xFF as code, thus why it would always rst38. It just...doesn't...do anything. My friend Enigami, who figured out the issue, described the function as being "half-finished".

We came up with a solution that results in less functionality - now it needs a free box - but it results in less load times, so maybe it's just better this way. I doubt many people will catch that many Pokemon unless they were shooting for a living dex, which is unfeasible in its current state anyway.

I considered putting Bottle Caps in here, but it felt like making the game too grindy, so I changed it to just be in the Battle Tent shop with a very high price.
2023-05-14 20:28:37 +01:00
Llinos Evans 0397961a8b hmmmm m 2023-05-14 09:13:05 +01:00
Llinos Evans 0bda742995 tweaks
still struggling with the removepokemon bit...
2023-05-14 08:58:34 +01:00
Llinos Evans be7a5bf66a comment on implementation 2023-05-13 20:25:12 +01:00
Llinos Evans 8e10d26336 Scripted losses
Now the last issue is making this not crash when restoring the player's team. Very odd...
2023-05-13 20:13:40 +01:00
Llinos Evans 4de0a13543 So it "works"...
This now, technically, works.

However, the Battle Tent was seemingly made with the assumption trainers are Pokemon, which our hack has moved from. I've made it so it can load it as a trainer battle properly, but you will deathwarp. I need to implement a scripted loss system.
2023-05-13 19:07:16 +01:00
Llinos Evans e7c6cc9dcc Minor tweaks
Still hangs, just makes the warp more player-friendly.
2023-05-13 18:14:17 +01:00
Llinos Evans ec61a039b8 Battle Tent Port
This is...most of the stuff necessary for the Battle Tent to work. I've faithfully restored most things so far, including doing a few grammar tweaks.

Main issue is that we get a really strange softlock when the Pokemon selection menu comes up. Not sure why, but point is, it can't progress to the next bit for debugging like this. Committing now to ask for assistance.
2023-05-13 02:50:31 +01:00