122 Commits

Author SHA1 Message Date
ultima-soul
5cb73a012c Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-08-30 11:57:27 -07:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
Sewef
fd55a0d015
Update src/battle_message.c
Nothing happened.

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-06-17 14:12:06 +02:00
Sewef
d02be421bc
Fix sATypeMove_Table definition 2021-06-17 14:06:40 +02:00
AJ Fontaine
2fe7184d10
Rename sText_WildPkmnAppeared2 to reflect its use
sText_WildPkmnAppeared2 is used for Legendary battles, so sText_LegendaryPkmnAppeared would be more informative.
2021-06-04 22:32:33 -04:00
Flametix
a8fab62c89 Fix Substitute typo 2021-05-06 20:49:04 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc
Clean up battle scripts
2021-04-10 12:41:35 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
GriffinR
c9d3b26ff7 Label miss string indexes 2021-04-02 02:12:46 -04:00
GriffinR
0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05:00
GriffinR
a392cca928 Misc battle documentation 2021-01-23 00:40:31 -05:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
GriffinR
a733b211a3
Merge pull request #1297 from SatoMew/master
Document the unused battle strings for downpour weather
2021-01-11 10:01:57 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage 2021-01-11 08:49:31 -05:00
SatoMew
ead437e89b Document the unused battle strings for downpour weather 2021-01-10 22:26:00 +00:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
Kaz
171154a097 Convert to -g; will be required for eliminating fakematches. 2020-09-16 19:36:30 -04: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
GriffinR
7c8bc0fbe3
Merge pull request #1149 from PokeCodec/datatypes
gflib documenting
2020-09-01 14:25:21 -04:00
PokeCodec
86a1e89879 Documentation of unk field 2020-08-23 21:34:31 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
7d3b68a27b Fix Champinship typo 2020-08-18 17:51:51 -04:00
GriffinR
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
GriffinR
a4e47f1201 Clean some battle_message.c data 2020-07-23 05:01:42 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR
0c4f3b269e
Merge pull request #1083 from GriffinRichards/playse-constants
Use charmap constants for PLAY_SE
2020-07-15 02:53:53 -04:00
GriffinR
7d5ad8f7b4 Use charmap constants for PLAY_SE 2020-06-26 02:44:07 -04:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
MandL27
c3d690a380 consistency with pokefirered 2020-05-27 07:58:04 -05:00
MandL27
6964d37db6 document UNKNOWN_A special char 2020-05-27 07:58:04 -05:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
a3ee92a4e7 Document some frontier util funcs 2019-11-10 16:37:14 -06:00
GriffinR
ca2c6fa9b1 Document pc_transfer.inc 2019-10-22 17:57:28 -05:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -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
Phlosioneer
3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -05:00
Phlosioneer
c96f8751cd Improve window palette macros 2019-02-21 23:27:12 -05:00
DizzyEggg
b3d48c0ed6
Get rid of an unnecessary extern 2019-02-01 19:45:06 +01:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01: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
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
nullableVoidPtr
f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00