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 D'Ottone
1a9a2a2c29
Merge pull request #2236 from rh-hideout/DizzyEggg-patch-2
...
ENDTURN_WISH resets gBattleStruct->turnSideTracker
2022-08-24 18:40:12 -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
GriffinR
eecf968390
Merge pull request #1750 from LOuroboros/patch-2
...
Fixed switch syntax in Task_TryFieldPoisonWhiteOut
2022-08-24 17:07:17 -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
crater-git
940f9f1726
Moved branch defs to config.h, now only for compat
2022-08-24 16:10:32 -04: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
Eduardo Quezada D'Ottone
4f333766fa
Merge pull request #2229 from AsparagusEduardo/RHH_MergedBranchUltimate
...
Merged branch
2022-08-23 13:12:22 -04:00
GriffinR
3771abbe08
Fix names and constant usage for union room classes
2022-08-23 12:44:07 -04:00
DizzyEggg
18203a0402
Fix makefile
2022-08-23 14:50:16 +02:00
Eduardo Quezada
7c7887aa65
Moved ABILITY_NAME_LENGTH back to include/constants/global.h to keep in line with upstream pret
2022-08-23 08:25:27 -04:00
DizzyEggg
05ec8fb182
AI knows Party mons
2022-08-23 11:58:17 +02:00
Eduardo Quezada
4c5acca0ce
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
2022-08-22 20:31:44 -04: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
GriffinR
8a8ba92f21
Revert COMMON wildcards
2022-08-22 19:04:47 -04:00
Eduardo Quezada
c1c9837bfc
Merge remote-tracking branch 'RHH/item_expansion' into MergedBranchUltimate
2022-08-22 17:31:21 -04:00
Eduardo Quezada
18612b7686
Merge remote-tracking branch 'RHH/pokemon_expansion' into MergedBranchUltimate
2022-08-22 17:31:00 -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
