18922 Commits

Author SHA1 Message Date
Alex
fbaaf2d338
Increase number of additional move effects (#8149) 2025-11-06 00:18:12 +00:00
hedara90
c8159ba182
Reset saveblock data between test runs (#8145)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-11-05 20:45:39 +00:00
Ultimate_Bob
c57bde3c5e
Fix build failing with NOOPT=1 due to discarding static data. (#8053) 2025-11-05 17:07:05 +01:00
Raymond Dodge
d1428d7966
Update mdbook to v0.5.0-beta.1 (#8133) 2025-11-05 17:05:01 +01:00
PhallenTree
cfcce251d0
Fix typo in Electrode-Hisui pokedex entry (#8143) 2025-11-05 14:49:12 +01:00
Bassoonian
be4ce5901f
Fix Kyurem typo in swap move tables (#8139) 2025-11-05 14:48:53 +01:00
Alex
0f14a4db57
Clean up ability effect hitmarker (#8138) 2025-11-04 21:44:57 +00:00
Bassoonian
473a0aa44d
Add Legends Z-A content (#7935)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-11-04 22:25:33 +01:00
Alex
dea7d02e76
Adjust faint battler script (#8137) 2025-11-04 20:57:49 +00:00
Alex
41aba41838
Attackstring hitmarker clean up (#8136) 2025-11-04 18:35:48 +00:00
Alex
80b5d81a9a
Create BattleStruct sub struct for event states (#8131) 2025-11-04 18:34:54 +00:00
FosterProgramming
b3965098f7
Fix berry blender not computing flavor correctly (#8113) 2025-11-04 18:32:54 +00:00
Alex
be5f6d4801
Fixes hacky SetMoveEffect script calls (#7987) 2025-11-04 17:47:35 +00:00
Philipp AUER
b179f79066
Fixes difficulty not being restored after tests (#8129) 2025-11-04 10:36:25 +01:00
ghostyboyy97
3c72ca1158
fix (AI scoring): shield dust considerations, IsMoveEffectInMinus self effect edge case, hitsToKO zero-case consideration (#8126)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-11-04 09:35:43 +01:00
grintoul
6bcf9823c5
Lock mdbook to v0.4.35 to fix docs not building (#8130) 2025-11-03 21:58:03 +01:00
grintoul1
c981fb3b2e Fixes difficulty not being restored after tests 2025-11-03 18:34:54 +00:00
Bassoonian
5325c275e6
Master to upcoming, 2025-11-03 (#8121) 2025-11-03 15:05:26 +01:00
Alex
8613d2587e
Deprecate various macro (#8092) 2025-11-03 15:03:25 +01:00
Alex
499986a804
Clean up redundant todo (#8094) 2025-11-03 15:02:36 +01:00
Alex
cbb6c4f14e
Revert reversion (#8112) 2025-11-03 15:02:12 +01:00
Hedara
b0ccddac69 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/constants/expansion.h
2025-11-03 11:11:07 +01:00
PhallenTree
5b738edd4b
Fixes flung items sometimes being blocked by Unnerve (#8114) 2025-11-02 20:31:51 +01:00
Eduardo Quezada
51a6081c8e
Parametrized Ice Face's weather form change (#8115) 2025-11-02 20:31:09 +01:00
Alex
d95c6427b0
Fixes Sticky Barb never getting transferred to attacker + tests (#8108) 2025-11-02 11:31:38 +01:00
psf
12e0d67736
1.13.3 release (#8109) 2025-11-01 17:30:56 -04:00
Hedara
cfdbd19ea8 Start of 1.13.4 cycle 2025-11-01 21:51:24 +01:00
Hedara
f969c126b1 1.13.3 release version 2025-11-01 21:51:06 +01:00
PhallenTree
f206746bfa
Fix test 2025-11-01 19:33:51 +00:00
PhallenTree
c9c0b79dcb
Assumes for the other moves 2025-11-01 19:02:27 +00:00
PhallenTree
e62be0b3a9
Fixes Sticky Barb never getting transferred to attacker + tests 2025-11-01 19:01:18 +00:00
Alex
99d1030d98
Initialize DamageContext struct with zero values (#8107) 2025-11-01 20:00:09 +01:00
Alex
dd1b0b3067
Initialize DamageContext struct with zero values
Also forgot to initialize the struct in `Cmd_damagecalc`
2025-11-01 19:39:28 +01:00
FosterProgramming
4d60c9e83f
Fix copyvar instead of setvar causing issue with LTO (#8097) 2025-11-01 16:42:07 +00:00
Alex
3fb472777b
Reverts wrongly applies fix to book.toml (#8105) 2025-11-01 16:51:37 +01:00
Alex
47a1704391
Fix docs compile issue (#8101) 2025-11-01 15:48:56 +01:00
Alex
2af949da85
Pret merge (1st of November, 2025) (#8103) 2025-11-01 15:42:06 +01:00
Hedara
5c31b58b81 Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge
Conflicts:
	spritesheet_rules.mk
	tools/mapjson/mapjson.cpp
2025-11-01 15:13:16 +01:00
Hedara
dd17524fc9 Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
sha1sum changed

 Conflicts:
	include/global.h
	include/overworld.h
	include/pokemon.h
	src/map_name_popup.c
	src/pokedex_area_screen.c
	src/pokemon.c
2025-11-01 15:09:20 +01:00
Hedara
67e30c96c0 Merge commit '0965dffe70bb7d4bc229e24e4bc0266a6be6b8c8' into pret-merge
Conflicts:
	include/item_menu.h
2025-11-01 14:56:09 +01:00
Hedara
8c4d1269a0 Merge commit 'f2cf20ce9bdf4a9f6cd0300a005ca3ec6ae89e3c' into pret-merge
Conflicts:
	INSTALL.md
	include/battle.h
	include/save.h
	src/wild_encounter.c
2025-11-01 14:51:14 +01:00
Hedara
3a92cac23d Merge commit '80ec69fc5d6eb5d392124e902c67ad68164192c5' into pret-merge
Conflicts:
	graphics_file_rules.mk
2025-11-01 14:49:07 +01:00
grintoul
dba50c91ea
Aura Break tests (#8099) 2025-11-01 13:43:31 +01:00
psf
05191e7f85
01/11/25 Master to ucpoming merge (#8100) 2025-11-01 05:20:38 -07:00
Zimmermann Gyula
a10a824081
Change magic number to constant in dexnav. (#8102) 2025-11-01 13:06:49 +01:00
AlexOn1ine
d4e7e7ad36 10/11/25 Master to upcoming merge 2025-11-01 11:54:17 +01:00
Eduardo Quezada
577257051a
Fix compile issue in gcc 11 (#8095) 2025-10-31 21:33:46 +01:00
Eduardo Quezada
f66ba68eee
Fixed Zygarde Complete disappearing upon catch (#8089) 2025-10-31 19:41:46 +01:00
FosterProgramming
6c3f87e74e
Fix bug when a captured pokemon replaces a party member who changed forms (#8091) 2025-10-31 17:50:29 +01:00
FosterProgramming
79441c6574
Fix bug where mon selection doesn't properly account for party order (#8088) 2025-10-31 17:44:08 +01:00