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
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
Alex
be5f6d4801
Fixes hacky SetMoveEffect script calls ( #7987 )
2025-11-04 17:47:35 +00:00
Hedara
b0ccddac69
Merge branch 'master' into master-to-upcoming
...
Conflicts:
include/constants/expansion.h
2025-11-03 11:11:07 +01: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
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
AlexOn1ine
d4e7e7ad36
10/11/25 Master to upcoming merge
2025-11-01 11:54:17 +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
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
Estellar
fd84adc421
Minor clean up in menu.c ( #8060 )
2025-10-30 17:15:15 +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
FosterProgramming
44dc720260
Fix namebox bug when reloading the map mid-script ( #8073 )
2025-10-30 09:13:22 +01:00
Martin Griffin
d1d5435487
Improve undefined map assembler messages ( #2196 )
2025-10-29 21:34:03 -04: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
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
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
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
b82a5a4c1c
Fix wrong gimmick spite showing when inputting too fast ( #8066 )
2025-10-28 17:02:35 +01: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
grintoul
a32da780c4
Corrects ONE_VS_TWO_BATTLE_TEST to use BATTLE_TEST_ARGS_ONE_VS_TWO ( #8061 )
2025-10-27 15:24:33 +00:00
PhallenTree
782c559a20
Fixes Ruin field statuses negation conditions + upcoming cleanup ( #8042 )
2025-10-26 22:41:16 +01:00
Alex
e8ad3c20f7
Fixes compilation error due to #8002 ( #8050 )
2025-10-26 15:48:59 +01:00
Alex
4ed1c3309d
Decouple (overworld) statuses from ability function ( #8002 )
2025-10-26 13:57:34 +00: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
Bassoonian
be23dfdf2a
Even more enums and documentation ( #8029 )
2025-10-25 14:37:47 +02:00
hedara90
6eaa09bf5d
Add error messages for trying to send an illegal mon to the PC and fixes index in double wild battles ( #7982 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-10-25 14:37:17 +02:00
Alex
65244cbeb4
Moved usedHeldItem to Party State struct ( #8006 )
2025-10-24 18:56:16 +02:00
Alex
8ea947d5a1
Fixes Protosynthesis not activating after weather was reset ( #8021 )
2025-10-24 18:53:34 +02:00
grintoul
95c2a6e2b6
Multibattle testing system ( #7257 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-10-24 15:00:23 +02:00
FosterProgramming
5348de4abb
Banned species list ( #8003 )
2025-10-23 21:29:33 +02:00
Bassoonian
fbd702e3a4
Some more documentation and cleanup ( #8020 )
2025-10-23 20:14:38 +02:00
FosterProgramming
5b4403ddfe
Fix stats defined in tests being overwritteng by stat change ( #8018 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-23 18:59:15 +02:00
Bassoonian
fb660061ab
Converts some defines to enums and name unnamed enums ( #8019 )
2025-10-23 18:06:29 +02:00
FosterProgramming
46b122c5ce
Revert HGSS dex and movelist changes ( #8016 )
2025-10-23 13:52:25 +02:00
Nopinou
f53861ae05
Remove appearedInBattle bitfield & redundant use of sentOut partyState ( #8011 )
2025-10-22 23:25:18 +02:00
FosterProgramming
1343ddf7c3
Fix badge boost not applying in gen1 and 2 ( #8013 )
2025-10-22 22:57:04 +02:00
Eduardo Quezada
dc0d910182
Fixed Stomping Tantrum not doubling in damage if the user failed Protect ( #8008 )
2025-10-22 15:20:44 +02:00
PhallenTree
2416bfb53b
Fixes Echoed Voice base power increase depending on attacker's use of the move ( #7997 )
2025-10-22 13:39:24 +02:00
FosterProgramming
eac5da89ad
Make movelist calculations happen during compilation instead of runtime ( #7967 )
2025-10-20 15:31:42 +02:00
Alex
786859b6bb
Fix Fling Mental Herb message ( #7984 )
2025-10-19 22:38:27 +02:00
DavidJCobb
7fd0029ed7
Add typedefs for MAPSEC and METLOC values ( #2183 )
...
Added typedefs: mapsec_t, metloc_t, and variants for MAPSEC and METLOC values. There are some rough edges that could do with smoothing out, but for now, this gets us close to ideal with a ROM that compares equal.
Per feedback, all typedefs to mention the underlying type within the typedef name. The documentation comments reflect and explain the naming convention.
Updated comments to reflect the fact that we're no longer using SET8 for a Pokemon's met locations, in favor of a new macro (added by this PR) that adjusts to match the width of whatever is being set.
2025-10-19 17:37:13 +01:00
