Bivurnum
|
668cd7e413
|
Rename follower npc macros for better specificity and to match documentation (#6742)
|
2025-05-02 21:08:42 +02:00 |
|
hedara90
|
ccda2308a3
|
Add AI_FLAG_PP_STALL_PREVENTION (#6743)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-02 11:30:09 -04:00 |
|
Pawkkie
|
1a2cd5645a
|
Fix roll handling in AI party damage calcs (#6733)
|
2025-05-01 10:15:19 +02:00 |
|
Alex
|
55f9f6adea
|
Refactor battler flee and watch options + clean up (#6724)
|
2025-04-30 11:54:42 -04:00 |
|
Alex
|
4ff2f3de42
|
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-30 11:34:19 -04:00 |
|
Hedara
|
0eeba00d1b
|
Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
|
2025-04-30 15:22:37 +02:00 |
|
Hedara
|
f0ecbce9c7
|
Start of 1.11.3 Cycle
|
2025-04-30 11:26:09 +02:00 |
|
Hedara
|
accb85554a
|
Expansion 1.11.2 Release
|
2025-04-30 11:23:05 +02:00 |
|
Alex
|
afcba8d9cd
|
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719)
|
2025-04-29 23:25:56 +02:00 |
|
Hedara
|
4873589c65
|
Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
|
2025-04-29 20:27:33 +02:00 |
|
Pawkkie
|
7a3cf5d3a3
|
Improve AI's defense against Focus Punch (#6713)
|
2025-04-28 08:34:09 +02:00 |
|
hedara90
|
5dfbdf56da
|
27/04/25 Master to upcoming merge (#6701)
|
2025-04-27 18:01:50 +02:00 |
|
Bivurnum
|
47723c34e5
|
Follower NPCs (follow-me) (#6500)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-27 14:56:18 +02:00 |
|
AlexOn1ine
|
e246b20e72
|
27/04/25 Master to upcoming merge
|
2025-04-27 09:50:25 +02:00 |
|
hedara90
|
d1aa49cca3
|
Remove compressed palettes (#6455)
|
2025-04-26 22:58:40 +02:00 |
|
Alex
|
1cd4d23969
|
Fixes Z and Max moves dmg reduction against side protection (#6697)
|
2025-04-26 21:46:41 +02:00 |
|
PCG
|
68598e232e
|
Disable P_TUTOR_MOVES_ARRAY config (#6693)
|
2025-04-25 12:33:03 +02:00 |
|
PCG
|
f661f3b3ac
|
Pokedex Plus HGSS move configs (#6687)
|
2025-04-24 19:34:37 +02:00 |
|
Ruby
|
aba34015db
|
Time menu for RTC in debug menu. (#6634)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-23 19:34:37 +02:00 |
|
khbsd
|
971a595e4a
|
Evolution Refactor (#6556)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
|
2025-04-23 16:01:33 +02:00 |
|
Alex
|
d3fe5c4640
|
Some Me First tests plus minor clean up (#6678)
|
2025-04-23 12:18:57 +02:00 |
|
Alex
|
71cfab6477
|
Fixes Magician Life Orb interaction (#6676)
|
2025-04-22 21:01:00 +02:00 |
|
Alex
|
dfb1cd2ec0
|
Refactor hit escape moves to use moveend (#6671)
|
2025-04-21 22:52:55 +02:00 |
|
Alex
|
d220459a01
|
Fixes Intimidate / Eject Pack interaction (#6645)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-21 17:33:29 +02:00 |
|
AlexOn1ine
|
e2e012c3a9
|
conflicts
|
2025-04-21 15:50:57 +02:00 |
|
Alex
|
db7e45f1d6
|
Sky Drop clean up and tests (#6218)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 23:07:46 +02:00 |
|
Alex
|
86969f9919
|
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:49:52 +02:00 |
|
Eduardo Quezada
|
c650199909
|
Added missing gMovesInfo encapsulation (#6656)
|
2025-04-20 22:36:27 +02:00 |
|
khbsd
|
6b8e680139
|
Remove hardcoded values from wild_encounter.h generation (#6640)
Co-authored-by: Moos Toet <moostoet@hotmail.com>
|
2025-04-20 22:27:36 +02:00 |
|
Alex
|
6b09480912
|
Fixes some restore issues (#6629)
|
2025-04-18 16:57:04 -04:00 |
|
grintoul1
|
ec2aef2eff
|
Battle Transition: mugshots for multibattles (#6567)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-17 16:18:20 +02:00 |
|
AlexOn1ine
|
fd0766c7fa
|
17-04-25-master-merge
|
2025-04-17 14:14:37 +02:00 |
|
Bassoonian
|
1c3d346d4f
|
Make form change methods into enum + type checking (#6631)
|
2025-04-16 23:45:41 +02:00 |
|
Bassoonian
|
cca969b04d
|
Adds move effect type checking (#6618)
|
2025-04-16 00:08:57 +02:00 |
|
Bassoonian
|
512368fd03
|
Add type checking for hold item effects (#6619)
|
2025-04-15 23:33:00 +02:00 |
|
ghoulslash
|
81ed774c00
|
EndTurnEffectOrder Refactor (#6224)
|
2025-04-14 10:57:34 -04:00 |
|
LOuroboros
|
cb98106db0
|
Corrected Dexnav config related comment (#6610)
|
2025-04-13 21:49:38 -04:00 |
|
GriffinR
|
709cfa1c9a
|
Merge pull request #2014 from Bassoonian/battleterrain
Rename battle terrain to environment
|
2025-04-13 19:32:06 -04:00 |
|
Alex
|
a4bfbea3cb
|
Revert wrongly done Embody Aspect fix (#6607)
|
2025-04-14 00:17:10 +02:00 |
|
Alex
|
a6c73a5885
|
Adjust enum AIScore (#6598)
|
2025-04-13 18:54:02 +02:00 |
|
Alex
|
caa878002a
|
Remove redundant bit for Throat Spray (#6593)
|
2025-04-13 16:22:04 +02:00 |
|
Bassoonian
|
6a70f4f390
|
Turn battle string ids into enums (#6594)
|
2025-04-13 16:12:30 +02:00 |
|
Bassoonian
|
d62205f2fc
|
Converts some defines to enums (#6592)
|
2025-04-13 13:39:20 +02:00 |
|
Bassoonian
|
d173e42372
|
Remove redundant AI defines (#6590)
|
2025-04-13 11:22:14 +02:00 |
|
cawtds
|
ee911ffbae
|
FakeRtc datetime and ResetRtcScreen day increments (#5695)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-04-12 13:17:58 -07:00 |
|
Pawkkie
|
540744024d
|
"Aerilate"-esque Ability Tests and Config (#6313)
|
2025-04-12 14:48:58 -04:00 |
|
Bassoonian
|
563e094ea8
|
Add clarification for EVO_SCRIPT_TRIGGER_DMG (#6579)
|
2025-04-12 12:56:30 -04:00 |
|
Hedara
|
9afd8800f3
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-12 16:33:02 +02:00 |
|
Bassoonian
|
d86aedfd32
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr
|
2025-04-12 14:59:06 +02:00 |
|
psf
|
e146940f25
|
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-04-12 10:23:48 +02:00 |
|