GriffinR
b89fda79ea
Generate MAPSEC constants from JSON
2024-11-06 21:43:13 -05:00
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
ghoulslash
57225e878a
some more fixes
2024-11-03 10:11:05 -05:00
ghoulslash
b488ff9b53
merge w upcoming
2024-11-03 07:11:40 -05: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
Ariel A
0f706ac9e0
Merge branch 'followers' into followers-expanded-id
2024-10-21 00:05:26 -04:00
Ariel A
4056804575
feat: improved follower handling during scripted movements
2024-10-20 23:55:05 -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
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects ( #5549 )
2024-10-20 21:44:28 +02: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
Eduardo Quezada
ee9c6d4912
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-17 00:16:01 -03:00
GriffinR
0eb6d1d74c
Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants
2024-10-15 22:04:45 -04:00
GriffinR
da9c0239d9
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
2024-10-15 22:02:40 -04:00
ghoulslash
cf78462fab
merge w upcoming
2024-10-15 21:24:47 -04: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
GriffinR
f61c0099b9
OBJ_EVENT_ID_PLAYER/CAMERA -> LOCALID_PLAYER/CAMERA
2024-10-12 23:34:02 -04:00
GriffinR
a2a3255bdd
Fix typo, remove old size check
2024-10-12 03:30:35 -04:00
GriffinR
9f31b0fe90
Generate local IDs from map.json files
2024-10-12 03:04:24 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands
2024-10-11 16:27:02 -07:00
GriffinR
091b7269df
Move heal locations data to their associated map.json ( #2034 )
2024-10-11 15:15:55 -04: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
1d9557811b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-10-08 15:58:17 -03: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
f913f2884b
Add config for shadow intensity
2024-10-08 12:21:06 -03:00
ghoulslash
a6a6737c42
some dexnav improvements, use CalculateDexnavShinyRolls for shiny rolls
2024-10-04 13:54:56 -04:00
ghoulslash
2e52e3331f
merge w upcoming
2024-10-04 12:56:21 -04: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
Eduardo Quezada
d1056f887b
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
2024-09-30 15:52:49 -03: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