Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
LOuroboros
fa39dc76dc
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
GriffinR
bd43b905b7
Apply palettes to some field effect pngs
2022-01-14 12:51:13 -05:00
GriffinR
4dec9b83a3
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
ultima-soul
4f2e3bf214
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-12-17 21:23:54 -08: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
cbt6
0fe3881961
Rename WalkInPlaceFastest to WalkInPlaceFaster
2021-11-05 01:54:34 +08:00
cbt6
9a1764f83e
Label some animation index numbers
2021-10-30 01:37:49 +08:00
cbt6
b3d779fd0d
Document field player functions
2021-10-27 01:39:00 +08:00
GriffinR
862febe03a
Add MAP_OFFSET
2021-10-09 13:19:27 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none
2021-09-24 10:17:34 -04:00
GriffinR
f8f7617946
Add TAG_NONE
2021-09-14 13:14:14 -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
ultima-soul
988320b89a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-08-17 11:25:13 -07:00
PikalaxALT
810ca5f8ff
Flatten pos fields in struct Sprite
2021-07-07 09:11:52 -04:00
ultima-soul
0a87adad1a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-06-07 18:05:52 -07:00
GriffinR
553fe6239a
Document more field effects
2021-04-05 18:21:17 -04:00
ultima-soul
be7acc919a
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
2021-04-03 21:53:29 -07:00
GriffinR
1cc0a3506f
Label misc field effects
2021-03-22 15:30:19 -05:00
GriffinR
dfc6ee0e9e
Add SAFE_DIV
2021-03-21 13:43:14 -05:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
SphericalIce
27dc32de26
Use RGB macros
2021-02-14 22:08:19 +00:00
ultima-soul
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08:00
SphericalIce
2dfaba9472
Name color return values more accurately
2021-01-19 17:59:36 +00:00
SphericalIce
8de76ed533
Make broader use of RGB macros
2021-01-19 17:15:12 +00:00
ultima-soul
3cb09b6507
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal
2021-01-11 15:19:11 -08:00
ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05: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
3014241179
Give songs meaningful english names
2020-08-20 19:06:14 -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
ebb6c4ee66
Merge branch 'master' into doc-overworld
2020-07-08 15:51:58 -04:00
GriffinR
1ce929157f
Clean up field effect doc
2020-07-02 05:05:13 -04:00
GriffinR
8589e138a8
Eliminate METATILE_ID() macro
2020-07-02 00:17:14 -04:00
GriffinR
eb80012757
Document more misc field effects
2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172
Continue documenting overworld/field effects
2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802
Document some overworld and field effects
2020-06-23 15:48:53 -04:00
GriffinR
f53e2491bf
Document union_room_player_avatar.c
2020-06-01 10:23:12 -04:00
PikalaxALT
afe081cbba
Match MultiplyInvertedPaletteRGBComponents and MultiplyPaletteRGBComponents
2020-02-27 14:00:36 -06:00
Marcus Huderle
49421a41b2
Move field effects data and graphics into own directory, and cleanup naming for object events
2020-02-12 17:32:51 -06:00
GriffinR
68cdd7b1cb
Merge master into ObjEvent rename
2019-12-21 05:19:27 -05:00
GriffinR
d1cf9006fb
Document some warp/field screen effect
2019-12-17 05:23:07 -05:00
GriffinR
b93101bbeb
Merge master into ObjEvent rename
2019-12-06 21:37:33 -05:00
GriffinR
2756771958
More usage of ST_OAM constants and SPRITE macros
2019-12-06 19:05:44 -06:00
GriffinR
4c52cf9ed1
Fix event constant file names
2019-11-21 14:03:35 -05:00
GriffinR
570881b119
Rename event_object directories
2019-11-21 00:44:55 -05:00
GriffinR
ec3e86f1d2
Standardize Event Object to Object Event
2019-11-20 22:55:44 -05:00
