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 |
|
Alex
|
1c1a98ee45
|
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-30 23:14:02 +01:00 |
|
Alex
|
ff557e3d0c
|
Clean up for item hold effect refactor (#8014)
|
2025-10-30 21:07:37 +01:00 |
|
FosterProgramming
|
0b005d4b6f
|
Fix non-battle trainer script not running properly (#8056)
|
2025-10-30 19:47:22 +01:00 |
|
Alex
|
3a3b947622
|
Fixes intimidate activating on empty field (#8058)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-30 17:51:57 +01:00 |
|
Estellar
|
fd84adc421
|
Minor clean up in menu.c (#8060)
|
2025-10-30 17:15:15 +01:00 |
|
hedara90
|
733512f677
|
Improve sBattleIntroSlideFuncs bounds check (#8084)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-10-30 17:14:40 +01:00 |
|
Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
PhallenTree
|
9d06a4fb55
|
Emergency Exit on hazards activation + fix end of turn activation (#8075)
|
2025-10-30 17:01:13 +01:00 |
|
Alex
|
c77c624e9f
|
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083)
|
2025-10-30 16:14:03 +01:00 |
|
Eduardo Quezada
|
814cf53629
|
Fixed Hunger Switch changing forms on switch out while Tera'd (#8080)
|
2025-10-30 15:43:50 +01:00 |
|
FosterProgramming
|
44dc720260
|
Fix namebox bug when reloading the map mid-script (#8073)
|
2025-10-30 09:13:22 +01:00 |
|
Alex
|
31e663ceda
|
Fixed fainting form change tests (#8079)
|
2025-10-30 08:57:59 +01:00 |
|
Martin Griffin
|
d1d5435487
|
Improve undefined map assembler messages (#2196)
|
2025-10-29 21:34:03 -04:00 |
|
Eduardo Quezada
|
9fa857d34c
|
Removed redundant comment
|
2025-10-29 21:08:05 -03:00 |
|
Eduardo Quezada
|
9bfac0099e
|
Fixed fainting form change tests
|
2025-10-29 18:13:41 -03:00 |
|
Alex
|
9717c53afa
|
Master to upcoming, 2025-10-29 (#8077)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: Raymond Dodge <git@rayrobdod.name>
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: grintoul <166724814+grintoul1@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-10-29 19:10:24 +01:00 |
|
Alex
|
ea3b72f43f
|
Initialize DamageContext on declaration to zero (#8076)
|
2025-10-29 19:04:56 +01:00 |
|
Hedara
|
a2ef3284dd
|
Merge branch 'master' into master-to-upcoming
Conflicts:
data/battle_scripts_1.s
include/battle_util.h
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-10-29 18:42:59 +01:00 |
|
FosterProgramming
|
712e087754
|
Fix move description prompt window not appear when choosing a move after canceling target selection (#8055)
|
2025-10-29 17:53:41 +01:00 |
|
Alex
|
dd875b87bc
|
Combine Simple Beam and Worry Seed into one effect (#8039)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-29 15:20:12 +01:00 |
|
Alex
|
ea60c32fbe
|
Fixes Liquid Ooze dmg not blocked by Magic Guard (#8036)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-29 15:19:50 +01:00 |
|