Eduardo Quezada
0b299b3ffd
Fixed most failed tests with GEN_LATEST GEN_8 ( #7498 )
2025-08-08 09:44:12 +02:00
RavePossum
bf68865e0d
Implement using party menu items from field ( #7481 )
2025-08-07 21:21:33 +02:00
grintoul
27886a6577
Macro-for-AI-Flag-definitions ( #7471 )
2025-08-05 14:14:04 +02:00
Bivurnum
f6a120310e
Bug fix: add handling for forced movements into/after ledge jumps with follower NPCs ( #7055 )
2025-08-04 15:10:20 +02:00
Hedara
637f7dff46
Start of 1.12.3 cycle
2025-07-30 20:35:16 +02:00
Hedara
d8059ce3d1
1.12.2 release version
2025-07-30 20:34:43 +02:00
Alex
cb4450efaf
Fixes Effect Spore and Baneful Bunker/Burning Bulwark ( #7412 )
2025-07-30 19:54:12 +02:00
Alex
038bd2717d
Pret merge (27th of July, 2025) ( #7422 )
2025-07-28 15:13:23 +02:00
surskitty
7b2fe32050
Make B_VAR_STARTING_STATUS tests run in CI ( #7419 )
2025-07-28 13:11:04 +02:00
Eduardo Quezada
d801556a97
Merge branch '_pret/master' into _RHH/pr/master/pretMerge20250727
2025-07-27 11:59:07 -04:00
GriffinR
6f8a1bbdb8
Add pack/unpack for data masks ( #2163 )
2025-07-23 09:28:34 +01:00
Alex
705f194d98
Fixes various battler corruption during switch in ability activation ( #7352 )
2025-07-18 12:28:00 +02:00
Alex
73a2e5104e
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe ( #7326 )
2025-07-14 21:34:21 +02:00
grintoul
d63f859db6
Multibattles Illusion party boundaries fix ( #7308 )
2025-07-11 09:53:03 +02:00
Pawkkie
e4d9298200
Fix move comparison scoring ( #7301 )
2025-07-10 09:51:46 +02:00
Martin Griffin
f4cc802656
Fix crashing tests looping ( #7299 )
2025-07-09 09:02:55 +02:00
Raymond Dodge
80b9c23d0a
Fix RL compressed data alignment
...
`RLUnComp`, like `LZ77UnComp`, expects the source data to be word-aligned.
So, to mirror how lz-compressed data is defined as `u32[]` to enforce
word-alignment, this changes rl-compressed data to be defined as `u32[]`
to enforce word-alignment.
2025-07-06 13:49:47 -04:00
Alex
f808201945
Fixes Natural Gift moveend execution ( #7274 )
2025-07-05 15:05:35 -04:00
hedara90
56907bc26e
Merrp merge, 2025-06-25 ( #7217 )
2025-07-04 13:03:09 +02:00
Alex
f8fc86275c
Fixes protective pads not protecting from secondary protect effects ( #7229 )
2025-07-01 17:48:57 +02:00
Alex
89b1a45536
Fixes Ice Spinner and Steel Roller ( #7259 )
2025-07-01 15:39:22 +01:00
GriffinR
0c7c81e02f
Merge branch 'master' into _pret/pr/pyramidLocation
2025-06-30 11:51:45 -04:00
Hedara
947faa97d3
Start of 1.12.2 cycle
2025-06-30 11:01:46 +02:00
Hedara
1e281547ed
1.12.1 Release commit
2025-06-30 11:01:13 +02:00
Hedara
c0a50096f3
Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
...
Conflicts:
include/constants/event_objects.h
src/event_object_movement.c
src/follower_helper.c
2025-06-25 17:54:59 +02:00
Hedara
1916703e5a
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
...
Conflicts:
include/battle_script_commands.h
include/constants/event_objects.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/sprite.h
src/battle_controller_player.c
src/event_object_movement.c
src/pokeball.c
2025-06-25 17:49:19 +02:00
Hedara
3ce34c41b6
Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
...
Conflicts:
include/follower_helper.h
src/follower_helper.c
2025-06-25 17:20:38 +02:00
Ariel A
7564262543
Merge branch 'followers' into lighting
2025-06-24 20:44:44 -04:00
Ariel A
685a8a9118
Merge remote-tracking branch 'upstream/master' into followers
2025-06-24 20:39:12 -04:00
Ariel A
1f2fe7396b
feat: added abnormal weather follower message
...
Includes support for follower matching != species
2025-06-24 20:19:23 -04:00
Hedara
726f18f360
Merge remote-tracking branch 'pret/master' into pret-merge
...
Conflicts:
asm/macros/event.inc
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/scripts/trainer_hill.inc
include/graphics.h
2025-06-24 10:42:24 +02:00
DizzyEggg
e1b83d6056
Match graphics declarations with externs ( #2089 )
2025-06-23 20:31:18 +01:00
psf
456a8f6aa0
Update the description of OW_OBJECT_VANILLA_SHADOWS ( #7184 )
2025-06-23 15:40:13 +02:00
i0brendan0
0ccf797cce
Fixes Roamers not saving shininess ( #7185 )
2025-06-23 15:05:01 +02:00
DizzyEggg
53f8ae11ff
Move gTradePlatform_Tilemap to header ( #2088 )
2025-06-22 19:48:37 -04:00
Bassoonian
24fdac662e
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
2025-06-19 14:32:23 +02:00
Eduardo Quezada
8a0bc495d5
Fixed description of FORM_CHANGE_WITHDRAW ( #7152 )
2025-06-18 22:09:59 +02:00
hedara90
b2a0107a68
Test runner fixes ( #7100 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-15 12:02:29 +02:00
cawtds
3491cd95e8
Fix sell price display ( #7123 )
2025-06-15 11:52:51 +02:00
Alex
c6b4118c3c
Added AI_FLAG_PP_STALL_PREVENTION to AI_FLAG_SMART_TRAINER ( #7112 )
2025-06-14 11:06:23 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) ( #7107 )
2025-06-13 14:12:13 +02:00
Linathan
dc279f14ba
Chloroblast fix ( #7008 )
2025-06-06 21:33:56 +02:00
cawtds
0fc900514b
sync list menu functions with firered
2025-06-02 22:51:26 +02:00
Alex
d33651bfd0
Battle controller pret documentation ( #7029 )
2025-06-02 14:22:11 +02:00
Hedara
98c03315a9
Start of 1.12.1 cycle
2025-05-30 20:55:09 +02:00
Hedara
efa2fb3be7
Expansion 1.12.0
2025-05-30 20:53:32 +02:00
Hedara
09ee1d0b2d
Merge branch 'upcoming' into expansion-1.11.4
2025-05-30 20:45:19 +02:00
Hedara
acb4a9cf62
Expansion 1.11.4
2025-05-30 20:15:56 +02:00
AlexOn1ine
f4c64a2d79
conflicts
2025-05-30 19:20:32 +02:00
psf
9656400f88
Moved time constants to dedicated files ( #7019 )
2025-05-30 16:39:01 +02:00
