GhoulMage
d11fd21cd6
Changing EVO_NONE from 0xFFFE to 0 ( #5547 )
2024-10-21 07:33:21 -03:00
Eduardo Quezada
9ed153ff93
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015
2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
GriffinR
a0be2cbf7b
Fix Fallorbor typo
2024-10-12 23:50:12 -04:00
Eduardo Quezada
541ca2619b
Start 1.9.4 cycle
2024-10-08 14:47:32 -03:00
Eduardo Quezada
a76f7fe92e
Version 1.9.3 ( #5485 )
...
* Version 1.9.3
* Updated to latest master
2024-10-08 14:45:09 -03:00
Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
Alex
b93e58266e
Fixes recoil moves not triggering berries if possible ( #5449 )
...
* Fixes recoil moves not triggering berries if possible
* Update battle_script_commands.h
2024-10-01 10:43:58 +02:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects ( #5391 )
...
* Ogerpon masks were missing their hold effects
* fix wrong num
* test
* correct tests and additional fix
* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
Kurausukun
52c2728ff6
remove gflib
2024-09-18 10:37:34 -04:00
Eduardo Quezada
6116b8b04e
Start 1.9.3 cycle
2024-09-16 11:57:41 -03:00
Eduardo Quezada
889a02d263
Version 1.9.2 ( #5357 )
...
* Version 1.9.2
* Apply suggestions from code review
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
* Updated to latest master
* Updated to latest master
* Fix last PR
* Corrected order + Pumpkaboo/Gourgeist credits
---------
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-09-16 12:12:34 -03:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Eduardo Quezada
002c770f07
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge
2024-09-09 13:52:34 -03:00
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
Ariel A
839cf2e790
feat: static OW pokemon now bob while walking in place (per OW_MON_BOBBING)
2024-09-01 15:31:12 -04:00
Icedude907
625a006cab
[Build System Rewrite] mapjson now takes output directory parameters. ( #1949 )
2024-08-29 14:01:01 -04:00
cawtds
8af35a7e0d
add Sirfetch'd alias for competitive format ( #5283 )
2024-08-29 08:11:21 -04:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
Martin Griffin
56d3faa32f
Merge pull request #2025 from Bassoonian/cleandefinespaces
...
Clean up defines lacking spaces
2024-08-21 19:04:12 +01:00
Eduardo Quezada
becb2fcac8
Start 1.9.2 cycle
2024-08-19 18:29:48 -04:00
Eduardo Quezada
a11f03ed9d
Version 1.9.1 ( #5199 )
...
* Version 1.9.1
* Added 5195
* Apply suggestions from code review
Co-authored-by: hedara90 <90hedara@gmail.com>
* Added 5196 and 5207
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-08-19 18:25:39 -04:00
GriffinR
3f49c5cbaf
Fix trainer match call flags
2024-08-15 23:00:20 +02:00
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
hedara90
47356d181a
Fixed followers breaking for species IDs above 1535 ( #5179 )
...
* Fixed followers breaking for species Ids above 1535
* Added reminder to increase follower species bits if needed in the future
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-15 10:27:35 -07:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework ( #5159 )
...
* new move anims + fickle beam rework
* more fickle beam changes
* removed the true for consistency
* ficklebeamboosted gets cleared now
* mortal spin and thunderclap changes
* minor mortal spin pal change
* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
Eduardo Quezada
e6e2285c44
Added OBJ_EVENT_GFX_SPECIES_SHINY
2024-08-11 14:50:38 -04:00
Eduardo Quezada
d88834dd58
Backported OBJ_EVENT_GFX_SPECIES macro from Expansion
2024-08-07 13:42:18 -04:00
Eduardo Quezada
512c44b698
Start 1.9.1 cycle
2024-08-01 17:04:48 -04:00
Eduardo Quezada
7ec24b89c8
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0
2024-08-01 16:58:19 -04:00
Eduardo Quezada
f95322628d
Merge branch '_RHH/upcoming' into _RHH/pr/master/1.9.0
2024-08-01 16:47:50 -04:00
Eduardo Quezada
483121dfc0
Version 1.8.6 ( #5005 )
2024-08-01 19:52:29 -04:00
Eduardo Quezada
3372503430
Added OBJ_EVENT_GFX_SPECIES_SHINY macro ( #5049 )
...
* Added OBJ_EVENT_GFX_SPECIES_SHINY
* Update src/event_object_movement.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-29 18:41:03 +02:00
Eduardo Quezada
18aff2db3b
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_anim_script.inc
# data/battle_anim_scripts.s
# include/constants/battle_anim.h
# src/battle_anim.c
# src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM ( #5046 )
2024-07-27 21:41:05 +02:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
Bassoonian
c603e11310
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july
2024-07-27 12:01:39 +02:00
pkmnsnfrn
91b48a10d4
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-26 21:57:42 -07:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
Martin Griffin
5b251b614c
trainerproc: Support Ogerpon
2024-07-25 14:50:32 +01:00
tertu
5ccf3e2688
Fix chain fishing shiny rolls ( #4906 )
2024-07-19 09:48:14 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
sneed
6aa308e1d8
EFFECT_PHOTON_GEYSER and restored EFFECT_SHELL_SIDE_ARM work for physical moves ( #4923 )
2024-07-14 15:35:11 +02:00
Alex
edc883d038
Refactors residual damage ( #4945 )
...
* Refactors damage non types
* correction
* Refactor weather damage script
* new line
* correction
* there was a hail test already
* ndebug
* add sandstorm test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 12:12:40 +02:00
Eduardo Quezada
fb708b7ed3
Merge branch '_RHH/master' into _RHH/upcoming
2024-07-10 10:05:10 -04:00
Eduardo Quezada
0613af5604
Untag
2024-07-10 09:47:35 -04:00
Eduardo Quezada
c0eb9af2e6
Version 1.8.5 ( #4921 )
...
* Version 1.8.5
* Updated up to PR 4926 (squash)
* Fixed descriptions (squash)
* Updated up to PR4939 (squash)
2024-07-10 09:44:55 -04:00
ghoulslash
e1d8ef8190
Dynamic AI Functions ( #4908 )
...
* dynamic ai func
* add AI_TagBattlePreferFoe as an example
* Update src/battle_ai_main.c
* Update src/battle_ai_main.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-07-09 13:50:48 +02:00
Pawkkie
0f21415130
Minor AI flag fixes / cleanup ( #4924 )
...
* AI flag fixes / cleanup
* Review feedback
2024-07-08 20:15:12 +02:00
