GriffinR
|
c106f7f130
|
Document battle_controller_opponent.c
|
2021-01-22 21:35:16 -05:00 |
|
GriffinR
|
d1878f933b
|
Sync link partner controller doc to player
|
2021-01-22 20:49:14 -05:00 |
|
GriffinR
|
74990a5a76
|
Sync player partner controller doc to player
|
2021-01-22 20:48:43 -05:00 |
|
GriffinR
|
1042426cc6
|
Sync recorded player controller doc to player
|
2021-01-22 20:47:59 -05:00 |
|
GriffinR
|
b9baf9437d
|
Sync safari/wally controller doc to player
|
2021-01-22 20:13:34 -05:00 |
|
GriffinR
|
63a7828772
|
Document battle_controller_player.c
|
2021-01-22 20:03:27 -05:00 |
|
N
|
07d19ba526
|
Update main.c
|
2021-01-22 18:40:08 -05:00 |
|
N
|
3102d94e3c
|
Undo change
|
2021-01-22 17:41:57 -05:00 |
|
N
|
c636b7c3ae
|
Some more tweaks
|
2021-01-22 17:41:07 -05:00 |
|
LOuroboros
|
267bbe2f70
|
Fixed Mind Blown's category
As it was pointed out by BigAngryDev on Discord, Mind Blown is supposed to be a Special move, not a Physical one.
|
2021-01-22 19:20:55 -03:00 |
|
amiosi
|
44a0983624
|
missed some
|
2021-01-22 07:43:48 -05:00 |
|
amiosi
|
50ce6b2374
|
Merge branch 'battle_engine' into battle_engine
|
2021-01-22 07:39:47 -05:00 |
|
GriffinR
|
4eca05ccf5
|
Document remainder of battle_controllers.c
|
2021-01-22 02:48:22 -05:00 |
|
ExpoSeed
|
2e0b02e491
|
Merge pull request #1322 from amiosi/pokemon_expansion
Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix
|
2021-01-21 19:16:59 -06:00 |
|
amiosi
|
08eb883939
|
sounds like a lot of HOOPA
|
2021-01-21 20:10:38 -05:00 |
|
amiosi
|
9456382a32
|
yellow shmellow
|
2021-01-21 19:05:01 -05:00 |
|
amiosi
|
184dad1874
|
changes according to review
|
2021-01-21 19:04:26 -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 |
|
ghoulslash
|
fcc6444c2e
|
Merge pull request #1329 from ultima-soul/add_fairy_frlg_icon_ie
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
|
2021-01-21 12:20:15 -07:00 |
|
ghoulslash
|
fe7f2f18a4
|
Merge pull request #1328 from ultima-soul/add_fairy_frlg_icon_pe
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
|
2021-01-21 12:19:41 -07:00 |
|
ghoulslash
|
c5491664bd
|
Merge pull request #1326 from ultima-soul/add_fairy_type_icon_ie
Add Fairy-type Icon to Fix Contest Move Viewing Crash
|
2021-01-21 12:19:10 -07:00 |
|
ghoulslash
|
a3a2d881fa
|
Merge pull request #1327 from ultima-soul/add_fairy_frlg_icon_be
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
|
2021-01-21 12:18:42 -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
|
8ec12c665c
|
merge with be
|
2021-01-20 17:36:13 -07:00 |
|
ghoulslash
|
7e2ec88bfd
|
Merge pull request #1330 from LOuroboros/thick_club
Made Alolan Marowak be affected by Thick Club
|
2021-01-20 17:32:03 -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 |
|
SphericalIce
|
c0489199c0
|
Rename GetObjEventReflectionType & fix fakematch in GetGroundEffectFlags_Reflection
|
2021-01-20 22:32:04 +00:00 |
|
LOuroboros
|
2a888a7b3e
|
Corrected base species check for Thick Club's effect
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-01-20 19:30:48 -03:00 |
|
LOuroboros
|
412c28bb7a
|
Removed unneeded constant label for Alolan Marowak
|
2021-01-20 18:29:53 -03:00 |
|
LOuroboros
|
a6b03d45a8
|
Made the Thick Club's effect use the new GET_BASE_SPECIES_ID macro
|
2021-01-20 18:16:02 -03:00 |
|
LOuroboros
|
c90cbc0021
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into thick_club
|
2021-01-20 18:15:37 -03: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
|
fdc6156f83
|
Add Form Species ID tables and entries for new mons and forms.
|
2021-01-20 12:07:29 -08: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
|
86297398e6
|
Move the definition of RETURN_REFLECTION_TYPE_AT and make use of REFL_TYPE_NONE
|
2021-01-20 10:34:33 +00:00 |
|
SphericalIce
|
4334f7a379
|
Include NUM_REFLECTION_TYPES in the ReflectionTypes enum
|
2021-01-20 10:17:07 +00:00 |
|
Evan
|
57c460f40a
|
fix two turn moves failing on turn 1 w no target
|
2021-01-19 22:10:03 -07:00 |
|
ultima-soul
|
f8550603e1
|
Merge pull request #1362 from rh-hideout/revert-1361-global
Revert "Included global.h into battle_config.h"
|
2021-01-19 20:56:19 -08:00 |
|
ExpoSeed
|
61db82e64a
|
Revert "Included global.h into battle_config.h"
|
2021-01-19 22:55:08 -06:00 |
|
GriffinR
|
18b8e0ee8e
|
Merge pull request #1311 from GriffinRichards/clean-unused
Remove unused local variables and functions
|
2021-01-19 23:22:44 -05: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 |
|
ultima-soul
|
feecb8b923
|
Merge pull request #1331 from amiosi/alola
fix alolan form movesets
|
2021-01-19 17:07:03 -08:00 |
|