ghoulslash
|
02a62e245b
|
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
Config for lost money after losing a battle
|
2022-07-01 11:58:36 -04:00 |
|
ghoulslash
|
6cf0620f93
|
Merge pull request #2159 from Sneed69/trap-move-arrays
Trap move battle string related code cleanup
|
2022-07-01 11:07:28 -04:00 |
|
sneed
|
c1af418340
|
define B_MSG_WRAPPED_ constants
|
2022-07-01 17:52:46 +03:00 |
|
ghoulslash
|
fc2cfd8c9d
|
Merge pull request #2136 from LOuroboros/pePretMerge
Pret merge for the pokemon_expansion
|
2022-07-01 09:22:55 -04:00 |
|
ghoulslash
|
a349462b78
|
Merge pull request #2134 from LOuroboros/bePretMerge
Pret merge for the battle_engine
|
2022-07-01 09:21:51 -04:00 |
|
ghoulslash
|
42f3cccdbe
|
Merge pull request #2154 from HamishSinclair/poltergeist
add poltergeist animation
|
2022-07-01 09:19:49 -04:00 |
|
LOuroboros
|
aa5c6a3f01
|
Implemented affection-now-friendship mechanics
|
2022-06-22 00:18:01 -03:00 |
|
GriffinR
|
57222323c1
|
Merge pull request #1678 from GriffinRichards/const-frontier
Add some battle frontier constant usage
|
2022-06-18 10:22:58 -04:00 |
|
GriffinR
|
4660f8c88b
|
Document battle tower TV show
|
2022-06-14 09:37:39 -04:00 |
|
GriffinR
|
7143865f6f
|
Add some battle frontier constant usage
|
2022-06-09 12:57:28 -04:00 |
|
GriffinR
|
1f540845cb
|
Merge pull request #1675 from GriffinRichards/doc-arg
Document generic arguments
|
2022-06-09 11:11:02 -04:00 |
|
ghoulslash
|
b33a8b0cb4
|
move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use
|
2022-06-05 11:09:04 -04:00 |
|
GriffinR
|
bc2dbd772e
|
Add warning to NUM_OBJ_EVENT_GFX
|
2022-06-03 16:18:34 -04:00 |
|
GriffinR
|
1ca1bff81c
|
Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg
|
2022-06-03 15:43:21 -04:00 |
|
GriffinR
|
34438e6bc4
|
Continue documenting generic arguments
|
2022-06-03 15:38:03 -04:00 |
|
sneed
|
86b436782a
|
trap move related code cleanup
|
2022-06-01 22:01:50 +03:00 |
|
GriffinR
|
a8437493c1
|
Document generic argument names in battle anim palettes
|
2022-06-01 12:25:01 -04:00 |
|
sneed
|
2e855b204a
|
ai accounts for a third type
|
2022-05-29 04:55:37 +03:00 |
|
hamish
|
307d5d93c4
|
add potlergeist animation
|
2022-05-23 08:53:08 -04:00 |
|
sneed
|
ce468a0903
|
add macros for handling form base stats
|
2022-05-23 01:04:21 +03:00 |
|
Eduardo Quezada D'Ottone
|
f2c509eab7
|
Merge pull request #2151 from Sneed69/dummy_abilities
Add dummy abilities to make base stats header smaller
|
2022-05-22 13:27:27 -04:00 |
|
sneed
|
587b056ccb
|
add dummy abilities to PE
|
2022-05-22 19:55:09 +03:00 |
|
Sneed69
|
d0a2be9630
|
weather forms fixes and config
|
2022-05-22 03:20:48 +03:00 |
|
GriffinR
|
6d772a5e30
|
Merge pull request #1662 from GriffinRichards/door-gfx
Clean up door animations
|
2022-05-21 16:07:02 -04:00 |
|
GriffinR
|
5c8e1e81ea
|
Color single-palette door anim graphics
|
2022-05-18 12:41:20 -04:00 |
|
GriffinR
|
593e2c9be0
|
Fix inconsistent static s/g names
|
2022-05-17 14:00:02 -04:00 |
|
LOuroboros
|
52d6c96e69
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge
|
2022-05-13 03:20:42 -03:00 |
|
LOuroboros
|
2263caef7a
|
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
|
2022-05-13 03:17:31 -03:00 |
|
sneed
|
bceccf5474
|
changes
|
2022-05-10 08:17:31 +03:00 |
|
sneed
|
709f583390
|
Initial commit
|
2022-05-10 02:58:24 +03:00 |
|
Eduardo Quezada D'Ottone
|
f80bab897f
|
Merge pull request #2112 from AgustinGDLV/evo_battle
Gen 8 Evolution Mechanics (Battle Engine)
|
2022-05-09 17:40:19 -04:00 |
|
Eduardo Quezada D'Ottone
|
b6922a1dab
|
Merge branch 'pokemon_expansion' into evo_overworld
|
2022-05-09 16:36:34 -04:00 |
|
AgustinGDLV
|
9bb5db2275
|
removed duplicate define
|
2022-05-08 21:23:51 -07:00 |
|
Eduardo Quezada D'Ottone
|
c71b60d9f8
|
Merge branch 'PokemonExpansion' into PE_breedOverrides
# Conflicts:
# include/constants/pokemon_config.h
|
2022-05-07 19:45:06 -04:00 |
|
sneed
|
f83875cf0f
|
remove item expansion check
|
2022-05-07 23:34:38 +03:00 |
|
AgustinGDLV
|
7b0154336d
|
Merge branch 'battle_engine' into symbiosis
|
2022-05-07 13:26:21 -07:00 |
|
AgustinGDLV
|
c7bee35161
|
fixed conflict with new PR
|
2022-05-07 13:23:41 -07:00 |
|
AgustinGDLV
|
9d222d3ab4
|
fixed gems and damage-reducing berries
|
2022-05-07 13:12:21 -07:00 |
|
sneed
|
c6b529ed50
|
add missing constant
|
2022-05-07 22:09:08 +03:00 |
|
AgustinGDLV
|
8a0a2a5a39
|
Apply suggestions from code review
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-05-07 09:36:03 -07:00 |
|
AgustinGDLV
|
017f44f5ac
|
Apply suggestions from code review
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-05-07 09:35:00 -07:00 |
|
ghoulslash
|
0172f84617
|
Merge pull request #2070 from AsparagusEduardo/PE_evoData
Updated missing evolution and form change data
|
2022-05-07 11:37:11 -04:00 |
|
ghoulslash
|
9fa4d916d3
|
Merge pull request #2055 from AsparagusEduardo/BE_configs
Once again, Battle Configs
|
2022-05-07 11:31:25 -04:00 |
|
Eduardo Quezada D'Ottone
|
dc25bc6145
|
Merge branch 'battle_engine' into BE_WhiteOutMoney
# Conflicts:
# include/constants/battle_string_ids.h
# src/battle_message.c
|
2022-05-07 11:16:34 -04:00 |
|
Eduardo Quezada D'Ottone
|
cbe73de8c8
|
Merge pull request #1861 from LOuroboros/primalReversionTweaks
Primal Reversion Tweaks
|
2022-05-07 11:04:23 -04:00 |
|
Eduardo Quezada D'Ottone
|
096fe3c11d
|
Removed unecessary B_LEEK_ALWAYS_CRIT config
|
2022-05-07 10:56:31 -04:00 |
|
Eduardo Quezada D'Ottone
|
4e7ce0b663
|
Merge branch 'battle_engine' into BE_configs
# Conflicts:
# include/constants/battle_config.h
|
2022-05-07 10:25:34 -04:00 |
|
ghoulslash
|
adfb336a3f
|
Merge pull request #2105 from Sneed69/healblock
Add missing Heal Block functionalities
|
2022-05-07 09:13:18 -04:00 |
|
ghoulslash
|
e5b777695c
|
Merge pull request #2107 from Sneed69/steelbeam
Steel Beam Move Effect Implementation
|
2022-05-07 08:40:34 -04:00 |
|
AgustinGDLV
|
542a0f07b4
|
fixed bug bite / bestow
|
2022-05-06 22:07:25 -07:00 |
|