Commit graph

4467 commits

Author SHA1 Message Date
Kurt
c79ae5690a
Merge pull request #1599 from pokecal/master
add G7 MapUnmask & FlyDestination
2017-11-13 19:36:56 -08:00
Kurt
953f6939a5 Fix double save export memecrypto issue
Closes #1600 , memecrypto is applied on first export but not cleared
prior to second export, thus resulting in a checksum over garbage data
that is permanently lost when the new memecrypto sig is applied.

Solve this by keeping track of memecrypto application status.
2017-11-13 19:34:50 -08:00
Kurt
80a0c61077
Merge pull request #1601 from kwsch/f/savedata-checksum-tests
Add tests for Sun/Moon checksums
2017-11-13 19:27:50 -08:00
pokecal
955833a1c6 add G7 MapUnmask & FlyDestination
G7 is not FLY, just consistency with other Gens.
2017-11-14 11:59:33 +09:00
Evan Dixon
563d03e51a Merge remote-tracking branch 'origin/master' into f/savedata-checksum-tests 2017-11-13 20:53:58 -06:00
Kurt
97a159c710 Add ultra sun wild encounter details
using pk3DS's dump pkl binaries method
2017-11-13 09:16:29 -08:00
Kurt
aae64638d0
Merge pull request #1597 from ReignOfComputer/master
Totem Stickers Formatting & Window
2017-11-13 09:05:49 -08:00
ReignOfComputer
5259b7546e Totem Stickers Formatting & Window
Standardized the list of Totem Stickers and expanded the window slightly
to better fit text
2017-11-13 19:39:51 +08:00
Kurt
36dc3d6ef7
Merge pull request #1596 from sora10pls/master
Update Gen 7 event flags/constants
2017-11-12 22:51:18 -08:00
sora10pls
7b379ac428 Fix spaces 2017-11-13 01:42:11 -05:00
sora10pls
8fe32ec007 Update Gen 7 event flags/constants 2017-11-13 01:33:30 -05:00
Kurt
4341dc1775 Add Galactic Key to usum key items permitted
add zygarde cube reconstructs gifts, thanks @sora10pls !
2017-11-12 21:56:08 -08:00
Kurt
dbabcb9ef0 Misc updates
fix hall of fame fixed offset
fix ball throw type unlock/learned flags using fixed offset
fix current throw type defaulting to -1 when Nihilist (new USUM style)
by adding in for USUM

add fused slot offset fetching
convert event flag combined byte fetch to use Get/SetEventFlag with
event flag references.

add ZRingUnlocked sav properties & checkbox for toggling

set AlolaTime only if the combobox is enabled (only disabled if not yet
set by game)

Closes #1595
2017-11-12 21:28:34 -08:00
Kurt
7bc316d79c Add "AlolaTime not existing yet" handling
Savedata::GameTime::IsAlolaOffsetExists
2017-11-12 16:10:31 -08:00
Kurt
fffd051665
Merge pull request #1594 from pokecal/master
complete USUM TotemSticker location
2017-11-12 12:17:10 -08:00
Kurt
9b61c94402 Add ditto5 natures
thanks @wwwwwwzx for pointing this out

remove others that have encounter details forced (for totem battles)
2017-11-12 12:15:08 -08:00
pokecal
dd83555953
complete USUM TotemSticker location
easy one have missed.
2017-11-13 04:54:48 +09:00
Kurt
55c31cb598 Update encounters
add ability locks for sm gifts
add poipole secondary location
add magearna details
2017-11-12 10:59:23 -08:00
Kurt
54b9fa7c93
Merge pull request #1592 from sora10pls/patch-1
Update USUM static encounter list
2017-11-12 09:18:31 -08:00
Kurt
064d18c13f Add necrozma special forme moves
not present in the levelup movepool like they should be...
2017-11-12 09:17:59 -08:00
Matt
6ecc7f2efb
Update USUM static encounter list 2017-11-12 12:08:48 -05:00
Kurt
d11b6b09ae
Merge pull request #1591 from ReignOfComputer/master
Add Extra Totem Stickers Locations & Encounters
2017-11-12 07:33:08 -08:00
ReignOfComputer
69bdcacaec Additional Totem Sticker Locations
1 left.
2017-11-12 22:29:44 +08:00
ReignOfComputer
0b95f7d4b8 Porygon/Zygarde/Trainer School Encounters 2017-11-12 22:29:21 +08:00
ReignOfComputer
f1e7c0f759 Hypno Trio Encounter at Hau'oli City PD 2017-11-12 18:33:06 +08:00
ReignOfComputer
596ff57fc3 Add Extra Zygarde Cell Locations
Wela Volcano Park (rocks behind sign)
Battle Tree Entrance
2017-11-12 18:28:39 +08:00
Kurt
6a73b9e6e4 Update zygarde cells
use const numbers, dynamic count for cells possible
2017-11-11 22:48:22 -08:00
Kurt
cfb38a771f
Merge pull request #1588 from pokecal/patch-1
add USUM TotemSticker resource
2017-11-11 22:36:49 -08:00
Kurt
90ca6aa97c
Merge pull request #1590 from sora10pls/master
Add USUM Legendary re-battle flags
2017-11-11 22:26:19 -08:00
sora10pls
e1abe0be5e Fix indenting 2017-11-12 01:10:16 -05:00
sora10pls
b0c228174f Add USUM Legendary re-battle flags 2017-11-12 01:08:49 -05:00
Kurt
fbab1cfbe6 Update usum eventflag max
now these event flags are making sense
2017-11-11 18:58:57 -08:00
Kurt
dea70bf243 Add cosmog & zygarde gift locations
thanks @architdate !
(thanks @bui for the pikachu!)

porygon remains
2017-11-11 17:24:49 -08:00
Kurt
d674ea4f39 Add surf pikachu details
Closes #1589
Thanks @PolarPeridot !
2017-11-11 17:16:31 -08:00
pokecal
8b1c76ea06
add USUM TotemSticker resource
NPC said there are 100 stickers, so I missed 5, still finding.
2017-11-12 09:40:38 +09:00
Kurt
e6c68a8fc9 Add heavy ball permissions for USUM
heavy ball now works in USUM
2017-11-11 16:26:22 -08:00
Kurt
5d90e9dc53 Refactoring
check alolan forms for forme matching, break up large method to
something a little more understandable.
2017-11-11 09:35:07 -08:00
Kurt
d8acdf2aa1 Fix partner pikachu sprite
fix form+1 overflow (cap7 pikachu in sm accesses gumshoos1! bad!)
2017-11-10 19:53:11 -08:00
Kurt
f5a6f23161 Add more static enc data
clear out unused (highly certain) SM encounters
add solgaleo/lunala locations
add partner form pikachu
2017-11-10 19:43:31 -08:00
Kurt
6127dd7a08 split record maxes
slightly different in USUM, any difference increased the cap:
070  999999->999999999
071  999999->999999999
072  999999->999999999
073  999999->999999999
074  999999->999999999
192  9999->65535
193  9999->65535
194  9999->65535
197  9999->65535

Worth noting that these were undocumented record IDs and likely unused
in Sun/Moon; don't really need to split these tables but good for
documentation purposes.

Trainer7 grabs maxes from the save without specifying version, so add an
overload to default to USUM (even though the unused records will have
bad caps, they're unused in SM so whatever).
2017-11-10 17:37:04 -08:00
Kurt
8ab39cae7b Update dex form handling 2017-11-10 17:08:47 -08:00
Michael Scire
e455aef501 USUM event constants for starter choice/Tapu rebattle 2017-11-10 15:08:20 -08:00
Kurt
0ad86d1663
Merge pull request #1584 from sora10pls/master
Add more static encounter locations
2017-11-10 10:26:50 -08:00
sora10pls
6cd2a08238 Fix Type: Null location 2017-11-10 13:19:47 -05:00
sora10pls
1d44c45fe0 Fix indenting 2017-11-10 13:16:43 -05:00
sora10pls
6f58698187 Add more static encounter locations 2017-11-10 13:08:36 -05:00
Kurt
41a60dda78 permit necrozma formes 1&2
and 0.
was eventually reaching the Battle Megas list so insert this abort-early
detection.
2017-11-10 09:22:41 -08:00
Kurt
30f07fc979 Fix wishiwashi handling
totem wishi isn't a gift because it isn't really a totem
2017-11-10 08:42:25 -08:00
Kurt
a3b8b15b4d
Merge pull request #1582 from ReignOfComputer/master
Normal Pokemon @ Ultra Space Wilds / Sandygast @ Route 15
2017-11-10 05:21:35 -08:00
Kurt
a39f92cac6 Add rockruff forme list items
revert form selection filtering, screwed up scatterbug and other
forced-forme lists. behavior works fine without the list filtering
2017-11-10 04:01:36 -08:00