Commit Graph

148 Commits

Author SHA1 Message Date
GriffinR c1130592fa Drop some overworld prefixes 2021-11-15 10:58:05 -05:00
GriffinR b14fe9dce3 Merge pull request #1547 from GriffinRichards/doc-sounddata
Clean up sound, add CRY_MODE constants
2021-11-13 15:54:40 -05:00
GriffinR c4169cfd29 Disambiguate cry functions 2021-11-07 14:26:09 -05:00
GriffinR be7d0bd3b0 Merge branch 'master' into doc-menu 2021-11-04 12:11:31 -04:00
GriffinR 50d3003a0d Text clean-up, TEXT_SPEED_FF to TEXT_SKIP_DRAW 2021-11-03 19:54:20 -04:00
GriffinR 9a0618afc3 Add COPYWIN constants 2021-11-03 15:29:18 -04:00
GriffinR 3e49ac804b Merge branch 'master' into doc-finalmisc 2021-11-03 13:56:22 -04:00
GriffinR afb9ff3a40 Document files with a few remaining symbols 2021-11-02 18:06:06 -04:00
GriffinR fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
GriffinR ab80264921 Merge pull request #1519 from GriffinRichards/doc-mgift
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR c02001c46d Document mystery gift link scripts, general mystery gift 2021-10-15 12:05:06 -04:00
GriffinR 862febe03a Add MAP_OFFSET 2021-10-09 13:19:27 -04:00
LOuroboros 554210c5e3 Removed trailing spaces in the most relevant files
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
GriffinR 4206359862 Fix some object lock names 2021-05-04 01:21:50 -04:00
GriffinR dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR f602a9dcbf Use bool for multichoice ignoreBPress 2021-03-31 00:35:56 -04: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 9e59581220 Document object lock and some trainer approach 2021-01-26 04:42:18 -05:00
GriffinR 0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00
GriffinR c711a2f73b Document warp spin functions 2021-01-01 17:11:02 -05:00
aaaaaa123456789 bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03: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
PokeCodec 28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -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 3779422489 Split contest funcs from script_pokemon_util 2020-08-13 17:42:12 -04:00
GriffinR e06de33cbd Merge branch 'master' into doc-overworld 2020-07-28 17:46:17 -04:00
PokeCodec c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
GriffinR e129d04b93 Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
GriffinR ebb6c4ee66 Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR 431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
GriffinR c84f98a7ff Document misc field control 2020-06-29 17:24:17 -04:00
GriffinR d2a760afdb Rename contest_link_80FC4F4, 80F57C4, and 81D9DE4 2020-06-18 18:01:32 -04:00
GriffinR 24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR a9a427c6f2 Merge branch 'master' into doc-link 2020-06-10 17:36:43 -04:00
GriffinR aaf5d91c18 Document field_message_box.c 2020-06-03 19:47:45 -05:00
GriffinR f53e2491bf Document union_room_player_avatar.c 2020-06-01 10:23:12 -04:00
GriffinR 956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR 084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-01-13 20:41:57 -05:00
GriffinR c19289596d Give/Take to Add/Remove for silent script macros 2020-01-12 23:24:52 -05:00
GriffinR 68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome 026e1108b2 Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
2019-12-20 23:44:56 -08:00
GriffinR 949509aade Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00
GriffinR d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR 96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
GriffinR 1b30f0c973 Rename event_obj_lock to event_object_lock 2019-12-06 02:55:30 -05:00
GriffinR 7034f59c14 Rename EventObj to ObjEvent 2019-11-21 00:14:40 -05:00
GriffinR 82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00