Commit Graph

92 Commits

Author SHA1 Message Date
Scott 5cb8ec4247 Rename IsNotEventLegalMewOrDeoxys 2021-03-27 17:27:32 -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 0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05:00
GriffinR 4eca05ccf5 Document remainder of battle_controllers.c 2021-01-22 02:48:22 -05:00
GriffinR b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
GriffinR 81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
LOuroboros 55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
aaaaaa123456789 1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
Kurausukun 077a2c23dc port HasNoMonsToSwitch fakematch fix (from #1181) 2020-10-25 23:45:42 -04:00
GriffinR 5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
kiliwily 56848fb891 Update battle_util.c 2020-09-19 20:44:16 +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 5c3669e0cd Bug documenting 2020-09-12 18:43:20 +02:00
PokeCodec 34f54dd438 Fix Battle util fakematch 2020-09-08 20:46:08 -04:00
PokeCodec 6bb1d58a11 Finished header includes 2020-09-08 19:17:33 -04:00
PokeCodec e84da39d8a Match BattleIntroOpponent1SendsOutMonAnimation 2020-09-08 18:54:51 -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 b401e2eb86 Fix naming style of function 2020-07-27 21:22:16 -05:00
ExpoSeed 71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
GriffinR aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
Eduardo Quezada f821303429 Using True/False on SetMoveEffect. 2020-03-07 16:54:13 -06:00
GriffinR a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
GriffinR 73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
GriffinR 1016b23918 Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
GriffinR 06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
GriffinR bb236b490d Update BS constants for Cmd rename 2019-09-15 17:58:12 -04:00
DizzyEggg b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
Marcus Huderle 462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
DizzyEggg b150091436 Rename an erroneously named battlescript 2019-03-05 17:06:29 +01:00
Phlosioneer 4ea5e85bed Fix typos
This is an updated version of #554, since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
DizzyEggg d46e60765d Rename a palace battle field 2019-01-29 22:22:02 +01:00
Marcus Huderle e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
melthelesbian 2dd706ca54 use max mon moves constant where able (#480)
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
2018-12-25 11:50:15 -06:00
DizzyEggg 5caca7a4d6 Clean up field weather 2018-12-08 19:43:21 +01:00
DizzyEggg 4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
DizzyEggg 6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
DizzyEggg 1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
DizzyEggg e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg 44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg eb4d9f6fed Tabs to spaces 2018-08-03 00:24:10 +02:00
DizzyEggg d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
DizzyEggg bf0178238a Battle files - review changes 2018-07-16 20:47:30 +02:00
DizzyEggg 008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg 272b98da6c document party status summary 2018-06-28 21:06:32 +02:00