Eduardo Quezada
e005ffb576
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-06 10:01:48 -03:00
Alex
8581646c22
Convert 3 variouses to callnatives ( #5646 )
2024-11-06 10:09:49 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message ( #5645 )
2024-11-06 10:09:00 +01:00
Eduardo Quezada
ee2535be96
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-03 12:21:22 -03:00
Alex
45d063dcf8
Fixes Dragon Tail using the effect twice during a Parental Bond attack ( #5630 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-02 09:38:29 -03:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids ( #5560 )
2024-10-28 18:03:15 +01:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines ( #5581 )
2024-10-27 20:15:11 +01:00
GhoulMage
6819dd3c37
New AI flag for marking the two last Pokémon as Ace Pokémon. ( #5587 )
2024-10-27 11:32:45 -04:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards ( #3240 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-21 14:52:45 -03:00
Eduardo Quezada
3205f377d5
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-21 08:18:44 -03:00
GhoulMage
d11fd21cd6
Changing EVO_NONE from 0xFFFE to 0 ( #5547 )
2024-10-21 07:33:21 -03:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects ( #5549 )
2024-10-20 21:44:28 +02:00
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -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
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands
2024-10-11 16:27:02 -07:00
Bassoonian
d0379b9b55
Turn item hold effects into an enum ( #5498 )
...
* Turn item hold effects into an enum
* Rename to ItemHoldEffect
2024-10-10 14:23:59 +02:00
SonikkuA-DatH
708f64247f
Heart Swap Move Animation ( #5460 )
2024-10-09 10:43:04 +02:00
Eduardo Quezada
ee00c251ae
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-08 14:52:12 -03: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
Eduardo Quezada
80af2af9ad
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-03 14:33:01 -03:00
kittenchilly
44bf14e6fd
Add functionality to Poké Flute and Town Map ( #5405 )
...
* Add functionality to Poké Flute and Town Map
* Poke flute in-battle
* Address reviews
* Update item_use.c
* Update battle_message.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
* Update battle_script_commands.c
2024-10-03 10:52:59 +02:00
psf
2597d8a35a
Updated species defines ( #5075 )
...
* First version of new defines
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Removed old defines
* Removed old defines
* Removed old defines and cleaned up some macros
* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs
* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599
* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
2024-10-02 18:24:57 -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
psf
58aa1e0034
Merge branch 'upcoming' into scriptCommands
2024-09-30 06:57:54 -07:00
Bassoonian
5a8a393dcd
Add Sideways Stairs ( #4836 )
2024-09-30 00:06:25 +02:00
Alex
42c43a3f8f
Adds Commander and Order Up ( #5246 )
...
* Adds Commander
* review points
* new line
* correction
* regression / double targeting still broken
* fix wrong target order
* transform fixes
* haze test
* fixes, tests
* bring back wrongly removed else if case
* Eject Pack / Button test + fix
* red card fix
* test fixes
* Fixes Tatsu being hit by multi hit move
* change transform check
* fix test + revert change
* Fix Tatsugiri attacking after freed up from Dozo in the same turn
* Dragon Darts tests
* fix test
* review comments
* assumtion in wrong file
* Order Up test fixes
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-09-29 22:45:50 +02: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
Bassoonian
7dad83070f
Added MB_X_Y_STAIR_WARP metatile behaviors ( #5278 )
2024-09-28 15:21:11 +02:00
kittenchilly
c1dffc694e
Merge level_caps and ev_caps into one caps file ( #5429 )
...
* Merge level_caps and ev_caps into one caps file
* Update caps.h
2024-09-27 23:40:49 +02:00
psf
009b42394e
Merge branch 'upcoming' into stairWarps
2024-09-22 09:40:34 -07:00
ghoulslash
b7246a018c
merge w upcoming
2024-09-22 09:13:25 -04: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
psf
1ba8e7d300
Merge branch 'upcoming' into signpost
2024-09-12 14:45:37 -07:00
psf
51a69b6a9d
Merge branch 'upcoming' into stairWarps
2024-09-12 14:43:46 -07:00
pkmnsnfrn
a0e914b749
Merge branch 'upcoming' into scriptCommands
2024-09-12 05:39:24 -07: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
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers ( #5178 )
...
* Add data to SpeciesInfo entries for in-battle shadows
* Implement sized shadows in the sprite visualizer
* Implement sized shadows in game code
* Show shadows for the lead battler for opponents during their battle anim
* Feedback on shadows, round 1
* Revert removal of Goomy and Sliggoo shadows
* Fixed GEN_3 setting
* Code cleanup + remove pre-processor branches
* Fix bugs with gen-3 configuration branch
* Style corrections, final shadow coordinate adjustments
* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +02: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
SonikkuA-DatH
8c3531ffc7
Grass/Water Pledge Swamp Animation + Sea of Fire animation tweak ( #5325 )
2024-09-07 18:04:47 +02:00
psf
0e1b62c732
Merge branch 'upcoming' into signpost
2024-09-05 17:11:32 -07:00
psf
1143da0c1c
Merge branch 'upcoming' into stairWarps
2024-09-05 17:09:45 -07:00
cawtds
6e3ce9db2f
Move battle anim arrays to C ( #5306 )
...
* move battle anim arrays to c
* use ARRAY_COUNT instead
* remove B_ANIM_STATUS_WRAPPED
* move anim rename
* rename battle anims status/general/special
2024-09-04 11:21:40 +02:00
