amiosi
|
f700004188
|
proper CamelCase
|
2021-02-02 14:21:00 -05:00 |
|
Evan
|
0483114a05
|
merge and some fixes
|
2021-02-02 11:45:15 -07:00 |
|
amiosi
|
2d6b80455d
|
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
|
2021-02-02 13:25:53 -05:00 |
|
amiosi
|
47e1d6b790
|
MIMEJR -> MIME_JR
|
2021-02-02 12:36:05 -05:00 |
|
Evan
|
f4d4cf262e
|
fix screen cleaner, curious medicine, as one
|
2021-02-02 09:00:07 -07:00 |
|
GriffinR
|
64460e01ae
|
Merge pull request #1314 from GriffinRichards/doc-controllers
Document battle controllers, misc other battle
|
2021-02-02 00:24:16 -05:00 |
|
GriffinR
|
7e26aa3d21
|
Merge pull request #1316 from GriffinRichards/doc-scrcmd
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
|
2021-02-01 21:04:00 -05:00 |
|
ultima-soul
|
5fdb578747
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-02-01 15:58:18 -08:00 |
|
ultima-soul
|
2a20d50904
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-02-01 15:54:08 -08:00 |
|
Evan
|
f428e5e2dc
|
some quick claw/custap berry fixes
|
2021-01-31 23:31:27 -07:00 |
|
ultima-soul
|
96232ea166
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-01-28 23:59:08 -08:00 |
|
GriffinR
|
12af03cd62
|
Label bard music pitch table
|
2021-01-28 16:36:56 -05:00 |
|
GriffinR
|
89b85a49ec
|
Index gBardSounds_Moves and gBardSounds_Pokemon with constants
|
2021-01-28 15:55:33 -05:00 |
|
Evan
|
9fcf7d2453
|
zero terrain timers for steel roll, remove unused move effectd
|
2021-01-28 13:51:39 -07:00 |
|
Evan
|
c009b51ae8
|
add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot
|
2021-01-28 13:27:00 -07:00 |
|
Evan
|
a37acb8345
|
coaching, lash out, burning jealousy
|
2021-01-28 12:21:11 -07:00 |
|
Evan
|
dd51edd881
|
add eerie spell, surging strikes, jungle healing
|
2021-01-28 10:51:00 -07:00 |
|
ExpoSeed
|
34c6771e94
|
Create form change table
|
2021-01-27 16:30:43 -06:00 |
|
Evan
|
c003f1c023
|
check move effectiveness with status effects
|
2021-01-26 15:41:59 -07:00 |
|
GriffinR
|
92bd6400b7
|
Fix up berry sparkle
|
2021-01-26 05:40:34 -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
|
3fd5e143a9
|
Misc battle anim documentation
|
2021-01-23 00:40:46 -05:00 |
|
GriffinR
|
a392cca928
|
Misc battle documentation
|
2021-01-23 00:40:31 -05:00 |
|
GriffinR
|
c106f7f130
|
Document battle_controller_opponent.c
|
2021-01-22 21:35:16 -05:00 |
|
GriffinR
|
63a7828772
|
Document battle_controller_player.c
|
2021-01-22 20:03:27 -05:00 |
|
GriffinR
|
4eca05ccf5
|
Document remainder of battle_controllers.c
|
2021-01-22 02:48:22 -05:00 |
|
ghoulslash
|
32cc04c91c
|
Merge pull request #1311 from ultima-soul/deoxys_handling_removal
Remove Special Handling for Deoxys
|
2021-01-21 12:22:03 -07:00 |
|
Evan
|
5aff5333dc
|
fix B_MEMENTO_FAIL comment
|
2021-01-21 12:05:01 -07:00 |
|
Evan
|
bfb7333507
|
memento gen4 failing
|
2021-01-21 12:03:30 -07:00 |
|
GriffinR
|
8fe4d004e3
|
Merge pull request #1305 from GriffinRichards/doc-battletv
Document battle tv data
|
2021-01-21 12:27:14 -05:00 |
|
Evan
|
4611c71bd1
|
merge with be
|
2021-01-21 08:55:14 -07:00 |
|
Evan
|
39139323f6
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into zmove
|
2021-01-20 17:36:37 -07:00 |
|
Evan
|
8ec12c665c
|
merge with be
|
2021-01-20 17:36:13 -07:00 |
|
Evan
|
e61309dce6
|
merge with be
|
2021-01-20 17:34:24 -07:00 |
|
GriffinR
|
3ceb43177d
|
Merge pull request #1312 from sphericalice/pokeemerald
Fix misnamed ground effect flags & document reflections
|
2021-01-20 18:50:31 -05:00 |
|
Evan
|
16d54b6d32
|
merge with be, add form checks to CanBattlerGetOrLoseItem
|
2021-01-20 14:28:03 -07:00 |
|
ghoulslash
|
9b1a482837
|
Merge pull request #1317 from ultima-soul/form_species_tables_ie
Add Form Species ID Tables
|
2021-01-20 13:54:58 -07:00 |
|
ghoulslash
|
71f18bfbf4
|
Merge pull request #1316 from ultima-soul/form_species_tables_be
Add Form Species ID Tables
|
2021-01-20 13:54:39 -07:00 |
|
ghoulslash
|
b4b1d2b9e2
|
Merge pull request #1315 from ultima-soul/form_species_tables_pe
Add Form Species ID Tables
|
2021-01-20 13:54:20 -07:00 |
|
ultima-soul
|
9663ed0d3c
|
Merge branch 'form_species_tables' into form_species_tables_pe
|
2021-01-20 12:06:59 -08:00 |
|
ultima-soul
|
d3b0e98325
|
Merge branch 'form_species_tables' into form_species_tables_be
|
2021-01-20 11:40:48 -08:00 |
|
ultima-soul
|
f571c8af2a
|
Merge branch 'form_species_tables' into form_species_tables_ie
|
2021-01-20 11:34:59 -08:00 |
|
ultima-soul
|
267900bdcb
|
Add Form Species ID tables and functions to access them.
|
2021-01-20 11:31:20 -08:00 |
|
SphericalIce
|
4334f7a379
|
Include NUM_REFLECTION_TYPES in the ReflectionTypes enum
|
2021-01-20 10:17:07 +00:00 |
|
ExpoSeed
|
61db82e64a
|
Revert "Included global.h into battle_config.h"
|
2021-01-19 22:55:08 -06:00 |
|
GriffinR
|
6999b237eb
|
Merge pull request #1309 from GriffinRichards/misc-macro
Use constants for item data, misc other constants/fixes
|
2021-01-19 20:49:58 -05:00 |
|
SphericalIce
|
2746fd1f95
|
Name object event ID arguments properly
|
2021-01-19 23:35:57 +00:00 |
|
SphericalIce
|
6dd973012b
|
Correct ground effect flag names for reflections & document sprite data usage
|
2021-01-19 23:21:50 +00:00 |
|
ghoulslash
|
9d9da6a485
|
Update include/constants/battle_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-01-19 15:01:51 -07:00 |
|