17217 Commits

Author SHA1 Message Date
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
agsmgmaster64
1344d8e9dd
Type Effectiveness Indicators when selecting moves (#6559) 2025-04-12 01:03:45 +02:00
wiz1989
3d8b912087
Ability imposter (#6552) 2025-04-12 00:01:29 +02:00
psf
1ade433028
Added call to ItemId_GetDescription (#6582) 2025-04-11 23:59:43 +02:00
Bassoonian
3c8d5d1a57
Add hold effects for PLA Origin Trio items (#6578) 2025-04-11 16:38:08 +02:00
hedara90
a186ce1bff
Animation fixes from lucky adapted to expansion (#6452)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-11 13:15:13 +02:00
hedara90
a243b97907
Documentation (#6576)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-11 12:52:12 +02:00
hedara90
cc957ed075
Pret merge (11 of April) (#6575) 2025-04-11 12:01:28 +02:00
Bassoonian
708bb4a831 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr 2025-04-10 23:57:57 +02:00
hedara90
cf98d764ad
Gimmick Indicator refactor (#6553)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-10 23:56:26 +02:00
khbsd
c1ad43b1cc
Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561) 2025-04-10 21:43:21 +02:00
khbsd
8bdad34211
fix: missing break statement (#6572) 2025-04-10 19:27:44 +02:00
psf
7ff50e3586
Fix broken links in merge_checklist.md (#6570) 2025-04-10 15:38:51 +02:00
Alex
4aca2fdcd3
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 15:01:02 +02:00
psf
17d851e1f9
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles (#6456)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 14:59:58 +02:00
wiz1989
60a4e191ae
fixed damage calculations in CanTargetFaintAiWithMod() (#6446)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-10 14:56:49 +02:00
Martin Griffin
2a0d3fd070
Merge pull request #2118 from cawtds/linkdirection-range-x-access
Make linkDirection more robust to member reordering
2025-04-10 06:47:06 +01:00
GriffinR
6d71c656fc
Merge pull request #2119 from pokemonmasteraaron/fix-agbprint
Fixed init call when using AGBPrint as log handler
2025-04-09 13:32:25 -04:00
Pawkkie
89da80b9d1
Ability access cleanup for #6550 (#6565) 2025-04-09 09:37:59 -04:00
pokemonmasteraaron
d890436b2a Fixed a compilation error if using AGBPrint as your log handler, misnamed AGBPrintfInit should be AGBPrintInit 2025-04-09 09:06:20 -04:00
cawtds
1672d99060 make linkDirection more robust to member reordering 2025-04-09 13:40:39 +02:00
hedara90
3d68061f23
Updated move animation tests (#6554) 2025-04-09 12:17:57 +02:00
Alex
73d2b5d940
master to upcoming, 2025-04-09 (#6563)
Co-authored-by: AlexOn1ine <alexthenotes@gmail.com>
Co-authored-by: Isaac Aronson <i@pingas.org>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-04-09 12:16:52 +02:00
Hedara
c8f227903f Merge branch 'upcoming' into upcoming-master 2025-04-09 11:25:01 +02:00
Hedara
c57d21b7b2 Merge branch 'master' into upcoming-master 2025-04-09 11:22:07 +02:00
Alex
f364cf9e71
Alcremie Evolution clean up follow up (#6557) 2025-04-09 11:18:07 +02:00
Eduardo Quezada
8cf8de1344
Fixed Behemoth Blade/Bash handler not using form change tables (#6558) 2025-04-09 11:09:27 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
khbsd
26f28103ec
Add Time-Based Encounters (#6454) 2025-04-09 09:49:09 +02:00
Eduardo Quezada
2b417bfeed
Implemented Alcremie Evolution Method (#6530)
Co-authored-by: khbsd <khb.dev@gmail.com>
2025-04-08 19:50:21 +02:00
Pawkkie
54928726cb
AI smarter status handling (#6550) 2025-04-08 17:47:45 +02:00
psf
69f2f9f151
Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477) 2025-04-08 16:21:32 +02:00
Alex
7bf156be0e
Refactors Move absorb / block function calls to remove redundancy (#6490)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-08 14:26:18 +02:00
Eduardo Quezada
ce1943904a
Consolidated "How to add Pokémon" tutorials (#6541) 2025-04-07 22:44:59 +02:00
SundayMoonday
bbe8bbc45b
Replaced Blue Sky background for Rock Field (#6516) 2025-04-07 11:04:21 +02:00
PhallenTree
f24173974c
Fixes Thermal Exchange not curing existing burn (#6545) 2025-04-07 10:48:27 +02:00
Eduardo Quezada
a3075325a0
GENDER_COUNT in sPlayer/RivalAvatarGfxIds (#2117) 2025-04-05 20:18:07 -04:00
hedara90
5fe58a1ed0
Thermal exchange tests (#6536)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-05 09:22:58 +02:00
Alex
8dd2fee4a9
Fixes Will-O-Wisp not being blocked by Thermal Exchange (#6534) 2025-04-04 23:01:10 +02:00
Pawkkie
9cb96235f9
Add basic Unaware check bad move scoring (#6524) 2025-04-02 18:18:33 -04:00
Alex
5b9077e207
Refactor / Simlify Cmd_adjustdamage and remove redundancy (#6499) 2025-04-02 23:52:54 +02:00
Alex
1e38c36912
Fixes transformed mon being able to use tera on Terapagos (#6528) 2025-04-02 23:51:45 +02:00
hedara90
ff8bf967d4
Added AI switch display to the battle debug (#6529)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-02 23:44:09 +02:00
Alex
c1f18d0765
Refactor protect to allow at least 126 different types of protect eff… (#6506) 2025-04-02 17:26:05 +02:00
Alex
ae62c80d0f
Refactors faint target abilities and adds Battle Bond config (#6519)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-02 16:00:23 +02:00
Alex
edb196e851
Fixes Red Card against Dynamaxed mons (#6526) 2025-04-02 14:28:53 +02:00
aronson
991065f25a
Support make check on macOS (#6513) 2025-04-01 21:52:49 +02:00
PhallenTree
ea59e858fb
Fixes Hone Claws checking the wrong stats for its stat change animation and Stockpile drops being stopped by stat reduction prevention effects (#6522) 2025-04-01 21:03:04 +02:00
hedara90
4f0caf8199
Fixes Tera Type not being carried over to during form change / evolution (#6502) 2025-04-01 16:52:40 +02:00