Alex
ae62c80d0f
Refactors faint target abilities and adds Battle Bond config ( #6519 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-02 16:00:23 +02:00
psf
b60fcc9a72
Add B_ANIMATE_MON_AFTER_KO - mons animate after scoring a KO ( #6451 )
2025-03-26 11:39:25 +01:00
AlexOn1ine
ae640f0714
25-03-25 master to upcoming merge
2025-03-25 21:39:58 +01:00
hedara90
08f11ca5c1
Update the All Move Animations test ( #6460 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-21 22:33:03 +01:00
Pawkkie
4c18e88282
Improve "all moves bad" switching ( #6453 )
2025-03-20 16:43:56 +01:00
Alex
5c05715585
Adds move description battle config ( #6364 )
2025-03-20 10:12:37 +01:00
Alex
4c4d043c13
Refactor the function IsAbilityPreventingEscape ( #6439 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-03-19 16:09:36 +01:00
wiz1989
1e2aa18ffe
Added Dynamax/Gigantamax battle messages ( #6440 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-03-17 19:16:43 +01:00
khbsd
816ed0d963
Low Health Beeps Configuration ( #6328 )
2025-03-15 22:02:48 -07:00
hedara90
b08a5fb15a
Tests for checking all move animations ( #6297 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-13 13:46:48 +01:00
surskitty
7193909fa7
Configuration to make all Hail moves summon Snow or vis versa, to have only one ice weather ( #6149 )
2025-03-12 21:31:45 +01:00
Pawkkie
b12f32667f
Fix roll handling in AI damage calcs ( #6396 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-03-08 09:53:14 +01:00
wiz1989
e0c7b63095
"no additional effect" text for status Z moves without effects ( #6368 )
2025-03-06 12:47:03 +01:00
surskitty
fb28206f21
Configuration to scale Critical Capture odds based on local Pokedex or estimated National Pokedex ( #6250 )
2025-02-27 15:16:16 -08:00
hedara90
622a7f9a85
Refactor testing flags and vars to not conflict with user ones ( #6301 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-22 15:32:39 +01:00
Pawkkie
b7df5b8c29
Fix Overzealous Absorber Switching ( #6318 )
2025-02-22 10:37:11 +01:00
Pawkkie
bf263efa4b
Fix AI hazard move handling, minor AI tweaks ( #6311 )
2025-02-21 09:58:14 +01:00
Eduardo Quezada
2428af66cd
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-02-20 19:17:59 -03:00
moostoet
a42de40eb2
Add function to adjust AI scoring for generalized item effects ( #6247 )
2025-02-13 12:51:25 -05:00
Eduardo Quezada
9c4fbbf274
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-13 13:06:32 -03:00
Alex
8448e745ea
Adds a follower flag define to disable followers on the fly ( #6174 )
2025-02-13 17:33:59 +01:00
Hedara
0da3e49889
Review comments
2025-02-13 10:36:52 +01:00
Hedara
a859f40e37
Review comments
2025-02-12 14:31:42 +01:00
Hedara
7426a98dc5
Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge
2025-02-12 13:34:28 +01:00
Eduardo Quezada
3507862164
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-12 09:30:59 -03:00
Pawkkie
579fa6410d
Switch chance config support ( #6187 )
2025-02-10 00:30:54 +01:00
Eduardo Quezada
99cb40d896
Added test support for 5 battle configs ( #5914 )
...
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-09 22:29:23 +01:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box ( #6058 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-09 00:54:58 +01:00
khbsd
4fc56128d0
Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites ( #5874 )
...
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
2025-01-30 22:29:20 -03:00
kittenchilly
058bf58b7b
Match current gen behavior for battle environment after fishing ( #6099 )
2025-01-26 22:39:14 +01:00
Eduardo Quezada
3fc9b0195d
Cleaned up code to align with previous review comments
2025-01-26 17:14:00 -03:00
Eduardo Quezada
00241cf569
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
...
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
2025-01-26 12:08:10 -03:00
hedara90
88986baf5f
Trainer Party Pools ( #5731 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-25 13:28:46 +01:00
Eduardo Quezada
26daf15ce0
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-24 18:29:28 -03:00
Eduardo Quezada
cd84e07341
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-23 23:01:25 -03:00
DizzyEggg
4e0eab9e27
Remove gDecompressionBuffer ( #6029 )
2025-01-23 09:47:14 +01:00
hedara90
e8d3b4163f
Trainerslide animation fix ( #6040 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 14:50:23 +01:00
khbsd
52666fb545
IV/EV Info on Summary Screen ( #6027 )
2025-01-20 09:41:31 +01:00
Eduardo Quezada
a756bb501c
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-19 22:31:33 -03:00
Eduardo Quezada
f6a86a65ef
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-19 10:32:57 -03:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality ( #5048 )
2025-01-18 23:19:06 +01:00
AERDU
e4e4460636
fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 ( #6032 )
2025-01-18 19:54:20 +01:00
Bassoonian
243900cdbb
Rename DexNav flags and vars ( #6044 )
2025-01-18 14:44:40 +01:00
Eduardo Quezada
937b3106b4
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-17 19:33:48 -03:00
hedara90
3bcfa355eb
Config for move slot rearrangement in battle ( #6017 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-17 23:03:01 +01:00
Eduardo Quezada
cacd07db9a
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-17 13:49:32 -03:00
ghoulslash
fd26d3a406
Fix Redirection Abilities Not Drawing in Ally Moves ( #6026 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-15 15:20:31 +01:00
Alex
e264fa6fc0
Removed OW_AUTO_SIGNPOST ( #5978 )
2025-01-08 16:14:38 -08:00
psf
81d877339c
Removed OW_AUTO_SIGNPOST ( #5974 )
2025-01-08 21:36:50 +01:00
khbsd
76964dd96a
Fly from Pokenav ( #5679 )
2025-01-05 00:24:58 +01:00
psf
a7f77ed08d
Adds B_VAR_DIFFICULTY and related functions READ DESC ( #5337 )
...
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-01-04 14:25:03 +01:00
Eduardo Quezada
89f90e1f69
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2025-01-03 13:58:10 -03:00
Eduardo Quezada
161c3aadea
OW_OBJECT_SUBPRIORITY
2025-01-03 13:51:11 -03:00
ghoulslash
7a9e847fd4
some clean up
2025-01-02 09:00:56 -05:00
ghoulslash
d8ea4fa1ec
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2025-01-02 08:28:21 -05:00
Eduardo Quezada
a50c78bb1e
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-01 18:34:42 -03:00
Eduardo Quezada
6b8665d08f
Speed up tests in headless mode ( #5889 )
2025-01-01 10:24:23 +01:00
Eduardo Quezada
004efd1e5a
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-31 18:38:03 -03:00
Alex
f864bf8b70
Adds Generational config for Magic Guard (Fix for Gen4+) ( #5893 )
2024-12-30 09:01:20 +01:00
Eduardo Quezada
dbc3cc28b8
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-21 09:31:23 -03:00
Eduardo Quezada
53aebc34dd
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-20 20:48:13 -03:00
Eduardo Quezada
05f300f6cc
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-20 15:22:14 -03:00
hedara90
e579333427
Egg cycle length fix ( #5828 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-20 11:23:51 +01:00
PhallenTree
f4a0cc0055
Adds Thief/Covet config to send stolen item to bag and Pickup config to pickup user's item in wild battles ( #5829 )
2024-12-19 13:51:03 +01:00
Eduardo Quezada
bcc65e74a6
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-14 13:03:16 -03:00
PhallenTree
3ad5de5fef
Adds missing Friend Ball friendship bonus upon catching ( #5795 )
2024-12-10 08:26:23 -03:00
hedara90
75eaf890a2
Evolution level 1 learn ( #5791 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-09 13:21:30 +01:00
hedara90
09a8d051d4
Added the missing config to use new terrains ( #5792 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-09 12:28:31 +01:00
PhallenTree
775ea3b564
Pursuit refactor ( #5707 )
2024-12-06 19:14:46 +01:00
Pawkkie
da2a1e2aba
Destiny Bond fails on repeated use in Gen 7+ ( #5652 )
2024-12-05 22:29:20 +01:00
Eduardo Quezada
d151e00c70
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-12-04 19:15:48 -03:00
Pawkkie
b15f7ad4f1
Sleep Clause global config ( #5762 )
2024-12-02 16:35:28 -05:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE ( #5566 )
...
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-02 09:06:03 +01:00
Eduardo Quezada
1a581c407c
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-01 08:11:32 -03:00
Alex
b3b0973fbb
Fixes Population Bomb / Triple Kick missing message ( #5747 )
2024-11-30 18:06:17 -05:00
ghoulslash
b488ff9b53
merge w upcoming
2024-11-03 07:11:40 -05:00
hedara90
02d7767327
Set default battle shadow to Gen3 ( #5632 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-11-03 07:29:09 -03:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences ( #5595 )
2024-10-29 15:38:26 +01:00
Eduardo Quezada
e8b8ca19a9
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-28 12:13:55 -03:00
Eduardo Quezada
13d3245204
Added compressed OW mon VRAM notice in config file ( #5599 )
2024-10-27 14:04:33 -04:00
ghoulslash
4fc07c4369
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2024-10-20 18:46:54 -04:00
RavePossum
85197eda5e
Move Relearner and Renaming From Summary Screen ( #5513 )
...
* implement move relearner in summary screen
* implement renaming in summary screen
* Enable summary screen rename and relearn by default
* Store original callback when opening screen to invoke later, hide rename/relearn for mons being moved in PC
* add a config to not restore full PP when relearning from summary screen
* hide summary relearner option if mon has no relearnable moves
* add note not to decap RELEARN string
* re-static function that now no longer needs to be accessible elsewhere
* Fix move relearner not showing up if you first select a mon with no moves
* The great curly brace massacre of 2024 (PR feedback)
* sprinkling in some parentheses
* PR feedback 2 (curly braces & whitespace)
2024-10-19 14:43:05 +02:00
ghoulslash
229525d122
some cleanup
2024-10-18 22:13:49 -04:00
ghoulslash
cb9f1f27a7
move dexnav flags, vars to config, add DEXNAV_ENABLED config to add static asserts that flags, vars are setup and dexnav cannot be used/accessed otherwise
2024-10-18 22:00:19 -04:00
ghoulslash
54484593b3
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav
2024-10-18 21:46:54 -04:00
kittenchilly
04aa5b7c24
Add more later gen fishing mechanics ( #5518 )
...
* Add new fishing bite odds and follower boost
* Sticky
* Update item.h
* Update field_player_avatar.c
* Update field_player_avatar.c
2024-10-18 16:45:31 +02:00
Eduardo Quezada
358c0d0699
Added back GBA sprites via config ( #5206 )
...
* Add back older sprites
* Graphics config
* Added GBA most graphical data to gSpeciesInfo
* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files
* GBA mon icons
* Split GBA footprints into separate config
* Separated GBA icons into their own config
* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS
* Moved GBA sprites to regular folder with prefix
* Renamed configs
* Temporarely disabled shadows when GBA sprites are enabled
* Removed remaining files from pokemon_old folder
2024-10-18 13:37:00 +02:00
ghoulslash
bb78d45400
some fixes
2024-10-15 21:24:53 -04:00
ghoulslash
cf78462fab
merge w upcoming
2024-10-15 21:24:47 -04:00
SarnPoke
2db1f071fa
Add battle flag that prevents running from wild Pokémon ( #5502 )
...
* Add No Running Battle Flag
Adds a flag that if set prevents the player from being able to run from wild battles.
* Formatting battle_util.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
* Adjust for pre-Gen 8 Teleport
Addresses the edge case with Teleport when used with under Gen 8 mechanics.
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 21:59:50 +02:00
kittenchilly
5b4acea651
Add config to change Vivillon's breeding form ( #4813 )
...
* Add config to change Vivillon's default form
* Update daycare.c
* Remove the default form stuff
* Update daycare.c
* Clean up
* Assert and fancy
2024-10-10 21:27:50 +02:00
Eduardo Quezada
1d9557811b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-10-08 15:58:17 -03:00
Eduardo Quezada
f913f2884b
Add config for shadow intensity
2024-10-08 12:21:06 -03:00
psf
0dcb28ba0e
Add OW_UNION_DISABLE_CHECK and OW_FLAG_MOVE_UNION_ROOM_CHECK ( #5448 )
...
* First addition of both checks
* Updated config file
* fixed spacing
* Updated spacing
* Fixed issues where feature was always on
* Update overworld.h
fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5448#discussion_r1789647611
2024-10-07 17:07:23 +02:00
Eduardo Quezada
a7fca616b0
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-04 14:28:13 -03:00
ghoulslash
2e52e3331f
merge w upcoming
2024-10-04 12:56:21 -04:00
wiz1989
6f59d26753
updated Conversion 2 mechanics to 5+ ( #5453 )
...
* updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2
* fixes and added new test cases
* bugfixing and added EWRAM u16 gLastUsedMoveType
* update after Pawkkie review
---------
Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>
2024-10-04 12:42:15 -04:00
ghoulslash
c8afe9bbde
some formatting fixes
2024-09-29 13:34:11 -04:00
ghoulslash
be3ee1ba85
merge w upcoming
2024-09-29 13:33:20 -04:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
