search

pret / pokecrystal

Disassembly of Pokémon Crystal
https://pret.github.io/pokecrystal/
2.06k stars 770 forks source link

Incorrect Mystery Gift decorations #1082

Closed SnorlaxMonster closed 8 months ago

SnorlaxMonster commented 10 months ago

The names of the DECOFLAGs used for Mystery Gift decorations in mystery_gift_decos.asm are incorrect, and do not accurately reflect the decorations that can actually be sent in-game.

There's both a difference in order (which is important, as the order is used when determining which gift to send) and the contents of the lists.

The current list incorrectly includes two items that are instead purchased by Mom:

The real list includes the following items, but they are missing from the current list:

For comparison, see this writeup on Project Pokémon by bayleaf, who reverse-engineered the Mystery Gift protocol. And this write-up on Blue Moon Falls, which was recently updated with details of how Mystery Gift works with Stadium 2.

Additionally, the MysteryGiftFallbackItem is currently listed as the Polkadot Bed, when according to bayleaf's research it should be the Red Carpet.

This issue was fixed in this pokegold PR by @Tiddlywinkss (except the fallback item, which was not changed). However, that PR was submitted several months ago and has not yet been merged.

mid-kid commented 10 months ago

That PR solves this entire issue? Yeah, that still has to be merged. Some accepted PRs linger for a while before someone bothers porting it to the other decomp as well. You can help out by submitting an equivalent PR to crystal. I guess I'll do it for now.

SnorlaxMonster commented 10 months ago

Almost the entire issue. The one thing it doesn't fix is the fallback item, which should be the Red Carpet instead of the Polkadot Bed, according to bayleaf's research.

I assume the fallback item DECO_POLKADOT_BED should just be changed to DECOFLAG_RED_CARPET, but I have not tested it.

mid-kid commented 10 months ago

Merged as of https://github.com/pret/pokecrystal/commit/b0ddb0758dd86950ad3c504aa09a4e3e2dffd495 Did that fix it?

SnorlaxMonster commented 9 months ago

Merged as of b0ddb07 Did that fix it?

Not quite, it didn't fix the default decoration. I've just submitted pull request #1084 that fixes that as well. Merging that will fully resolve this issue.

vulcandth commented 8 months ago

resolved in https://github.com/pret/pokecrystal/commit/75f0ad395576700e57e7c10dbb4a954ea35ba27d