Alex
|
be5f6d4801
|
Fixes hacky SetMoveEffect script calls (#7987)
|
2025-11-04 17:47:35 +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 |
|
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 |
|
PhallenTree
|
e62be0b3a9
|
Fixes Sticky Barb never getting transferred to attacker + tests
|
2025-11-01 19:01:18 +00: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 |
|
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 |
|
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 |
|
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
|
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 |
|
PhallenTree
|
4a714225e5
|
Fixes hazards and switch-in items not being reset when switching in (#8074)
|
2025-10-29 14:25:05 +01:00 |
|
grintoul
|
c90e6952f3
|
Fix Ally Switch being useable in Frontier Link Multi battles (#8059)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-28 19:26:10 +01:00 |
|
grintoul
|
5873621154
|
Corrects battler position checks in battle_message.c (#8070)
|
2025-10-28 19:24:13 +01:00 |
|
grintoul
|
a9fc0b28c9
|
Corrects battler partner identification in battle_ai_switch_items.c (#8071)
|
2025-10-28 19:23:41 +01:00 |
|
FosterProgramming
|
fd07daf0d8
|
Fix nature power string and add support for evnvironment in tests (#8068)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-28 19:23:16 +01:00 |
|
FosterProgramming
|
3b66cd007b
|
Fix target cancelling not working properly with z-move (#8067)
|
2025-10-28 17:19:52 +01:00 |
|
FosterProgramming
|
b82a5a4c1c
|
Fix wrong gimmick spite showing when inputting too fast (#8066)
|
2025-10-28 17:02:35 +01:00 |
|
Estellar
|
1de27646d2
|
Remove magic numbers in slot_machine.c (#2195)
|
2025-10-28 09:19:12 +00:00 |
|
Bassoonian
|
f7cbe4853b
|
Add type enum (#8054)
|
2025-10-27 16:41:22 +00:00 |
|
Bivurnum
|
6ddabde582
|
New Feature: ORAS Dowsing (#7211)
|
2025-10-27 17:41:07 +01:00 |
|
PhallenTree
|
782c559a20
|
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042)
|
2025-10-26 22:41:16 +01:00 |
|
FosterProgramming
|
6faf35dde9
|
Fix emergency exit not triggering properly during wild battles (#8037)
|
2025-10-26 22:35:27 +01:00 |
|
FosterProgramming
|
a9486a5521
|
Fix battle arena counting all judges loss for the opponent (#8046)
|
2025-10-26 15:28:40 +01:00 |
|
Alex
|
4ed1c3309d
|
Decouple (overworld) statuses from ability function (#8002)
|
2025-10-26 13:57:34 +00:00 |
|
FosterProgramming
|
292d9b2933
|
Fix PC turning on/off animation not working in Battle Frontier (#8048)
|
2025-10-26 13:40:55 +00:00 |
|
Raymond Dodge
|
95d98305dd
|
Add camera-facing right-walking Krabby and Kingler follower sprites (#7881)
|
2025-10-26 11:45:40 +01:00 |
|
khbsd
|
7b3a2f3aaf
|
fix: hypertraining a stat now optionally reflects in the summary screen (#8035)
|
2025-10-25 19:15:03 -07:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|