Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

13536 Commits

Author SHA1 Message Date
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
Martin Griffin
f4a2040843 Options menu: cleanup 2022-08-22 08:38:06 +01: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
Ariel A
4654913cb6 Fixed gamma shift not blending the right palettes. 
Refactored/improved some lighting code.
 2022-08-21 16:58:42 -04:00
Martin Griffin
2aa821176b Options menu: sort #includes 2022-08-21 15:06:05 +01:00
Martin Griffin
ba6d4866e4 Options menu: standardize task data 2022-08-21 15:05:57 +01: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
Martin Griffin
d57442a511 Decimal paletteNums 2022-08-19 17:05:22 +01:00
GriffinR
c2d5dd2a1f Additional battle anim sync 2022-08-19 11:51:13 -04:00
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01: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
Ariel A
0b1c81af66 Merge branch 'romhack' into lighting 2022-08-17 19:59:58 -04:00
Ariel A
d846b9c781 Added dynamic palette support for virtual objects. 
Added flag to hide follower on certain maps.
 2022-08-17 19:58:46 -04:00
Ariel A
16babe87fc Follower pokemon now disappears when teleporting. 
Fixed GF's incorrect GFX id on Route 123.
 2022-08-17 19:50:22 -04:00
GriffinR
936ebbd973 Fix phaseShit typo 2022-08-17 11:47:00 -04:00
Ariel A
7edb7bbc23 Added battle slide-in animation for Pokemon follower. 2022-08-16 19:52:38 -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