Hedara
|
726f18f360
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
asm/macros/event.inc
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/scripts/trainer_hill.inc
include/graphics.h
|
2025-06-24 10:42:24 +02:00 |
|
hedara90
|
74326023da
|
Backported Safari catch and add to party fix (#7192)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-24 09:29:20 +02:00 |
|
DizzyEggg
|
93511ceb05
|
Fix BtlController_EmitChosenMonReturnValue UB (#7197)
|
2025-06-24 09:28:26 +02:00 |
|
Alex
|
bc95824e8c
|
Fixes wrong Future Sight indexing (#7198)
|
2025-06-24 09:04:19 +02:00 |
|
DizzyEggg
|
e1b83d6056
|
Match graphics declarations with externs (#2089)
|
2025-06-23 20:31:18 +01:00 |
|
Pablo Pena
|
e449a612f5
|
fix: use BackPickId to calculate player intro ball throw animation palette (#7193)
|
2025-06-23 19:45:12 +02:00 |
|
Eduardo Quezada
|
a75a49710f
|
Fixed debug flag menu sound (#7190)
|
2025-06-23 15:46:49 +02:00 |
|
Alex
|
66e8200d95
|
Use battler arguments for SetMoveEffect (#7156)
|
2025-06-23 15:26:31 +02:00 |
|
i0brendan0
|
0ccf797cce
|
Fixes Roamers not saving shininess (#7185)
|
2025-06-23 15:05:01 +02:00 |
|
Alex
|
753eb9f8d8
|
Fixes Enigma, Kee and Maranga Berry activation timing (#7171)
|
2025-06-23 13:47:26 +02:00 |
|
DizzyEggg
|
7fdc5a45b6
|
force RHH Rom Header to always be present (#7187)
|
2025-06-23 10:38:03 +02:00 |
|
DizzyEggg
|
0dae2cea28
|
force sGFRomHeader to always be present (#7186)
|
2025-06-23 10:37:49 +02:00 |
|
Bassoonian
|
c34ec8956d
|
Master to upcoming merge, 20/06/25 (#7169)
|
2025-06-23 10:04:44 +02:00 |
|
grintoul
|
6c6daa8b9c
|
Fixes Rapid Spin description (#7178) (#7181)
|
2025-06-23 10:02:51 +02:00 |
|
GriffinR
|
4ce83c7d96
|
Merge pull request #2104 from GriffinRichards/fix-collision-comparison
Fix collision comparison in PlayerNotOnBikeMoving
|
2025-06-22 20:05:30 -04:00 |
|
DizzyEggg
|
53f8ae11ff
|
Move gTradePlatform_Tilemap to header (#2088)
|
2025-06-22 19:48:37 -04:00 |
|
Eduardo Quezada
|
1f8455c769
|
Fixed TM and Berries disappearing when sorting (#7168)
|
2025-06-22 20:39:13 +02:00 |
|
Eduardo Quezada
|
cf7f15faac
|
Untangle InitBtlControllers functions (#6748)
|
2025-06-22 16:21:37 +02:00 |
|
Eduardo Quezada
|
b094b70dc5
|
More battle controller function consolidation. (#6877)
|
2025-06-21 10:59:41 +02:00 |
|
Eduardo Quezada
|
bca28b40bb
|
Use argument.type for EFFECT_SOAK (#7141)
|
2025-06-21 00:04:52 +02:00 |
|
PhallenTree
|
98670ca30e
|
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)
|
2025-06-21 00:04:01 +02:00 |
|
AlexOn1ine
|
aabb632894
|
Master to upcoming merge, 20/06/25
|
2025-06-20 17:09:58 +02:00 |
|
hedara90
|
009a47a5dc
|
Fixed Battle Pyramid mon generation (#7146)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-20 13:19:24 +02:00 |
|
Bassoonian
|
24fdac662e
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge196
|
2025-06-19 14:32:23 +02:00 |
|
hedara90
|
390482d355
|
Fix debug text order (#7149)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-19 14:26:49 +02:00 |
|
Bivurnum
|
12b2a29607
|
Bug fix: clear follower npc surf blob on white out (#7153)
|
2025-06-18 22:50:55 +02:00 |
|
Bassoonian
|
6333702461
|
Converts more defines to enums and name unnamed enums (#7071)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-06-18 14:30:37 +02:00 |
|
PhallenTree
|
340d815c6d
|
Stat Change (Animation) Refactor (#7144)
|
2025-06-18 14:24:35 +02:00 |
|
Alex
|
ab1838ffd8
|
Repurposes IsMagicGuardProtected into a general function (#7114)
|
2025-06-18 12:56:03 +02:00 |
|
Eduardo Quezada
|
800829538c
|
Compound strings for hold effect names (#7140)
|
2025-06-18 11:38:42 +02:00 |
|
Nephrite
|
a18709fb47
|
Bag refactor (groundwork for expansion) (#7018)
|
2025-06-18 10:59:24 +02:00 |
|
cawtds
|
97137aed2d
|
Improve music/se macros and fix names (#7030)
|
2025-06-18 10:58:37 +02:00 |
|
Nephrite
|
06cd3af3ea
|
Volatile status refactoring (#6983)
|
2025-06-18 07:22:41 +02:00 |
|
Zatsu
|
a765b8b45d
|
fixes #7129: 'add to full party' feature in the safari zone (#7147)
|
2025-06-17 21:29:52 +02:00 |
|
psf
|
75fe3e7da6
|
Fixed typo in sMoveRelearnerMenuState (#2155)
|
2025-06-17 15:38:33 +01:00 |
|
Eduardo Quezada
|
5966852f8d
|
Removed Mind Blown effect in favor of move flag (#7138)
|
2025-06-17 00:02:46 +02:00 |
|
Eduardo Quezada
|
651e87af5f
|
Converted Relic Song into a proper form change (#7139)
|
2025-06-17 00:02:25 +02:00 |
|
Eduardo Quezada
|
221ff8ed47
|
Removed redundant Damp check (#7134)
|
2025-06-16 22:11:00 +02:00 |
|
Alex
|
e2f0767be5
|
Decouple Status set by ability from SetMoveEffect (#7125)
|
2025-06-16 14:45:21 +01:00 |
|
hedara90
|
981aa3ee7c
|
Use RGB values for DEFAULT_LIGHT_COLOR (#7133)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-06-16 13:38:07 +02:00 |
|
Pawkkie
|
283bf68ff9
|
Fix incorrect function parameters used in AI damage calc (#7130)
|
2025-06-16 07:59:30 +02:00 |
|
cawtds
|
3491cd95e8
|
Fix sell price display (#7123)
|
2025-06-15 11:52:51 +02:00 |
|
Bivurnum
|
459946ac9a
|
Bug fix: Follower NPC no longer retains bike sprite after white out (#7120)
|
2025-06-15 11:10:32 +02:00 |
|
GriffinR
|
bfa3e4a07b
|
Merge pull request #2145 from abaresk/remove-berryfix
Remove berry yield bug fix
|
2025-06-15 00:41:33 -04:00 |
|
Alex
|
522ccf06da
|
Use CanAbilityAbsorbMove in GetOverworldTypeEffectiveness (#7115)
|
2025-06-14 11:56:04 +02:00 |
|
Alex
|
d4146afcae
|
Add damage context to effectiveness multiplier (#7111)
|
2025-06-14 11:05:14 +02:00 |
|
DizzyEggg
|
1cc4321a42
|
Fix AnimItemSteal_Step3 and AnimKnockOffOpponentsItem matches
|
2025-06-13 16:45:24 +02:00 |
|
Alex
|
c120fa71dc
|
Fixes Ally Switch in multi battles (#7109)
|
2025-06-13 15:18:27 +02:00 |
|
Alex
|
e1b542944f
|
Refactor damage calculations aruguments by using a struct context (#7108)
|
2025-06-13 14:16:40 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +02:00 |
|