Eduardo Quezada
1359966a14
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/event_object_movement.c
# src/scrcmd.c
2024-06-01 20:17:19 -04:00
Ariel A
e420f99fc3
Merge branch 'followers' into followers-expanded-id
2024-06-01 15:20:56 -04:00
Ariel A
3727be9511
fix: fixed a few oversights with follower message generation
2024-06-01 14:46:45 -04:00
Eduardo Quezada
de760e697f
More review
2024-05-31 08:28:57 -04:00
Eduardo Quezada
5bd440f743
Metatile + commas
2024-05-30 13:56:14 -04:00
Eduardo Quezada
e7f66e663b
Convert callfuncs to callnative
2024-05-29 19:25:51 -04:00
Eduardo Quezada
3d05961dd5
getdirectiontoface macro
2024-05-29 15:52:21 -04:00
Eduardo Quezada
d1e2f620b8
Proper macro capitalization
2024-05-29 14:40:53 -04:00
Eduardo Quezada
ff480dec27
More review comments
2024-05-28 18:32:20 -04:00
Eduardo Quezada
5812ca79c6
Added comment to Nurse movement
2024-05-28 17:25:56 -04:00
Eduardo Quezada
2f4077ba5d
Adjusted function names to align with pret
2024-05-28 17:25:18 -04:00
Eduardo Quezada
6d5cd7cbd7
Removed duplicate tags
2024-05-28 14:58:26 -04:00
Eduardo Quezada
021074cd2e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info.h
# src/data/pokemon/species_info/gen_1_families.h
# src/data/pokemon/species_info/gen_2_families.h
# src/data/pokemon/species_info/gen_4_families.h
# src/data/pokemon/species_info/gen_5_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-05-28 14:28:33 -04:00
Eduardo Quezada
8854eaa880
Removed duplicated object event tags
2024-05-28 14:16:34 -04:00
Alex
7a393a974a
Adds Dragon Darts effect (CFRU port) ( #4612 )
...
* Adds Dragon Darts effect (CFRU port)
* fix test compile
* review
2024-05-28 11:34:56 +02:00
Pawkkie
be2517415b
Damage roll selection in AI_CalcDamage ( #4615 )
...
* Damage roll selection and AI_FLAG_CONSERVATIVE
* Clarify enum names
* Simplify AverageRollDmg line
* Change u8s to u32s
* Turns out Boomburst does a lot of damage lol
* Spacing
2024-05-28 10:21:25 +02:00
hedara90
d999092689
Upgraded Dragon Darts Animation ( #4620 )
...
* Upgraded Dragon Darts Animation
* Fixed Dragon Darts not workin in link battles
* Apply suggestions from code review
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-28 10:17:52 +02:00
Ariel A
0630acce44
fix: make LoadSheetGraphicsInfo load, then free, tiles
...
Fixes follower pokeball gfx showing garbage for 1 frame when emerging
2024-05-27 18:15:02 -04:00
Eduardo Quezada
80b193280d
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_main.c
# src/data/item_icon_table.h
# src/data/pokemon/species_info/gen_9_families.h
2024-05-27 10:13:42 -04:00
Eduardo Quezada
069161b716
Untag release
2024-05-27 09:31:06 -04:00
Eduardo Quezada
680c5581d4
Fixed changelog inaccuracy
2024-05-27 09:14:35 -04:00
Eduardo Quezada
767a1c7937
Version 1.8.4 ( #4639 )
...
* Version 1.8.4
* Missing labels
2024-05-27 09:06:34 -04:00
Philipp AUER
431cb64b3e
Pre-1.8.4 pret merge (2024/05/26) (v2) ( #4637 )
2024-05-27 12:40:41 +02:00
Eduardo Quezada
acd62b0065
Reverted bad implementation of Sparkling Aria+Covert Cloak/Shield Dust ( #4634 )
2024-05-27 06:38:05 +02:00
Rachel
94af656f17
Explicitly define Gengar's 3rd ability slot (Hidden Ability) ( #4633 )
2024-05-26 21:50:12 -04:00
Eduardo Quezada
9e72271c8e
Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526
...
# Conflicts:
# src/battle_anim_poison.c
# src/pokemon.c
# src/pokemon_icon.c
2024-05-26 18:34:26 -04:00
Pawkkie
c279aa23c6
Belch AI Scoring Fix ( #4616 )
...
* Belch scoring fix and test
* Add assumptions for pocket
* Update test to AI_SINGLE_BATTLE_TEST
* Alex's fixes
* Missed reverting a line
* Mucked up spacing mb
* Mucked up the spacing fix mb MB
2024-05-26 22:23:04 +02:00
kittenchilly
2e07dbb0ee
Add Gen 9 and PLA footprints + update some footprints ( #4621 )
...
* PLA footprints
* Gen 9 Starters
* Gen 9 Cross Gen Evos
* Question mark
* Gen 9 regular mons
* Gen 9 Paradox mons
* Gen 9 legendaries and mythicals
* Past gen mon footprint changes
2024-05-26 22:20:51 +02:00
Alex
4f1df84acf
Make AI see Loaded Dice hold effect for multi hit moves that strike 5… ( #4622 )
...
* Make AI see Loaded Dice hold effect for multi hit moves that strike 5 times
* Update battle_ai_util.c
2024-05-26 22:19:45 +02:00
Eduardo Quezada
8f38089127
Added failsafe in HGSS dex for Egg Groups without text defined ( #4628 )
...
* Added failsafe in HGSS dex for Egg Groups without text defined
* Fixed stringvar
2024-05-26 19:38:22 +02:00
Eduardo Quezada
ee1d0339f9
Fixed HITMARKER_PASSIVE_DAMAGE whitespace ( #4629 )
2024-05-26 19:37:58 +02:00
hedara90
487dc92119
Fixing bugs with Moxie clones+Dynamax, Fling Flinch infinite loop and Focus Sash+foreseen moves ( #4625 )
...
* Fixed Elixirs not being able to be used unless the first move was missing PP
* Revert "Pokedex Plus fixes (#4514 )"
This reverts commit 982934c4aa#4514 )
* Pokedex plus no longer allows browsing unseen evos
* Restore "has no evolutions" printing
* only print "has no evolution" text at 0 depth
* Revert config changes
* fix duplicate icons and removed eevee hardcodes
* add new scope and indentation fixes
* actually introduce new scope
* Revert "Fixed Elixirs not being able to be used unless the first move was missing PP"
This reverts commit 313f2e5526
2024-05-26 17:01:20 +02:00
cawtds
474f929c02
Fix dire hit being used on incorrect target ( #4626 )
...
* fix getboxmondata for evolutiontracker if compiled with agbcc
* fix dire hit being used on incorrect battler
2024-05-26 00:06:55 +02:00
BlueAnthem37510
a507af300e
Sceptilite & Salandit sprite fixes ( #4614 )
...
Co-authored-by: BlueAnthem37510 <a@a.com>
2024-05-24 11:28:35 +02:00
sneed
312dcbb8a8
Speed Ignoring effect fixes ( #4613 )
...
* Custap ties with Quick Draw, Stall with Mycelium
* add a test
2024-05-24 11:21:35 +02:00
Rachel
c129423a69
Fix move descriptions for Feint and Feint Attack ( #4617 )
2024-05-24 11:19:55 +02:00
GriffinR
18f84b78f2
Merge pull request #1998 from Sneed69/define-POKE_ICON_BASE_PAL_TAG
...
Move POKE_ICON_BASE_PAL_TAG to a header
2024-05-22 20:29:12 -04:00
sneed
b592c6eae5
Add POKE_ICON_BASE_PAL_TAG to a header
2024-05-23 02:45:22 +03:00
kittenchilly
edab81b658
Fix Inner Focus, Scrappy, etc granting immunity to all stat drops if the attacker has Intimidate ( #4606 )
...
* Fix Inner Focus, Scrappy, etc granting immunity to all stat drops if the attacker has Intimidate
* Formatting
* Test
* Update own_tempo.c
2024-05-22 22:20:44 +02:00
Eduardo Quezada
1be5581f19
Revert NUM_DECORATION_FLAGS definition
2024-05-22 14:17:11 -04:00
Eduardo Quezada
25567070d6
Moved callfuncs to general macros folder + added comments + removed unused "emote" macro
2024-05-22 13:52:26 -04:00
Alex
ba07d2b3d4
Renames evolution methods the were labeled as evo level ( #4607 )
...
* [FIX] EVO_LEVEL_MOVE_TWENTY_TIMES -> EVO_USE_MOVE_TWENTY_TIMES
* rename evo_level_recoil_damage
* change EVO_LEVEL_ITEM_COUNT_999
2024-05-22 11:06:24 +02:00
Ariel A
a49d908254
Merge branch 'followers' into followers-expanded-id
2024-05-21 22:23:00 -04:00
Ariel A
c0ca88d45a
Merge pull request #36 from Jaizu/followers-expanded-id
...
Fix virtual object events
2024-05-21 19:17:25 -07:00
Ariel A
b37d9b3000
fix: disable followers in Union Room
...
Fixed #17
2024-05-21 22:14:29 -04:00
Eduardo Quezada
14ab00cfeb
Moved message counts to their own file + remove unneeded include
2024-05-21 22:04:22 -04:00
Eduardo Quezada
9fc7e37c73
Comment updates
2024-05-21 19:38:42 -04:00
Eduardo Quezada
2fe18c22f9
Style fixes
2024-05-21 18:57:09 -04:00
Alex
973146c725
BS_SetGlaiveRush formatting ( #4610 )
...
Please merge my OCD induced change.
2024-05-22 00:55:20 +02:00
sneed
7b8348773b
Triple kick calcs use strikeCount ( #4608 )
2024-05-21 16:45:32 -04:00
