Eduardo Quezada D'Ottone
e4ae280ca6
Fixed calls to IsZMove
2022-07-21 15:32:14 -04:00
Eduardo Quezada D'Ottone
25397e5794
Fixed Light That Burns The Sky not using the calculated damage category
...
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
2022-07-21 15:13:00 -04:00
Eduardo Quezada D'Ottone
eb582b1355
Merge pull request #2178 from ghoulslash/be/ai_fix
...
fix GetAiLogicData logic
2022-07-21 14:47:21 -04:00
ghoulslash
462a144956
Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power
...
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
2022-07-20 18:10:31 -04:00
Eduardo Quezada D'Ottone
d87610a1e0
Ghost Escape config AI fix
2022-07-20 15:31:08 -04:00
Eduardo Quezada D'Ottone
76f5926743
Sky Drop check in IsBattlerTrapped
2022-07-20 15:29:40 -04:00
Eduardo Quezada D'Ottone
343e685537
Sky Drop fixes
...
- Sky Drop was using lbs in the formula instead of hectograms. This has been fixed.
- Sky Drop is now affected by weight modifiers like Float Stone.
- Enabled AI_CheckBadMove for Sky Drop.
2022-07-20 15:13:53 -04:00
Eduardo Quezada D'Ottone
b8ea412e61
AI logic for Charge
2022-07-20 14:44:57 -04:00
Eduardo Quezada D'Ottone
212ecb98ce
Added AI checks.
2022-07-20 14:28:49 -04:00
Eduardo Quezada D'Ottone
0f3fdd410a
Config for Sturdy's Gen5+ effect.
2022-07-20 13:06:41 -04:00
Eduardo Quezada D'Ottone
f00beac3f9
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
2022-07-20 11:32:16 -04:00
Eduardo Quezada D'Ottone
e14afd8957
Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.
2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1
Merge branch 'battle_engine' into BE_pretmerge
...
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
2022-07-20 08:50:30 -04:00
ghoulslash
2b5bb9f6e4
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
2022-07-19 18:24:53 -04:00
Eduardo Quezada D'Ottone
1cfb267b34
Config for Explosion halving defense
2022-07-18 13:10:27 -04:00
ghoulslash
f2ee9f3ba0
tweak z indicator position relative to healthbox
2022-07-18 09:44:04 -04:00
Eduardo Quezada D'Ottone
e55fea47f3
Added missing MOVE_UNAVAILABLE to Gorilla Tactics check
2022-07-18 09:24:08 -04:00
ghoulslash
18affe8c1a
new z move indicator, credits to blackforest
2022-07-18 09:21:59 -04:00
Eduardo Quezada D'Ottone
1dcbf59686
Config for Plus and Minus interaction
2022-07-18 08:11:02 -04:00
sphericalice
65db9238e8
Give Pikachu its typing back
2022-07-18 09:41:04 +01:00
GriffinR
a8c93dcf35
Add missing font constants after EXT_CTRL_CODE_FONT
2022-07-18 02:36:25 -04:00
ghoulslash
f6b6ab56be
some style fixes
2022-07-17 19:16:13 -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
GriffinR
165f51a295
Merge pull request #1701 from GriffinRichards/faint-cmd-name
...
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
2022-07-16 08:15: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
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
LOuroboros
26e03dcda8
Linked MENU_ACTION constants to the items in sStartMenuItems
2022-07-15 04:45:05 -03:00
LOuroboros
cec7e30ef1
Update battle_moves.h
2022-07-15 01:51:36 -03:00
GriffinR
16ab534ddb
Add some missing pocket constant usage
2022-07-14 10:27:51 -04:00
GriffinR
f85b4699dc
Fix conditional in SpriteCB_DeoxysRockFragment
2022-07-12 21:29:36 -04: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
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
Greenphx9
4294682d8c
16-letter move names
...
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE
Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
2022-07-11 12:49:30 +10:00
GriffinR
06dc93fc2f
Clean up field_poison.c
2022-07-06 21:04:54 -04:00
GriffinR
2c4c9497d2
Fix comment
2022-07-06 15:02:17 -04:00
GriffinR
e6a374f2b6
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
2022-07-06 14:49:08 -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
Martin Griffin
c9958e3087
Simplify GetBattleTransitionTypeByMap
2022-07-05 14:17:46 +01:00
Martin Griffin
4e76ffb4ca
Identify a % 16
2022-07-04 21:25:19 +01: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
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
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
f4918222e8
Merge pull request #2156 from Sneed69/ai_3rd_type
...
Type effectivess related AI bugfixes
2022-07-01 09:09:12 -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
GriffinR
650f033c2b
Merge pull request #1695 from GriffinRichards/update-gfromh
...
Update some GF rom header names
2022-06-29 11:59:43 -04:00
GriffinR
8950a41bfd
Update some GF rom header names
2022-06-21 18:31:09 -04:00
GriffinR
c2a08cc84d
Merge pull request #1689 from GriffinRichards/task-ub
...
Remove UBFIX related to task destruction
2022-06-21 16:33:17 -04:00
sphericalice
5d7140fa83
Fix missing COPYWIN_FULL constant use
2022-06-19 13:33:47 +01:00
sneed
5e7df653bd
no gest
2022-06-18 19:18:01 +03:00
sneed
f43d54af89
AI chooses most resistant mon
2022-06-18 19:00:33 +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
Kurausukun
d3c8346a67
fix type, add bugfix
2022-06-17 21:58:56 -04:00
Kurausukun
23e9455e0a
document design oddity, use constants, correct comment
2022-06-17 21:52:58 -04:00
GriffinR
7a6b417b8e
Remove UBFIX related to task destruction
2022-06-17 21:01:23 -04:00
Colton G. Rushton
f02ea58a68
Add comment description of this bugfix
2022-06-17 18:32:46 -03:00
Colton G. Rushton
d7ab1ba588
Fix formatting
2022-06-17 18:22:47 -03:00
Colton G. Rushton
b885e01b39
Update src/item_menu_icons.c
...
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
2022-06-17 18:16:14 -03:00
Colton G. Rushton
e42498ab40
Add bugfix from bugs_and_glitches.md to BUGFIX
...
Item flicker fix now in `BUGFIX`
Supersedes and resolves #1680
Fixes #1215
Fixes #1514
2022-06-17 18:06:37 -03:00
GriffinR
4660f8c88b
Document battle tower TV show
2022-06-14 09:37:39 -04:00
GriffinR
95f075ec90
Remove erroneous bugfix
2022-06-13 15:01:04 -04:00
GriffinR
dec54e6e92
Additional constant usage
2022-06-13 03:21:20 -04:00
sneed
407047ace7
ground x2 vs flying if inverse battle
2022-06-10 23:23:21 +03:00
LOuroboros
5070d5b605
Syntax fixes for Toxel's evo methods
2022-06-10 08:00:45 -03:00
LOuroboros
7470a56d44
Untangled CheckPartnersMonForRibbons
2022-06-09 15:08:58 -03:00
GriffinR
7143865f6f
Add some battle frontier constant usage
2022-06-09 12:57:28 -04:00
GriffinR
ceaff148f7
Shift to multiply
2022-06-09 10:52:19 -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
sneed
023feb4350
Update party_menu.c
2022-06-05 17:02:55 +03:00
sneed
1d19c0dc9f
Update battle_util.c
2022-06-05 16:38:37 +03:00
ghoulslash
c694e0cb90
merge w be
2022-06-05 08:22:24 -04:00
sneed
bf1025ac16
Update battle_util.c
2022-06-05 05:09:06 +03: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
af6bf17930
Include config.h in siirtc.c
2022-06-03 21:04:14 +03:00
sphericalice
284e46927a
Use the FREE_AND_SET_NULL macro where appropriate
2022-06-03 15:56:11 +01:00
sphericalice
d03756dfd2
Use the TRY_FREE_AND_SET_NULL macro where appropriate
2022-06-03 15:42:53 +01:00
Sneed69
c60de5055d
remove IsMoveWithoutAnimation
2022-06-03 17:42:42 +03:00
sneed
e1c57e4071
move_none does not benefit from stab
2022-06-01 22:45:50 +03: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
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -04:00
sneed
2e855b204a
ai accounts for a third type
2022-05-29 04:55:37 +03:00
BlackShark
75a44fdd79
use more true & false constants
2022-05-27 02:18:52 +02:00
Martin Griffin
1cc59acca9
Static assertion for size of save structs
2022-05-25 19:48:42 +01:00
sneed
a913191323
Document DrawPagination
2022-05-25 16:12:16 +03:00
sneed
5c92062c23
Update pokemon_summary_screen.c
2022-05-25 08:37:36 +03:00
sneed
c316b11739
chanceCommon to chanceNotRare
2022-05-24 00:53:09 +03:00
sneed
c8e08edbae
rename item1 and item2 in BaseStats
2022-05-23 19:10:24 +03:00
hamish
307d5d93c4
add potlergeist animation
2022-05-23 08:53:08 -04:00
sneed
248863239b
repair sawssuck abilities
2022-05-23 04:10:18 +03:00
sneed
b71fbec130
repair meteor minior stats
2022-05-23 03:29:01 +03:00
sneed
c8d78706ba
add dex colors to castform forms
2022-05-23 02:53:01 +03: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
GriffinR
f756e60455
Merge pull request #1663 from GriffinRichards/castform-pal
...
Generalize usage of castformPalette
2022-05-21 23:45:01 -04:00
GriffinR
6d772a5e30
Merge pull request #1662 from GriffinRichards/door-gfx
...
Clean up door animations
2022-05-21 16:07:02 -04:00
GriffinR
c9c754be06
Merge pull request #1661 from GriffinRichards/fix-inconsistent-static
...
Fix inconsistent static s/g names
2022-05-20 19:38:02 -04:00
Eduardo Quezada D'Ottone
6be8151981
Merge pull request #2146 from Sneed69/castform_battle
...
Fix castform battle interactions
2022-05-20 10:54:49 -04:00
sneed
d8d31b7972
disable last used ball in bpike
2022-05-20 04:57:32 +03:00
GriffinR
7f64bf58d6
Merge pull request #1660 from GriffinRichards/doc-contest-bar
...
Document Task_UpdateContestResultBar
2022-05-19 12:52:44 -04:00
sneed
881e7e70ec
Generalize usage of castformPalette
...
https://github.com/pret/pokeemerald/pull/1663
2022-05-19 15:23:09 +03:00
sneed
0424e37252
Fix cherrim + castform interaction
2022-05-19 14:20:34 +03:00
GriffinR
91baf08638
Generalize usage of castformPalette
2022-05-18 22:11:51 -04:00
GriffinR
c2dc4a5dea
Some field door comments
2022-05-18 13:03:02 -04:00
GriffinR
5c8e1e81ea
Color single-palette door anim graphics
2022-05-18 12:41:20 -04:00
LOuroboros
059dc02aef
Update pokemon.c
2022-05-18 11:03:57 -03:00
GriffinR
67d73ee36f
Clean up door animation functions
2022-05-17 17:13:29 -04:00
GriffinR
593e2c9be0
Fix inconsistent static s/g names
2022-05-17 14:00:02 -04:00
GriffinR
71ea78cc32
Document Task_UpdateContestResultBar
2022-05-16 15:01:06 -04:00
cbt6
6d6dac3add
Use ARRAY_COUNT in sStepTimes for step functions
2022-05-15 21:44:04 +08:00
ghoulslash
7dd6988b2b
fix args to GetMonData
2022-05-13 20:32:03 -04:00
ghoulslash
b5d98ec93e
prevent overwriting wild mon held items
2022-05-13 20:05:52 -04:00
LOuroboros
52d6c96e69
Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge
2022-05-13 03:20:42 -03:00
LOuroboros
12d956872b
Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge
2022-05-13 03:18:37 -03:00
LOuroboros
2263caef7a
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
2022-05-13 03:17:31 -03:00
Eduardo Quezada D'Ottone
a896f9aed7
Merge pull request #2133 from Sneed69/cobaberry
...
Coba berry fix
2022-05-12 13:39:50 -04:00
sneed
0c0bea33c7
Update items.h
2022-05-12 18:39:10 +03:00
LOuroboros
5b1c31bbc9
Update tutor_learnsets.h
2022-05-10 12:39:36 -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
b43dfd5976
Quick formatting
2022-05-09 17:04:28 -04:00
Eduardo Quezada D'Ottone
b6922a1dab
Merge branch 'pokemon_expansion' into evo_overworld
2022-05-09 16:36:34 -04:00
AgustinGDLV
277f4a3751
niceties
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-05-08 21:23:06 -07:00
AgustinGDLV
502ce4bb33
fixed graphics bug and reverted last commit
2022-05-08 21:16:16 -07:00
AgustinGDLV
e50d5661cd
removed unneccesary preproc
2022-05-08 20:57:12 -07:00
AgustinGDLV
54163240d8
implemented toggelable cancellation / multi-evo
2022-05-08 20:55:29 -07:00
ghoulslash
d5fe2240b8
fix IsAbilityPreventingEscape message in party menu
2022-05-08 21:07:44 -04:00
ghoulslash
07b0ce9737
add inner focus ability popup msg
2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone
13f9919b9e
Merge pull request #2123 from Sneed69/wikiberry_battle
...
Update Confuse Berry Hold Effect (Battle Engine)
2022-05-08 09:02:33 -04:00
