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
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
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
b65980cd4e
Remove unused local variables and functions
2021-01-19 18:19:33 -05:00
f63bc6e27a
Index sTMHMMoves
2021-01-14 03:41:28 -05:00
eba7933c0c
Remove unnecessary subtraction in switch
2021-01-04 19:50:05 -05:00
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
2239f3aa60
Eliminate goto in ItemUseCB_Medicine
2020-10-21 20:11:40 +01:00
5259898325
Replace POKEMON_SLOTS_NUMBER
2020-10-01 17:07:12 -05:00
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
f952144922
party_menu fakematch fix
2020-09-13 03:02:41 -04:00
28ef2fb774
Switch to button macros
2020-09-04 21:11:55 -04:00
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
e06de33cbd
Merge branch 'master' into doc-overworld
2020-07-28 17:46:17 -04:00
c5aa91741b
Change signedness and add casts to avoid implicit conversion warnings
2020-07-24 22:18:57 -04:00
e129d04b93
Merge branch 'master' into doc-overworld
2020-07-15 00:40:47 -04:00
beeb673ba1
Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave
2020-07-08 16:03:32 -04:00
ebb6c4ee66
Merge branch 'master' into doc-overworld
2020-07-08 15:51:58 -04:00
06025e887f
Allow flag/var counts to be updated alongside values
2020-06-24 17:00:19 -04:00
18d57a3802
Document some overworld and field effects
2020-06-23 15:48:53 -04:00
c2a07276ae
Merge branch 'master' into doc-link
2020-06-13 16:15:11 -04:00
74edaed426
Begin item_menu.c cleanup
2020-06-10 13:07:42 -07:00
4fe507e453
Document union_room.c
2020-05-31 13:11:18 -04:00
bdebab834c
Document pokemon summary screen
2020-05-18 14:03:01 +02:00
7a5deff0bc
Add misc party constant usage
2020-04-09 15:18:53 -04:00
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap
...
Document some pokenav and region map
2020-03-17 10:38:20 -04:00
91dd7f5cc3
Port librfu from firered
2020-02-16 13:49:36 -05:00
86354f1d50
Document some pokenav and region map
2020-02-05 21:04:43 -05:00
27c4329e45
Use friendship event constants
2020-02-04 12:16:15 -06:00
8d64bc9df8
Merge pull request #944 from GriffinRichards/doc-itemuse
...
Document item_use.c
2019-12-25 11:59:07 -06:00
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower
...
Document Battle Tower scripts
2019-12-25 11:39:20 -06:00
749965d56b
Document item_use.c
2019-12-21 21:39:30 -05:00
ddfa0c6298
Document Battle Tower scripts
2019-12-17 20:56:13 -05:00
d1cf9006fb
Document some warp/field screen effect
2019-12-17 05:23:07 -05:00
ed1ff0ad77
Document misc strings and text colors
2019-12-10 19:29:23 -06:00
27169f634b
Review changes for party menu doc
2019-10-31 21:33:01 -04:00
b33db9b96c
Move party menu data
2019-10-31 14:16:43 -04:00
aec7eb6089
Clean up party_menu doc
2019-10-31 14:11:55 -04:00
e01ec84837
Document party_menu second pass
2019-10-31 03:25:56 -04:00
6db014cc32
Document party_menu first pass
2019-10-25 15:41:06 -04:00
a081124a20
Merge branch 'master' into doc-inc
2019-10-13 15:26:44 -04:00
8df4982b3f
Merge remote-tracking branch 'upstream/master' into document-trade
2019-10-12 15:39:17 -05:00
1b7607bd91
Document cable_club.inc
2019-10-12 15:14:57 -05:00
3514f9dd6b
Clean up trade.c doc
2019-10-10 18:46:42 -04:00
07fa82c911
Last non-anim trade.c doc
2019-10-10 03:50:51 -04:00
2c062dc764
More trade documentation
2019-10-09 05:56:44 -04:00
d1bcd60b58
Document more trade.c
2019-10-08 20:25:46 -04:00
Deokishisu