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
pkmnsnfrn
1ad3ba1f32
Fixed compilations errors with abgcc
2024-07-27 10:58:51 -07: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
pkmnsnfrn
2a5f384e66
Added metatile behaviors to mart and center signs
2024-07-25 19:44:26 -07:00
pkmnsnfrn
fd69ef339c
Got pokemart and pokecenter changes working
2024-07-25 19:33:07 -07: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
pkmnsnfrn
b43e0e07f7
Add config to disable OW_AUTO_SIGNPOST
2024-07-15 21:45:34 -07:00
pkmnsnfrn
28183ec299
first merge of ghoul's branch
2024-07-15 21:35:58 -07: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
Bassoonian
367f6dc8fd
Address concerns
2024-07-13 18:01:54 +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
Bassoonian
003bd54600
Rename battle terrain to environment
2024-07-13 12:02:18 +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
ghoulslash
bd014e4fb7
syntax, alignment fixes
2024-07-08 14:15:41 -04:00
Pawkkie
0f21415130
Minor AI flag fixes / cleanup ( #4924 )
...
* AI flag fixes / cleanup
* Review feedback
2024-07-08 20:15:12 +02:00
ghoulslash
48d2bff553
merge w upcoming
2024-07-08 14:12:00 -04:00
psf
4ddae07451
Removed AI_FLAG_HELP_PARTNER ( #4918 )
2024-07-08 11:38:52 +02:00
cawtds
5dda4b846e
fishing chain only resets on failed attempt or when map warping, encountering different species does not break the chain, differentiate between max shiny streak and max chain length
2024-07-06 15:18:51 +02:00
Eduardo Quezada
fcdc9ed65a
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
Pawkkie
3660a054a2
Forgot to update this when adding AI_FLAG_SEQUENCE_SWITCHING ( #4911 )
2024-07-05 18:41:29 +02:00
DizzyEggg
d81662daa2
Add parentheses to species egg macro ( #4899 )
2024-07-02 13:39:41 +01:00
Pawkkie
7e167f0b3c
Add AI_FLAG_SEQUENCE_SWITCHING ( #4878 )
...
* AI_FLAG_BAD_SWITCHING
* Cleanup and tests, U-Turn / Baton Pass / Parting Shot aren't working properly
* Fix U-Turn etc. tests
* Test overhaul with Egg's suggestions
* Add EFFECT_HIT_SWITCH_TARGET to tests
* Review feedback
* Re-review feedback
2024-07-01 08:53:07 +02:00
Bassoonian
81bd14818e
Add day limit for forms support ( #4778 )
...
* Add day limit for forms support
* Add missing newline
* Incorporate review suggestions
2024-06-26 10:36:44 +02:00
AgustinGDLV
9797640dff
Gimmick Refactor ( #4449 )
...
* consolidated gimmick checks, triggers, communication, and activation; updated test runner
* fixed improper use of .usableGimmick
* cleaning up battle_dynamax.c, changing function args to u32s
* fixed '#ifdef TESTING' causing errors
* updated z-moves to use gimmick interface, pared down redundancies; no AI/tests
* added support for z-moves in tests, consolidated gimmick fields
* removed ShouldUseMaxMove and .usingMaxMove
* renamed TryChangeZIndicator, updated z move display
* added several z-move tests and fixed various z-move interactions; fixed z-move category calc
* fixed useless battler arg in GetTypeBasedZMove
* added basic test check for bad Z-Move or Mega usage
* reworked test runner gimmick functionality; added support for Ultra Burst + Z-Move to test Light That Burns the Sky
* fixed gimmick test logic; fixed damage category override
* fixed mega rayquaza test fail
* consolidated gimmick indicator logic; added graphics to gGimmicksInfo
* removed TeraData struct
* reimplemented AI logic for Z-Moves; no changes
* updated Z-Move and Ultra Burst trigger gfx
* added testrunner check for multiple gimmick use
* fixed duplicate z-move call in test
* reorganized data/graphics/gimmicks.h
* added signature Z-Move ability tests; implemented Guardian of Alola
* fixed bad test update
* fixed Thousand Arrows not affecting Tera Flying; clean-up
* fixed -ate tests
* fixed tera tests
* fixed tera tests really
* fixed last batch of tests
* fixed -ate mega test again
* code review
* code review pt.2
* tweaked CanTera again
* dynamax flag only required for player
2024-06-22 22:25:40 +02:00
DizzyEggg
d0bb03e5a9
Fix AI's right slot switching-in too early ( #4851 )
...
* apply safe switching to trainer doubles battles - with a config
* get rid of the config
* make it compile
2024-06-21 12:17:12 +02:00
ghoulslash
b8dea3c7ec
sideways stairs, try to integrate with follower code
2024-06-19 10:50:59 -04:00
ghoulslash
45da91e773
Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs
2024-06-19 10:25:50 -04:00
Eduardo Quezada
4d6452e14e
Move general config file to the config folder ( #4805 )
2024-06-19 13:42:01 +02:00
Frank DeBlasio
eb0c3b0a12
Fixed instance of MAROWAX ( #4830 )
2024-06-18 10:45:55 +02:00
ghoulslash
cb1696384c
merge in original dexnav code with some rhh specific tweaks
2024-06-16 10:39:28 -04:00
ghoulslash
652cb007ce
merge w pret master, add USE_DEXNAV_SEARCH_LEVELS flag
2024-06-16 09:45:38 -04:00
Bassoonian
22994c79d4
Add support for multiple roamers ( #4762 )
...
* Replicate initial commit
* Integrate the rest of Duke's vanilla commits
* Alter Roamer struct to add frostbite support
* Fix some indentation issues
* Add option to hide substitute followers
* Revert "Add option to hide substitute followers"
This reverts commit 3fadaafae50aeb48c089d5a27af6deca9580ff64.
* Incorporate feedback
2024-06-15 11:17:32 +02:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality ( #4761 )
...
* Split Pokémon Object Events from Following Pokémon functionality
* Renamed follower pngs and palettes
* Define renames
* Reorder configs
* Renaming: SpeciesInfo fields, macros and palettes.
2024-06-13 22:46:27 +02:00
Eduardo Quezada
06153e4280
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle.h
# include/constants/battle_script_commands.h
# include/constants/pokemon.h
# src/battle_ai_util.c
# src/battle_main.c
# src/battle_util.c
# test/battle/ai.c
2024-06-13 11:44:28 -04:00
Bassoonian
76c566a0ca
Add the Let's Go evolution method ( #4758 )
...
* Add overworld step evolution method
* Increase evolutionTracker bits from 9 to 10
* Implement tracker increase
* Remove leftover NDEBUG activation
* Reset evolution tracker data upon evolution
* Revert an accidental change to unrelated code
* Add missing break in switch case, oops
2024-06-12 11:31:19 +02:00
Alex
9c72392891
Fixes Shell Side Arm ( #4753 )
...
* Fixes Shell Side Arm
* Fixes to random call
* hardcoded the effect to the move
* minor change
* minor change 2
* applied reviews
2024-06-12 11:21:44 +02:00
Bassoonian
dffaaeaaa6
Add Leader's Crest evolution method ( #4768 )
...
* Add Leader's Crest evolution method
* Fix typo in in HGSS dex
* Update src/pokedex_plus_hgss.c
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
* Update src/battle_script_commands.c
---------
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-12 09:31:59 +02:00
Bassoonian
341fa3692c
Make Tandemaus only evolve at the end of battles ( #4759 )
2024-06-12 08:43:51 +02:00
