Commit Graph

224 Commits

Author SHA1 Message Date
GriffinR fc3d6eb178 Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
Document PokemonUseItemEffects
2021-02-22 12:15:19 -05:00
GriffinR e059c4fdfa Use new gift ribbons size, label unused ribbons 2021-02-17 14:11:45 -05:00
Deokishisu 7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
GriffinR 8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
GriffinR 15906ca143 Document evolution scene 2021-02-03 17:55:37 -05:00
GriffinR a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR 18b8e0ee8e Merge pull request #1311 from GriffinRichards/clean-unused
Remove unused local variables and functions
2021-01-19 23:22:44 -05:00
GriffinR b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
GriffinR bc20fda604 Use GET_UNOWN_LETTER macro 2021-01-19 04:03:16 -05:00
GriffinR b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
GriffinR e6aebc16da Merge pull request #1296 from GriffinRichards/bugfix-typo
Add missing braces to bugfix in CalculateMonStats
2021-01-10 12:34:39 -05:00
GriffinR 8afc28c98f Add missing braces to bugfix in CalculateMonStats 2021-01-10 12:24:59 -05:00
SphericalIce f02afc134b Use the correct constant for max-IV masks 2021-01-07 22:34:57 +00:00
SphericalIce 3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
GriffinR 769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
GriffinR 15c2856b24 Merge pull request #1265 from Kurausukun/berry_crush
fakematch fixes, begin documenting Berry Crush (based on #1187)
2020-12-14 23:22:41 -05:00
GriffinR 81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
Kurausukun 58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
aaaaaa123456789 1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun 83846b913a port sub_806F160 fakematch fix 2020-10-26 00:01:53 -04:00
Kurausukun b2100cb480 port ModifyStatByNature fakematch fix (from #1179) 2020-10-25 23:23:40 -04:00
GriffinR 65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
GriffinR 5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Kaz 847878eae9 battle_gfx_sfx_util.c: Very annoying fakematch fix.
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
2020-09-19 17:12:25 -04:00
kiliwily f1366dfc69 Fix typos 2020-09-19 20:46:26 +02:00
aaaaaa123456789 7dc95a0103 Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
2020-09-13 06:30:55 -03:00
kiliwily 9b4ded46c6 Update pokemon.c 2020-09-12 19:20:42 +02:00
kiliwily 5c3669e0cd Bug documenting 2020-09-12 18:43:20 +02:00
PokeCodec 7f1827767c Document size field of unknown struct 2020-09-09 16:09:31 -04:00
PokeCodec a32f631fe6 Fix Pokemon Fakematch 2020-09-09 15:59:34 -04:00
PokeCodec 84a92279c9 Record mixing fakematch fixed! 2020-09-09 15:49:51 -04:00
PokeCodec e6684664ba Fix casting bug 2020-09-06 15:16:40 -04:00
PokeCodec a7a64ecba0 Fixup ModifyStatByNature 2020-09-05 11:47:24 -04:00
GriffinR a9719c92bf Merge pull request #1160 from kiliwily/master2
add MAX_LEVEL_UP_MOVES macro
2020-08-28 19:18:03 -04:00
GriffinR 09cfed64b5 Merge pull request #1146 from GriffinRichards/rename-songs
Give songs meaningful english names
2020-08-28 16:14:21 -04:00
kiliwily 5e7b6a089c add MAX_LEVEL_UP_MOVES macro 2020-08-28 20:36:07 +02:00
Thomas Winwood 58786a7ac0 Add MAX_PER_STAT_EVS macro 2020-08-28 02:25:02 +01:00
PikalaxALT cd895e497d Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
2020-08-21 12:44:07 -04:00
GriffinR 3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR 0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -04:00
GriffinR 65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR 078c341b2b Merge pull request #1122 from GriffinRichards/clean-battlemsg
Add stat stage constants, clean up misc battle msg data
2020-08-10 14:29:27 -04:00
GriffinR 5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
ExpoSeed 71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
GriffinR 52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00
GriffinR 1a27af8855 Merge pull request #1100 from GriffinRichards/clean-battlescrdata
Misc battle and battle palace documentation
2020-07-18 20:22:44 -04:00
GriffinR aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg c8e1079736 Use stat constants in MonGainEVs 2020-07-16 09:58:16 +02:00
Flametix 4ba2799849 Update pokemon.c 2020-07-09 14:52:19 -04:00