18156 Commits

Author SHA1 Message Date
GriffinR
f11bddf854
Fixes for Mirage Tower graphics (#2120)
* Add documentation for CreateCeilingCrumbleSprites

* Combine mirage tower graphics

* Add comment about mirage tower / player palette
2025-04-14 08:12:45 +02: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
Bassoonian
075efd36c1
Big Root tests (#6601) 2025-04-13 21:16:05 +02:00
Pawkkie
3b53995691
Air Balloon AI tests (#6604) 2025-04-13 21:04:58 +02:00
hedara90
3236ea62aa
Fixed DNS off config sometimes breaking palettes on map change (#6603)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 21:04:21 +02:00
Alex
f3c76e866b
Fix potential compile error caused by sTeraIndicatorDataPtrs (#6599) 2025-04-13 19:06:44 +02:00
Alex
a6c73a5885
Adjust enum AIScore (#6598) 2025-04-13 18:54:02 +02:00
PhallenTree
353e4ae619
Fixes Dynamax reversion animation when fainting (#6597) 2025-04-13 17:41:00 +02:00
hedara90
21e8e0d44f
Fix declaration after label for Psywave switch (#6595)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 17:04:03 +02:00
AlexOn1ine
a55bbb6352 documentation 2025-04-13 16:22:33 +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
hedara90
6a881f918a
Fix dynamax message (#6589)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 11:22:44 +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
Bassoonian
40419505f7
Add clarification for underlying math in EV caps (#6580) 2025-04-12 12:55:31 -04:00
Bassoonian
94d4a37e1d
Integrated merrp's lighting branch (Day/Night System) (#6562) 2025-04-12 16:59:05 +02:00
Hedara
348f5967ac Remove Ampharos .pla files 2025-04-12 16:35:45 +02:00
Hedara
9afd8800f3 Merge branch 'upcoming' into merrps-dns 2025-04-12 16:33:02 +02:00
hedara90
62e2f2b505
master to upcoming, 2025-04-12 (#6587) 2025-04-12 16:21:07 +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
Hedara
51c3709a56 Review comments 2025-04-12 08:58:23 +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
Hedara
66a6e92417 Fixed unused variables 2025-04-11 22:15:47 +02:00
Hedara
fff6bd3ed8 Removed legacy handling, fix if statment argument style 2025-04-11 21:27:49 +02:00
Hedara
3c2cc35158 Match expansion formatting for some preproc 2025-04-11 21:17:52 +02:00
Hedara
11df205d89 Merge branch 'nemo-merrp-fix' into merrps-dns 2025-04-11 18:50:24 +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
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +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
Hedara
d78afca94f More shadow options and documentation 2025-04-10 22:41:38 +02:00
khbsd
c1ad43b1cc
Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561) 2025-04-10 21:43:21 +02:00
Hedara
b075163c57 Cleanup and config options 2025-04-10 21:17:20 +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