18162 Commits

Author SHA1 Message Date
PhallenTree
6ed4f73f6a
Fixes Emergency Exit sometimes causing an unrelated battler to become invisible (#7241) 2025-06-28 23:20:40 +02:00
hedara90
502c73dc9b
Fix 01_battle_engine_bugs.yaml (#7242) 2025-06-28 13:24:24 -07:00
Juanjo
8973006273
[FIX] Prevent caught Pokémon loss in NPC partner battles (#7177) 2025-06-28 10:36:37 +02:00
ghoulslash
0c4b0c582e
Add some tests (#7234) 2025-06-28 10:20:39 +02:00
Alex
a96591dd43
Fixes Scald defrosting target while asleep (#7233) 2025-06-28 10:14:55 +02:00
ghoulslash
3dda407bb0
Jaboca berry triggers instead of being stolen by bug bite (#7237)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-06-28 08:43:50 +02:00
Alex
c5b939a312
Changes pre-proc to a normal if for Item Desc Header (#7231) 2025-06-27 22:31:31 +02:00
Alex
d1577d96ad
Set correct Instruction in Cmd_setnonvolatilestatus (#7236) 2025-06-27 18:37:24 +01:00
Bivurnum
b1200117a9
Better system for Follower NPC running frames (#7222)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-27 10:12:35 +02:00
psf
b60c897b4a
Add P_ASK_MOVE_CONFIRMATION (#7132) 2025-06-27 10:11:41 +02:00
Bivurnum
9416a783d4 removed unnecessary fnpc underwater update 2025-06-26 16:47:09 -05:00
Bivurnum
1f5195c686
update fnpc docs for createfollowernpc 2025-06-26 15:55:43 -05:00
i0brendan0
206d2503d8
Add Gen 2 Moonlight, Morning Sun, Synthesis configuration (#7209)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-26 21:00:02 +02:00
hedara90
8bbb84fc96
Fix incorrect type input (#7228)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-26 20:15:22 +02:00
Alex
ed59b2fb0e
Remove redundant move result flag checks (#7223) 2025-06-26 16:08:12 +02:00
Alex
565cf6f7ff
Adds missing healBlockTimer for Baton Pass (#7220) 2025-06-26 15:54:19 +02:00
Alex
4def635e1f
Fixes wrong assignment in TrySymbiosis (#7221) 2025-06-26 15:53:50 +02:00
DizzyEggg
8e7274f3fc
lto support (#7182) 2025-06-26 15:53:14 +02:00
PhallenTree
a82aa618fb
Adds Ability Shield activation message (#7224) 2025-06-26 14:42:32 +02:00
Raymond Dodge
6f7dac6d11
Add 'Give Decoration' function to overworld debug menu (#7219)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-25 22:11:43 +02:00
Alex
6824e7d175
Attackcanceller clean up (#7210) 2025-06-25 21:36:15 +02:00
Bolt-Strike
f217344cb5
Disable unowned evo methods (#7103) 2025-06-25 21:29:59 +02:00
Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects (#7002) 2025-06-25 21:15:40 +02:00
Bivurnum
c6221fa50e
Add debug options for follower NPCs (#7215) 2025-06-25 21:13:43 +02:00
Alex
773ecd4c24
Fixes OOB for Teatime and Flower Shield (#7214) 2025-06-25 21:00:49 +02:00
Bassoonian
4f731835b4
Update .gitignore to add heal locations (#7050) 2025-06-25 20:13:29 +02:00
Eduardo Quezada
f0230d0c8c
Fixed Fake RTC debug menu (#7218) 2025-06-25 20:08:22 +02:00
Alex
7d7ffd58ae
Fixes Booster Energy timing activation + Clean up (#7175)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-06-25 18:20:55 +02:00
Alex
f8551830c9
Adds Gen5+ Encore config (#7051) 2025-06-25 15:58:30 +02:00
Eduardo Quezada
03d3245a39
Easier expandability of debug menu (#6910) 2025-06-25 15:57:41 +02:00
DizzyEggg
4b944be820
Master to Upcoming, 2025-06-25 (#7213) 2025-06-25 14:58:05 +02:00
Hedara
51a5577f65 Merge branch 'master' into master-upcoming
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
2025-06-25 14:17:07 +02:00
Eduardo Quezada
8d81f60313
Fix tests failing with B_FRIENDSHIP_BOOST being TRUE (#7194)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-25 14:01:31 +02:00
DizzyEggg
675fb8f60e
Pret merge (24th of June, 2025) (#7206) 2025-06-25 13:58:28 +02:00
Bivurnum
bfb0c2fa73
Added createfollowernpc macro to make a new follower from a gfx id (#7196) 2025-06-25 10:59:25 +02:00
Eduardo Quezada
b5956d8eba
Fix healthbox when blending effects happen (#7203) 2025-06-24 23:15:16 +02:00
Eduardo Quezada
b372fa30b6
Fix AI party count calc being maintained between tests (#7200) 2025-06-24 21:03:54 +02:00
cawtds
59350cc32f
Increase party action limit (#7119) 2025-06-24 15:15:04 +02: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
hedara90
74326023da
Backported Safari catch and add to party fix (#7192)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-24 09:29:20 +02:00
DizzyEggg
93511ceb05
Fix BtlController_EmitChosenMonReturnValue UB (#7197) 2025-06-24 09:28:26 +02:00
Alex
bc95824e8c
Fixes wrong Future Sight indexing (#7198) 2025-06-24 09:04:19 +02:00
allcontributors[bot]
2e3e0889f9
add pablopenna as a contributor for code (#7202)
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
2025-06-23 19:13:50 -07:00
DizzyEggg
e1b83d6056
Match graphics declarations with externs (#2089) 2025-06-23 20:31:18 +01:00
Pablo Pena
e449a612f5
fix: use BackPickId to calculate player intro ball throw animation palette (#7193) 2025-06-23 19:45:12 +02:00
Eduardo Quezada
a75a49710f
Fixed debug flag menu sound (#7190) 2025-06-23 15:46:49 +02:00
psf
456a8f6aa0
Update the description of OW_OBJECT_VANILLA_SHADOWS (#7184) 2025-06-23 15:40:13 +02:00
Alex
66e8200d95
Use battler arguments for SetMoveEffect (#7156) 2025-06-23 15:26:31 +02:00
i0brendan0
0ccf797cce
Fixes Roamers not saving shininess (#7185) 2025-06-23 15:05:01 +02:00
Alex
753eb9f8d8
Fixes Enigma, Kee and Maranga Berry activation timing (#7171) 2025-06-23 13:47:26 +02:00