PCG
|
d2425c1468
|
Move Relearners for TMs, Tutors and Egg moves (#8040)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-11-09 12:54:01 -08:00 |
|
khbsd
|
f8509c3e65
|
Sets instant text speed flag to false by default (#8179)
|
2025-11-09 10:14:22 +01:00 |
|
khbsd
|
82a63a09fe
|
update: time-based encounters system tuneup and @cawtds' header script (#8158)
|
2025-11-07 21:25:09 -08:00 |
|
grintoul1
|
c230e54678
|
Master to Upcoming merge 20251107
|
2025-11-07 22:45:57 +00:00 |
|
khbsd
|
4d28f7be23
|
feat: adds stevebeller's instant text and MandL27's faster text printing (#8063)
|
2025-11-07 23:11:17 +01:00 |
|
FosterProgramming
|
2467584af5
|
Prevent EXPECT functions from casting negative numbers into unsigned (#7866)
|
2025-11-07 18:32:15 +01:00 |
|
FosterProgramming
|
cab4ec29da
|
Add additional comment explaing map name popup transparency side-effects (#8117)
|
2025-11-07 10:05:50 +01:00 |
|
FosterProgramming
|
97b115d572
|
Adds an auto-generated include file of script commands (#8156)
|
2025-11-06 21:10:42 -08:00 |
|
FosterProgramming
|
be7646b67a
|
Allow vs seekers to work with script not starting with trainerbattle (#8062)
Co-authored-by: pkmnsnfrn <pkmnsnfrn@gmail.com>
|
2025-11-06 10:16:19 -08:00 |
|
Alex
|
fbaaf2d338
|
Increase number of additional move effects (#8149)
|
2025-11-06 00:18:12 +00: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
|
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 |
|
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 |
|
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 |
|