crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
AgustinGDLV
e204527f43
changed candy item parameters
2022-08-25 15:52:47 -07:00
LOuroboros
8bd7103b9d
Even more review corrections
2022-08-25 17:32:12 -03:00
DizzyEggg
622a7f8141
merge with master
2022-08-25 22:10:59 +02:00
LOuroboros
2cf2c00b29
Updated friendship labels
2022-08-25 17:10:11 -03:00
LOuroboros
7539051942
Further tweaked the affection animation
2022-08-25 17:05:57 -03:00
ghoulslash
15a368163d
Merge pull request #2247 from AsparagusEduardo/RHH_specialPic
...
LoadSpecialPokePic adjustments
2022-08-25 15:35:21 -04:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves
...
Moves with EFFECT_PLACEHOLDER can't be used.
2022-08-25 15:34:23 -04:00
ghoulslash
b45e1887d8
Merge pull request #2242 from AsparagusEduardo/RHH_fixOrbPower
...
Fixed creation trio orbs not boosting power for non-base forms.
2022-08-25 15:18:02 -04:00
LOuroboros
1bfff42ad2
Fixed ENDTURN_STATUS_HEAL
2022-08-25 12:38:47 -03:00
DizzyEggg
1b9c2816c2
fix updatehptextinhealthbox arguments
2022-08-25 17:37:47 +02:00
DizzyEggg
63370b065d
Party menu supports 4digit hp
2022-08-25 17:31:14 +02:00
LOuroboros
1fc63c3431
More review corrections
2022-08-25 11:52:21 -03:00
LOuroboros
23bf67c63f
Removed unnecessary inclusion of header in src/field_specials.c
2022-08-25 11:43:01 -03:00
DizzyEggg
a0ec8a5a80
4 digit hp in battle
2022-08-25 16:40:56 +02:00
LOuroboros
11d6ae4820
Renamed the GetLeadMonFriendshipScore constants
2022-08-25 11:34:37 -03:00
GriffinR
8a1130d046
Missing constant in friendshiptodamagecalculation
2022-08-25 10:21:41 -04:00
LOuroboros
e792fae415
Review corrections
...
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
2022-08-25 10:45:57 -03:00
LOuroboros
1f4ef2a0fb
Added constants for GetLeadMonFriendshipScore
2022-08-25 10:40:56 -03:00
ghoulslash
90ae339cac
Merge pull request #2240 from AsparagusEduardo/RHH_fixBEMerge
...
Included PR #2219 that was accidentally merged into BE
2022-08-25 08:47:38 -04:00
ghoulslash
f736766c94
Merge pull request #2238 from DizzyEggg/multi
...
Wild multi battles and doubles 2 vs 1 interface
2022-08-25 08:47:02 -04:00
Eduardo Quezada
af137c9b9d
Multiple changes
...
- Simplified LoadSpecialPokePic
- Changed all checks flag checks to houldShowFemaleDifferences
2022-08-25 03:42:41 -04:00
Eduardo Quezada
b2af7a1b47
Fixed critical capture fields not using TRUE or FALSE
2022-08-25 01:17:17 -04:00
Eduardo Quezada
045dbcf81e
Fixed creation trio orbs not boosting power for non-base forms.
2022-08-25 00:48:35 -04:00
Eduardo Quezada D'Ottone
a210e45c61
Merge pull request #2234 from rh-hideout/DizzyEggg-abilpopup
...
Ability pop-up displays properly long abilities
2022-08-25 00:17:38 -04:00
Eduardo Quezada D'Ottone
5659f6178f
Optimized x adjustment
2022-08-25 00:03:43 -04:00
gruxor
d719510d32
Apply suggestions from code review
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-08-24 22:31:52 -04:00
LOuroboros
1d512ed57d
Updated Serene Grace checks in AI_CheckViability
2022-08-24 20:00:13 -03:00
Eduardo Quezada D'Ottone
62175cc655
Merge pull request #2235 from rh-hideout/DizzyEggg-patch-1
...
Get rid of garbage bytes in graphics.c
2022-08-24 18:56:08 -04:00
Eduardo Quezada
30594a9773
Included PR that was accidentally merged into BE
2022-08-24 18:37:25 -04:00
DizzyEggg
4f790a6ec0
spaces
2022-08-24 23:47:42 +02:00
DizzyEggg
91b76e2e4f
quash pr clean up
2022-08-24 23:39:34 +02:00
DizzyEggg
06b4548603
Merge branch 'SonikkuA-DatH-Quashh' of https://github.com/SonikkuA-DatH/pokeemerald-expansion into quash
2022-08-24 23:35:42 +02:00
GriffinR
32ea55dcba
Merge pull request #1752 from LOuroboros/patch-4
...
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL
2022-08-24 17:08:15 -04:00
GriffinR
8cc520ccd7
Merge pull request #1751 from LOuroboros/patch-3
...
Fixed KeyInterCB_DeferToEventScript comment
2022-08-24 17:07:59 -04:00
DizzyEggg
7aa55f2753
better interface 1 player mon in double
2022-08-24 23:00:21 +02:00
LOuroboros
015961c00a
Re-aligned READ_PTR_FROM_TASK's 2nd line EoL
2022-08-24 17:19:24 -03:00
LOuroboros
3a65529293
Fixed KeyInterCB_DeferToEventScript comment
2022-08-24 17:12:59 -03:00
LOuroboros
90f72a745a
Fixed switch syntax in Task_TryFieldPoisonWhiteOut
2022-08-24 17:01:36 -03:00
DizzyEggg
e3ab439ec0
Fix multi wild battles
2022-08-24 21:56:24 +02:00
DizzyEggg
cc8dd92247
ENDTURN_WISH resets gBattleStruct->turnSideTracker
2022-08-24 20:48:47 +02:00
DizzyEggg
0bf2b26491
Get rid of garbage bytes in graphics.c
2022-08-24 20:36:49 +02:00
DizzyEggg
17b47de90d
Ability pop-up displays properly long abilities
2022-08-24 20:20:44 +02:00
crater-git
1ff5bdca9d
Added list endings to otherwise empty learnsets
2022-08-24 11:55:39 -04:00
Blackforest92
fb00ac977a
Adjust endif in form_species_tables.h to include Hisuian Sneasel and Qwilfish
2022-08-24 16:21:45 +07:00
Blackforest92
07a07ddc8d
Update to latest master branch + allow Reveal Glass to work with Enamorus
2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone
ec4ff0acb7
Update battle_debug.c
2022-08-24 01:33:00 -04:00
Eduardo Quezada D'Ottone
2bd06dee1d
Update battle_debug.c
2022-08-24 01:21:06 -04:00
Eduardo Quezada D'Ottone
21867a6061
Merge branch 'master' into AI
2022-08-24 01:07:35 -04:00
Eduardo Quezada D'Ottone
21fe205f0f
Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes
...
Fix multiple pokemon icons & tidying pokemon graphic folders
2022-08-24 00:52:49 -04:00
Eduardo Quezada D'Ottone
8f12e1f5c6
Merge pull request #2125 from ghoulslash/be/escapepreventionfix
...
fix IsAbilityPreventingEscape message in party menu
2022-08-24 00:48:57 -04:00
Eduardo Quezada D'Ottone
33e1562253
Merge pull request #2219 from aarant/battle_engine
...
Fixed Gen5+ multihit odds.
2022-08-24 00:34:58 -04:00
Eduardo Quezada
eea718cfc6
Placeholder moves can't be used in battle.
2022-08-24 00:30:49 -04:00
crater-git
7ac2f566fd
Re-added PP if statements for P_NEW_POKEMON
2022-08-23 23:08:38 -04:00
Eduardo Quezada
56a2e91518
Updated move limitations
2022-08-23 22:40:04 -04:00
Eduardo Quezada
09fd393f97
Replaced instances of power == 0 with IS_MOVE_STATUS + fixed Wonder Skin
2022-08-23 22:38:35 -04:00
Ct11217
67f473f38b
Fixed recommended issues.
...
Added additional comments.
Reordered switching ladder in ShouldSwitch() function.
Functions that can specify a specific party mon to switch into need to come first.
2022-08-23 19:49:54 -06:00
crater-git
45511fcc44
Reworked TMHM into expandable list format
2022-08-23 21:44:42 -04:00
Eduardo Quezada
1f5adf93c7
Cleaned up use of configs be almost exclusively preproc functions
2022-08-23 21:00:08 -04:00
GriffinR
3771abbe08
Fix names and constant usage for union room classes
2022-08-23 12:44:07 -04:00
DizzyEggg
05ec8fb182
AI knows Party mons
2022-08-23 11:58:17 +02:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
DizzyEggg
327782646b
Save party mons ai
2022-08-23 01:07:25 +02:00
Eduardo Quezada
c1c9837bfc
Merge remote-tracking branch 'RHH/item_expansion' into MergedBranchUltimate
2022-08-22 17:31:21 -04:00
Eduardo Quezada
2b7a2c4d09
Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate
2022-08-22 17:30:48 -04:00
Eduardo Quezada
75ac960365
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
2022-08-22 17:27:21 -04:00
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock
...
Clean up lock/unlock anim movement
2022-08-22 01:30:33 -04:00
GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs
...
Fixed inconsistent use of white space for scripts, .c files and .h files.
2022-08-20 23:03:59 -04:00
GriffinR
261b0ff118
Standardize judgement vs judgment spelling
2022-08-20 22:58:46 -04:00
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const
...
Add some missing battle arena constants
2022-08-20 22:54:32 -04:00
GriffinR
81ef818f61
Merge pull request #1731 from GriffinRichards/missing-tag
...
Move party menu data constants
2022-08-20 22:43:52 -04:00
Eduardo Quezada
76d2d92abb
Merge branch 'pretmaster' into pret_clean2
2022-08-20 12:43:09 -04:00
GriffinR
1685365cd4
Merge pull request #1727 from AsparagusEduardo/pret_clean
...
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-19 21:27:55 -04:00
GriffinR
c2d5dd2a1f
Additional battle anim sync
2022-08-19 11:51:13 -04:00
Blackforest92
2b512a8e03
Fix Voltorb and Exeggutor' form species table
2022-08-19 18:14:11 +07:00
Blackforest92
346f3b7f4c
Fix PLA's base_stats.h (rename .item2 to .itemRare)
2022-08-19 18:01:28 +07:00
Blackforest92
a9d09bcd17
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion
2022-08-19 17:53:01 +07:00
Blackforest92
00a827b3fb
Add PLA pokemon to Form Species Table, add Kleavor's graphics
2022-08-19 17:47:34 +07:00
Eduardo Quezada
3bc2cf921c
Sync src/battle_controllers.c with pokefirered
2022-08-18 14:30:22 -04:00
Eduardo Quezada
59f89bde9e
Misc cleanup
2022-08-18 14:23:45 -04:00
Ct11217
a4b53126f6
Added AI_FLAG_ACE_POKEMON
...
When this flag is set, the trainer will have an "Ace" pokemon that will
always be sent out last.
If this flag is set, the last Pokemon in the party will be considered the
"Ace" Pokemon.
This is similar to the gym leader functionality found in Sword & Shield.
2022-08-17 18:23:12 -06:00
GriffinR
936ebbd973
Fix phaseShit typo
2022-08-17 11:47:00 -04:00
Eduardo Quezada
5933c42439
Synced Route 4 and 10's MapSec labels
2022-08-16 18:23:37 -04:00
GriffinR
2ec8f27811
Add missing usage of SOUND_PAN_*
2022-08-16 13:04:00 -04:00
Eduardo Quezada
7b0c8ec972
Revert style changes
2022-08-15 20:41:12 -04:00
Eduardo Quezada
44b26cc8aa
From pokefirered
2022-08-15 18:27:37 -04:00
Eduardo Quezada
e8a05e92e4
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
tustin2121
ec73158f16
Moving documentation comments per request
...
from the discord chat.
2022-08-15 16:37:38 -04:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
Ct11217
bb978764f3
Fixed recommended changes
...
Added additional double battle logic for yawn
2022-08-13 00:39:44 -06:00
GriffinR
5515e328b2
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
Ct11217
7378d1099b
Removed AI_GetAbility
...
Misc cleanup
2022-08-12 15:21:25 -06:00
AgustinGDLV
a5e742afcd
implemented review changes
2022-08-12 12:00:05 -07:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
...
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
GriffinR
574cf1ddb9
Merge pull request #1725 from GriffinRichards/security-signature
...
Sector security -> signature
2022-08-12 10:47:10 -04:00
Ct11217
b95e450cb6
Added corner case logic for AI Switching.
...
1. Refactor Perish Song
2. Yawn
3. Secondary Damage (Leech Seed, Cursed etc).
4. Added Preliminary logic to help AI be smarter against semi-invulnerable
Added AI logic regarding abilities that benefit from switching
1. Natural Cure
2. Regenerator
2022-08-11 22:48:36 -06:00
GriffinR
cf4d05e9e7
Fix typo
2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb
Add some missing battle arena constants
2022-08-11 12:02:56 -04:00
Eduardo Quezada D'Ottone
3d94ada041
Merge pull request #2166 from Sneed69/fix_tm_compat
...
Fix tm/hm compatibility
2022-08-11 10:07:03 -04:00
GriffinR
286a99eb1d
Merge pull request #1723 from GriffinRichards/fix-impassable
...
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-10 21:28:14 -04:00
WhenGryphonsFly
475658116e
Fix BUGFIX return statement in battle_dome.c
2022-08-10 20:00:16 -05:00
WhenGryphonsFly
86881b12ef
Use PARTY_SIZE for Pokerus Nurse Conversation
2022-08-10 19:09:59 -05:00
GriffinR
e06ba39751
Use button constants in Task_HandleChooseMonInput
2022-08-10 15:14:35 -04:00
GriffinR
f534e8e44a
Move party menu data constants
2022-08-10 14:30:01 -04:00
GriffinR
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
ghoulslash
eb0cc91dce
Merge pull request #2224 from AsparagusEduardo/BE_cosntantsZmove
...
B_WIN constants in battle_z_move.c
2022-08-08 21:13:23 -04:00
Eduardo Quezada
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -04:00
LOuroboros
80057fc990
Update battle_z_move.c
2022-08-07 10:19:03 -03:00
GriffinR
079b1762ac
Update special save sector size checks
2022-08-05 12:11:33 -04:00
GriffinR
2487ddb128
Sector security -> signature
2022-08-05 10:42:31 -04:00
Eduardo Quezada D'Ottone
08f08ece98
B_WIN constants in battle_z_move.c
2022-08-04 15:35:08 -04:00
DizzyEggg
c991131b75
Change language stuff based on the french decomp
2022-08-04 11:53:16 +02:00
GriffinR
e5c36cd745
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-03 14:21:13 -04:00
GriffinR
79384ec9f3
Merge pull request #1702 from GriffinRichards/clean-psn
...
Clean up field_poison.c
2022-08-02 13:20:49 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro
...
Macros for keeping .partyFlags, .partySize, and .party in sync
2022-08-02 13:11:43 -04:00
ExpoSeed
49da2ee53f
Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION
2022-08-02 00:15:55 -05:00
Ariel A
9a0a759b3f
Fixed multihit odds.
2022-08-01 20:23:25 -04:00
Eduardo Quezada
b49f8c10ad
Review changes from https://github.com/pret/pokefirered/pull/525
2022-08-01 15:37:05 -04:00
Eduardo Quezada
cc288e3786
Review changes
2022-08-01 15:14:21 -04:00
Eduardo Quezada
7ea49adf3c
CpuCopy16 in UnkUtil_CpuRun
2022-08-01 08:04:48 -04:00
Eduardo Quezada
c6cdb2a281
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-31 22:57:46 -04:00
benicioneto
3d8aeeac77
Fix the AI
...
The AI was using only the first move, and soft locking when the first move's PP ends
2022-07-30 17:33:48 -03:00
Eduardo Quezada
a72d4c4168
Cleanup from syncing pss and mon markings
2022-07-30 12:43:14 -04:00
Eduardo Quezada D'Ottone
22ab78e2f8
Fixed Steam Eruption's long name
2022-07-30 00:10:20 -04:00
Eduardo Quezada
897b3d07f6
Sync src/pokeball.c with pokefirered
2022-07-29 21:29:12 -04:00
Eduardo Quezada
2e1bf0d965
OamData mosaic FALSE
2022-07-29 21:27:39 -04:00
Eduardo Quezada
2214b01954
Forgot to include this fix
2022-07-29 17:07:56 -04:00
Eduardo Quezada
5d4b76c0ba
Review changes from pokefirered #524
2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd
Review changes
2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3
Struct pointers star standarizing
2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0
void pointer standarized
2022-07-29 10:52:35 -04:00
Eduardo Quezada
aa93af4083
Fixed check
2022-07-29 10:34:21 -04:00
Eduardo Quezada
fa32f337be
Review changes
2022-07-29 10:21:20 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064
Cleanup by syncing src/battle_script_commands.c with pokefirered
2022-07-29 09:43:16 -04:00
Greenphx9
05cbd6a906
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names
2022-07-29 18:49:25 +10:00
ghoulslash
0c79d04dec
Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm
...
Prevent Transforming Pokémon from changing forms
2022-07-28 22:26:56 -04:00
ghoulslash
5a850b0b4e
Merge pull request #2212 from AsparagusEduardo/BE_healBallFix
...
Fixed Heal Ball not always healing caught Pokémon
2022-07-28 22:22:20 -04:00
Eduardo Quezada
09af7422d5
Further cleaning after comparing with pokefirered
...
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
2022-07-28 01:27:05 -04:00
Eduardo Quezada
dc47a959da
Reverted comments from pokefirered
2022-07-27 20:33:34 -04:00
Eduardo Quezada
b00bd8b181
Cleaned by comparing evolution_scene.c with pokefirered
2022-07-27 18:51:32 -04:00
Martin Griffin
2380d13a43
Macros for keeping .partyFlags, .partySize, and .party in sync
2022-07-27 23:25:37 +01:00
GriffinR
4ffe75c611
Merge pull request #1707 from GriffinRichards/use-pocket-consts
...
Add some missing pocket constant usage
2022-07-27 12:22:01 -04:00
GriffinR
1da46a4bbc
Merge pull request #1715 from AsparagusEduardo/pret_docBooleans
...
Documented boolean uses
2022-07-27 12:09:02 -04:00
Eduardo Quezada
e1c15a9cf6
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-27 08:16:10 -04:00
Eduardo Quezada D'Ottone
0f6186d8ab
Merge pull request #2211 from AsparagusEduardo/BE_Gen3Switch
...
Config for Gen 3 faint switch mechanics
2022-07-27 08:14:13 -04:00
Eduardo Quezada
7af85b0c49
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-27 08:12:08 -04:00
Eduardo Quezada D'Ottone
aebd667260
Merge remote-tracking branch 'RHH/battle_engine' into BE_fixTransformForm
...
# Conflicts:
# src/battle_ai_main.c
2022-07-26 17:00:53 -04:00
GriffinR
5366e89258
Merge pull request #1713 from DizzyEggg/patch-1
...
Change GAME_LANGUAGE to LANGUAGE_ENGLISH
2022-07-26 11:08:05 -05:00
Eduardo Quezada D'Ottone
611b192e8c
Small AI fixes by mrgriffin
2022-07-26 09:53:39 -04:00
DizzyEggg
b7c78571a6
Update src/international_string_util.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-07-26 15:39:29 +02:00
DizzyEggg
c557c4eb27
Add a comment
2022-07-26 14:44:53 +02:00
LOuroboros
b59f7aed7f
Added a constant for NPC trainer name length ( #1712 )
2022-07-25 22:59:13 -04:00
Eduardo Quezada
a37d8b1346
Documented boolean uses
2022-07-25 14:59:14 -04:00
LOuroboros
032b7b2ab9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection
2022-07-25 10:24:19 -03:00
Eduardo Quezada D'Ottone
8d18fc0dd8
Fixed Heal Ball not always healing caught Pokémon
2022-07-25 08:54:03 -04:00
Eduardo Quezada D'Ottone
bfb86fdc86
Config for Gen 3 faint switch mechanics
2022-07-24 14:57:47 -04:00
Eduardo Quezada
be22f299f8
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-24 14:00:10 -04:00
LOuroboros
f1d8d006f3
Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove
2022-07-24 06:47:50 -03:00
DizzyEggg
151b5a5f8a
Change GAME_LANGUAGE to LANGUAGE_ENGLISH
2022-07-23 12:23:04 +02:00
Eduardo Quezada
e96c9c87fa
Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge
...
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 23:38:52 -04:00
Eduardo Quezada
231727d02b
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
...
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
2022-07-22 23:33:04 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
ghoulslash
1260666c91
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides
...
Added Egg breeding species overrides.
2022-07-22 14:05:14 -04:00
ghoulslash
cef730e451
Merge pull request #2196 from AsparagusEduardo/IE_pretmerge
...
Item Expansion pret merge
2022-07-22 14:01:50 -04:00
ghoulslash
0588bba193
Merge pull request #2195 from AsparagusEduardo/PE_pretmerge
...
Pokémon Expansion pret merge
2022-07-22 14:01:27 -04:00
ghoulslash
3a77b52bad
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
...
Battle Engine pret merge
2022-07-22 14:00:40 -04:00
Blackforest92
56f4c319a4
Fix multiple pokemon graphics, tidying pokemon graphic folders
2022-07-22 22:17:29 +07:00
Eduardo Quezada D'Ottone
af72fb0d32
Simplified pre-gen5 checks
2022-07-21 16:36:07 -04:00
Eduardo Quezada D'Ottone
56b9a50109
Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus
...
# Conflicts:
# include/constants/battle_config.h
2022-07-21 16:28:16 -04:00
ghoulslash
24bb2f7ed0
Merge pull request #2179 from LOuroboros/pinch
...
Removed global and unused IsPinchBerryItemEffect
2022-07-21 16:14:56 -04:00
ghoulslash
49a932a892
Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky
...
Fixed Light That Burns The Sky not using the calculated damage category
2022-07-21 16:14:38 -04:00
ghoulslash
30a494f964
Merge pull request #2197 from AsparagusEduardo/BE_explosion
...
Config for Explosion halving defense
2022-07-21 16:11:32 -04:00
ghoulslash
504600c996
Merge pull request #2201 from AsparagusEduardo/BE_sturdy
...
Config for Sturdy's Gen5+ effect.
2022-07-21 16:09:01 -04:00
ghoulslash
2ce32afeaa
Merge pull request #2202 from AsparagusEduardo/BE_SkyDrop
...
Sky Drop fixes
2022-07-21 16:06:42 -04:00
ghoulslash
2fc15ab779
Merge pull request #2203 from AsparagusEduardo/BE_ghostEscapeAiFix
...
Ghost Escape config AI fix
2022-07-21 16:00:33 -04:00
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
AgustinGDLV
90d86d4b04
pulled IE
2022-07-20 10:53:19 -07:00
AgustinGDLV
9c73cb322e
replaced bitfield with LUT
2022-07-20 10:48:09 -07: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
64115a873f
Comatose prevents Battle Pike's status effects.
2022-07-18 18:15:44 -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
LOuroboros
a1f921c33d
Fixed CanTeleport
...
Also took the chance to correct the syntax inside its switch case.
2022-07-04 16:15:44 -03:00
Blackforest92
ff861ff963
Add some of Legends Arceus battle sprites
2022-07-04 12:28:40 +07: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
8f728dcd79
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
2022-07-03 13:49:18 -03:00
LOuroboros
3c9be7c3b2
Fixed Pokéblock Case's description
2022-07-03 13:36:00 -03:00
Blackforest92
8c88e8a9b7
Legends Arceus Pokemon 95% Finished
2022-07-03 17:15:37 +07: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
LOuroboros
deef09112f
Corrected usage of B_AFFECTION_MECHANICS in CalcCritChanceStage
2022-06-22 08:42:31 -03:00
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03:00
GriffinR
8950a41bfd
Update some GF rom header names
2022-06-21 18:31:09 -04:00
