ghoulslash
|
f6b6ab56be
|
some style fixes
|
2022-07-17 19:16:13 -04:00 |
|
ghoulslash
|
5d91bdeafc
|
add B_ANIM_RESTORE_BG to BattleScript_EffectTerrainHit
|
2022-07-17 19:13:45 -04:00 |
|
ghoulslash
|
6b84a9f0b3
|
merge w be
|
2022-07-17 12:40:43 -04:00 |
|
ghoulslash
|
9b5aee3b93
|
fix z stat-boosts
|
2022-07-17 12:17:54 -04:00 |
|
ExpoSeed
|
da4d1bc626
|
Merge pull request #2176 from LOuroboros/patch-1
Fixed Pokéblock Case's description
|
2022-07-16 03:35:26 -05:00 |
|
ExpoSeed
|
93c4cf7e3c
|
Merge pull request #2180 from LOuroboros/patch-2
Updated the Casteliacone's name
|
2022-07-16 03:29:49 -05:00 |
|
ExpoSeed
|
61f2011b36
|
Merge pull request #2187 from LOuroboros/patch-4
Updated Cmd_handleballthrow
|
2022-07-16 03:26:10 -05:00 |
|
LOuroboros
|
0651cc9fe4
|
Updated Cmd_handleballthrow
|
2022-07-16 05:09:32 -03:00 |
|
Eduardo Quezada D'Ottone
|
e791cf90ad
|
Merge tag 'pretmaster' into BE_pretmerge2
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
|
2022-07-15 12:58:46 -04:00 |
|
Eduardo Quezada D'Ottone
|
6cb483bc9b
|
Merge pull request #2185 from LOuroboros/patch-3
Updated MOVE_ROUND's move flags
|
2022-07-15 08:20:55 -04:00 |
|
LOuroboros
|
cec7e30ef1
|
Update battle_moves.h
|
2022-07-15 01:51:36 -03:00 |
|
Eduardo Quezada D'Ottone
|
f78bb4fb84
|
Merge remote-tracking branch 'pret/master' into item_expansion
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-12 17:42:32 -04:00 |
|
Eduardo Quezada D'Ottone
|
c69275f373
|
Merge remote-tracking branch 'pret/master' into PE_pretmerge
# Conflicts:
# include/battle_anim.h
# include/pokemon.h
# src/data/pokemon/base_stats.h
|
2022-07-12 17:20:49 -04:00 |
|
GriffinR
|
30a5821997
|
Merge pull request #1705 from sphericalice/move-unavailable
Introduces a MOVE_UNAVAILABLE constant
|
2022-07-12 11:32:57 -04:00 |
|
GriffinR
|
a359db6a8c
|
Merge pull request #1704 from LOuroboros/typeAbNameLength
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
|
2022-07-11 22:49:29 -04:00 |
|
sphericalice
|
167353223c
|
Use MAX_MON_MOVES in Cmd_trysetencore
|
2022-07-11 15:23:23 +01:00 |
|
sphericalice
|
186f2c0232
|
Introduce a MOVE_UNAVAILABLE constant
|
2022-07-11 15:18:13 +01:00 |
|
LOuroboros
|
a1004485c5
|
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
|
2022-07-10 20:08:28 -03:00 |
|
GriffinR
|
15f386ede6
|
Move make compare to its own build section
|
2022-07-08 01:34:38 -04:00 |
|
LOuroboros
|
640974b164
|
Update items.h
|
2022-07-05 22:13:15 -03:00 |
|
LOuroboros
|
ce5aba16f6
|
Removed global and unused IsPinchBerryItemEffect
|
2022-07-05 18:24:50 -03:00 |
|
ghoulslash
|
fc81b4cac6
|
fix GetAiLogicData logic
|
2022-07-05 13:19:03 -04:00 |
|
GriffinR
|
76659a4091
|
Merge pull request #1700 from mrgriffin/battle-setup-water-transition
Simplify GetBattleTransitionTypeByMap
|
2022-07-05 11:10:16 -04:00 |
|
Martin Griffin
|
c9958e3087
|
Simplify GetBattleTransitionTypeByMap
|
2022-07-05 14:17:46 +01:00 |
|
GriffinR
|
8231ea2b68
|
Merge pull request #1699 from mrgriffin/field-camera-mod-16
Identify a % 16
|
2022-07-04 16:31:37 -04:00 |
|
Martin Griffin
|
4e76ffb4ca
|
Identify a % 16
|
2022-07-04 21:25:19 +01:00 |
|
BuffelSaft
|
ead52e0b48
|
Merge pull request #2036 from ghoulslash/be/ai
AI Optimizations
|
2022-07-04 23:16:08 +12:00 |
|
ghoulslash
|
3f739a8f3b
|
AI_CalcDamage returns 0 for status moves
|
2022-07-03 17:23:59 -04:00 |
|
ghoulslash
|
57e110aa6a
|
fix AI_GetEffectiveness declaration
|
2022-07-03 17:20:39 -04:00 |
|
ghoulslash
|
f0edbeb0b0
|
minor format fix
|
2022-07-03 16:31:00 -04:00 |
|
ghoulslash
|
fac6f21ed0
|
AI_EFFECTIVENESS_xY are enums
|
2022-07-03 16:28:34 -04:00 |
|
ghoulslash
|
e4bf99d777
|
merge w be
|
2022-07-03 16:20:05 -04:00 |
|
LOuroboros
|
3c9be7c3b2
|
Fixed Pokéblock Case's description
|
2022-07-03 13:36:00 -03:00 |
|
ghoulslash
|
ade935f6cf
|
Merge pull request #2167 from LOuroboros/ampedSyntax
Syntax fixes for Toxel's evo methods
|
2022-07-01 15:29:06 -04:00 |
|
LOuroboros
|
e2cc269b43
|
Updated syntax
|
2022-07-01 16:19:35 -03:00 |
|
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
|
b9be123716
|
Merge pull request #2163 from Sneed69/terrain-softlock-fix
Fix terrain move softlock
|
2022-07-01 11:58:00 -04:00 |
|
ghoulslash
|
1ddf3ca7e0
|
Merge pull request #2169 from Sneed69/inverse-flying
Make ungrounded flying mons weak to ground in inverse battles
|
2022-07-01 11:57:43 -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
|
5ed30b43a4
|
Merge pull request #2170 from Sneed69/best_type_matchup
AI chooses most resistant mon instead of best offensive type
|
2022-07-01 10:37:06 -04:00 |
|
ghoulslash
|
720b919994
|
Merge pull request #2135 from LOuroboros/iePretMerge
Pret merge for the item_expansion
|
2022-07-01 09:23:41 -04: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 |
|
ghoulslash
|
6cb0434eff
|
Merge pull request #2152 from Sneed69/form_base_stats_macros
Condense base_stats.h and make mass editing Pokemon forms/variants easier
|
2022-07-01 09:10:49 -04:00 |
|
ghoulslash
|
f4918222e8
|
Merge pull request #2156 from Sneed69/ai_3rd_type
Type effectivess related AI bugfixes
|
2022-07-01 09:09:12 -04:00 |
|
ghoulslash
|
80ac427443
|
Merge pull request #2160 from Sneed69/ignore-mystery-type-3
IS_BATTLER_OF_TYPE ignores third type if it's Mystery
|
2022-07-01 08:55:08 -04:00 |
|
ghoulslash
|
14c531cf75
|
Merge pull request #2161 from Sneed69/confusion-fix
Fix confusion and disobedience self damage benefiting from STAB
|
2022-07-01 08:53:30 -04:00 |
|
ghoulslash
|
ce5c85dd13
|
Merge pull request #2165 from Sneed69/battle_engine
Heal Block stops Jungle Healing / Life Dew
|
2022-07-01 08:51:10 -04:00 |
|