Eduardo Quezada
|
7a0cbc12d2
|
Added CRY_MODE_DYNAMAX (#6933)
|
2025-06-30 09:45:09 -07:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04:00 |
|
ghoulslash
|
21ac62f781
|
Flush textbox for Truant Popup (#7252)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-29 21:38:52 +02:00 |
|
PhallenTree
|
6ed4f73f6a
|
Fixes Emergency Exit sometimes causing an unrelated battler to become invisible (#7241)
|
2025-06-28 23:20:40 +02:00 |
|
psf
|
b60c897b4a
|
Add P_ASK_MOVE_CONFIRMATION (#7132)
|
2025-06-27 10:11:41 +02:00 |
|
PhallenTree
|
a82aa618fb
|
Adds Ability Shield activation message (#7224)
|
2025-06-26 14:42:32 +02:00 |
|
Alex
|
2531613a52
|
Fixes Eject Pack not resolving correctly during switch in effects (#7002)
|
2025-06-25 21:15:40 +02:00 |
|
Bivurnum
|
c6221fa50e
|
Add debug options for follower NPCs (#7215)
|
2025-06-25 21:13:43 +02:00 |
|
Alex
|
773ecd4c24
|
Fixes OOB for Teatime and Flower Shield (#7214)
|
2025-06-25 21:00:49 +02:00 |
|
Alex
|
7d7ffd58ae
|
Fixes Booster Energy timing activation + Clean up (#7175)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-06-25 18:20:55 +02:00 |
|
Hedara
|
c0a50096f3
|
Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
Conflicts:
include/constants/event_objects.h
src/event_object_movement.c
src/follower_helper.c
|
2025-06-25 17:54:59 +02:00 |
|
Hedara
|
1916703e5a
|
Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
Conflicts:
include/battle_script_commands.h
include/constants/event_objects.h
include/event_object_movement.h
include/field_effect.h
include/field_effect_helpers.h
include/sprite.h
src/battle_controller_player.c
src/event_object_movement.c
src/pokeball.c
|
2025-06-25 17:49:19 +02:00 |
|
Hedara
|
150091990d
|
Merge commit '07fd8a28fbd5b23a6828846e4606fc3ecd54c3d9' into merrp-merge
|
2025-06-25 17:14:52 +02:00 |
|
Alex
|
f8551830c9
|
Adds Gen5+ Encore config (#7051)
|
2025-06-25 15:58:30 +02:00 |
|
Hedara
|
51a5577f65
|
Merge branch 'master' into master-upcoming
Conflicts:
src/battle_controller_safari.c
src/data/moves_info.h
src/graphics.c
|
2025-06-25 14:17:07 +02:00 |
|
Ariel A
|
7564262543
|
Merge branch 'followers' into lighting
|
2025-06-24 20:44:44 -04:00 |
|
Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04:00 |
|
Ariel A
|
07fd8a28fb
|
fix: hide followers when player enters Battle Pike curtains
|
2025-06-24 20:16:04 -04:00 |
|
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 |
|
Alex
|
66e8200d95
|
Use battler arguments for SetMoveEffect (#7156)
|
2025-06-23 15:26:31 +02:00 |
|
PhallenTree
|
98670ca30e
|
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170)
|
2025-06-21 00:04:01 +02:00 |
|
GriffinR
|
e2e3438674
|
Add missing uses of LOCALID_NONE for trainerbattle
CI / build (push) Has been cancelled
|
2025-06-20 15:33:12 -04:00 |
|
AlexOn1ine
|
aabb632894
|
Master to upcoming merge, 20/06/25
|
2025-06-20 17:09:58 +02:00 |
|
Alex
|
57feee3743
|
Add missing flag for Berserk Gene (#7151)
|
2025-06-19 14:26:28 +02:00 |
|
Daniel Walls
|
cc33d6171b
|
Add config options for removing bard phoneme audio to save ROM space (#7155)
|
2025-06-18 20:16:25 -07:00 |
|
PhallenTree
|
340d815c6d
|
Stat Change (Animation) Refactor (#7144)
|
2025-06-18 14:24:35 +02:00 |
|
ghoulslash
|
a154d7a7a4
|
Fix savage spin out spider web template (#7137)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-18 11:04:24 +02:00 |
|
Nephrite
|
06cd3af3ea
|
Volatile status refactoring (#6983)
|
2025-06-18 07:22:41 +02:00 |
|
Eduardo Quezada
|
651e87af5f
|
Converted Relic Song into a proper form change (#7139)
|
2025-06-17 00:02:25 +02:00 |
|
Alex
|
e2f0767be5
|
Decouple Status set by ability from SetMoveEffect (#7125)
|
2025-06-16 14:45:21 +01:00 |
|
Alex
|
c120fa71dc
|
Fixes Ally Switch in multi battles (#7109)
|
2025-06-13 15:18:27 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +02:00 |
|
Hedara
|
bdd7c5bfa8
|
Merge branch 'master' into master-merge
Conflicts:
src/contest_painting.c
|
2025-06-09 23:27:18 +02:00 |
|
kittenchilly
|
872bb8785b
|
Simplify white out messages (#6961)
|
2025-06-08 08:52:37 -07:00 |
|
Alex
|
f374291f69
|
Fixes Wandering Spirit copied ability activation on fainted mon (#7066)
|
2025-06-05 22:47:32 +02:00 |
|
Alex
|
020be9d5b0
|
Deprecate sStatusFlagsForMoveEffects (#7063)
|
2025-06-05 14:32:28 +02:00 |
|
Eduardo Quezada
|
3decd3da0a
|
Animation documentation (#7052)
|
2025-06-04 11:19:57 +02:00 |
|
Alex
|
177fa2f096
|
Combines Super Fang and Guardian of Alola effects (#7048)
|
2025-06-03 10:26:25 +02:00 |
|
Eduardo Quezada
|
3565c7a8a6
|
Documented usage of delay X (#6951)
|
2025-06-01 17:11:42 +02:00 |
|
Alex
|
ede15918cf
|
Refactors Final Gambit + Tests (#7005)
|
2025-05-31 15:52:53 +02:00 |
|
ShinyVolcarona
|
7f4f391e9b
|
New Attack Animations: 25w20a (#6886)
|
2025-05-31 11:34:24 +02:00 |
|
cawtds
|
21499cbee1
|
Refactor field moves (#6660)
|
2025-05-31 09:03:12 +02:00 |
|
PhallenTree
|
fa342b2909
|
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004)
|
2025-05-31 08:45:46 +02:00 |
|
AlexOn1ine
|
f4c64a2d79
|
conflicts
|
2025-05-30 19:20:32 +02:00 |
|
psf
|
9656400f88
|
Moved time constants to dedicated files (#7019)
|
2025-05-30 16:39:01 +02:00 |
|
Alex
|
5bdab5163e
|
Update Supersweet Syrup with eject pack fix (#7015)
|
2025-05-30 11:58:32 +02:00 |
|
Bivurnum
|
f2a3226b47
|
Fixed follower NPC changing to surf sprite when choosing not to surface from dive (#7010)
|
2025-05-29 11:05:23 +02:00 |
|
Hedara
|
9d80ad530d
|
Merge branch 'master' into master-to-upcoming
Conflicts:
Makefile
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/MtChimney/scripts.inc
data/maps/MtPyre_Summit/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
include/constants/event_objects.h
include/constants/expansion.h
src/battle_script_commands.c
src/battle_util.c
src/field_screen_effect.c
|
2025-05-28 14:26:15 +02:00 |
|
Alex
|
c489d36fc6
|
Fixes Gen3 berry activation timing (#6993)
|
2025-05-27 23:36:00 +02:00 |
|
Hedara
|
647c786c53
|
Merge commit '07c897a' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:46:13 +02:00 |
|
Hedara
|
c27930eabf
|
Merge commit '678fdf9' into pret-merge
Conflicts:
data/maps/BirthIsland_Exterior/scripts.inc
data/maps/DesertUnderpass/scripts.inc
data/maps/Route117/scripts.inc
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
data/maps/SootopolisCity/scripts.inc
include/constants/event_objects.h
src/battle_setup.c
src/event_object_movement.c
src/field_control_avatar.c
src/item_use.c
src/scrcmd.c
tools/mapjson/mapjson.cpp
|
2025-05-27 19:22:40 +02:00 |
|
Hedara
|
4a442cc3e6
|
Merge commit '091b726' into pret-merge
Conflicts:
include/constants/heal_locations.h
map_data_rules.mk
|
2025-05-27 19:02:53 +02:00 |
|
Hedara
|
9bfef357a2
|
Merge commit 'e4e90ea' into pret-merge
Conflicts:
src/battle_setup.c
src/field_specials.c
src/menu_helpers.c
src/pokedex_area_screen.c
src/roamer.c
src/script.c
|
2025-05-27 18:53:30 +02:00 |
|
Alex
|
de463af0df
|
Fixes weather anim damage being applied to the wrong mon (#6973)
|
2025-05-26 13:22:05 +02:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|
Vex
|
7b686b6749
|
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-25 23:01:11 +02:00 |
|
Eduardo Quezada
|
17e570407e
|
Remove trailing whitespace (#6968)
|
2025-05-23 22:33:12 +02:00 |
|
Eduardo Quezada
|
c50ebf17d0
|
Documented usage of createsprite gSlideMonToOffsetSpriteTemplate (#6953)
|
2025-05-23 14:41:25 +02:00 |
|
Eduardo Quezada
|
10b5c3f4da
|
Documented usage of createsprite gSparkElectricitySpriteTemplate (#6955)
|
2025-05-23 14:35:55 +02:00 |
|
Eduardo Quezada
|
9554146738
|
Fixed forfeit money for B_WHITEOUT_MONEY <= GEN_3 (#6942)
|
2025-05-22 14:27:28 +02:00 |
|
Eduardo Quezada
|
35a7caa682
|
Documented usage of createsprite gBasicHitSplatSpriteTemplate (#6950)
|
2025-05-22 09:33:55 +02:00 |
|
Eduardo Quezada
|
d42d9012e4
|
Documented usage of createsprite gDirtPlumeSpriteTemplate (#6954)
|
2025-05-22 09:27:30 +02:00 |
|
Eduardo Quezada
|
b85a56b718
|
Documented usage of createsprite gSimplePaletteBlendSpriteTemplate (#6956)
|
2025-05-22 09:21:43 +02:00 |
|
Bassoonian
|
54806c8838
|
Add no-whiteout feature (#6795)
|
2025-05-17 11:20:35 +02:00 |
|
Jonathan Lin
|
c133da2437
|
Fix to warnings pertaining to Mega Evolution and Ultra Burst RGB values (#6883)
|
2025-05-16 21:26:28 +02:00 |
|
AlexOn1ine
|
35dff24c9b
|
Master to upcoming merge
|
2025-05-15 20:37:27 +02:00 |
|
Alex
|
a086d5f592
|
Reverts wrongly done gem fix and renames struggle effect (#6806)
|
2025-05-15 10:45:48 +02:00 |
|
Alex
|
75cd16dae0
|
Fix potential bug in BattleScript_FriskActivates (#6850)
|
2025-05-15 10:44:37 +02:00 |
|
Jonathan Lin
|
b5fbced691
|
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
|
2025-05-15 09:40:02 +02:00 |
|
GriffinR
|
929bc8b990
|
Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
|
2025-05-14 11:50:11 -04:00 |
|
Eduardo Quezada
|
3ef61e6451
|
Combined type-enhancing hold effects (#6846)
|
2025-05-14 13:45:08 +02:00 |
|
ghoulslash
|
d4c64d3b67
|
rename berrystatraise script to consumablestatraise
|
2025-05-12 21:11:25 -04:00 |
|
ghoulslash
|
14a66d612f
|
combine BattleScript_BerryStatRaiseRet and BattleScript_BerryStatRaiseEnd2, check ripen popup doesn't trigger except on berries
|
2025-05-12 21:06:12 -04:00 |
|
Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
PhallenTree
|
a6b02b00c0
|
Fixes restoretarget on empty stack when using G-Max Gravitas (#6827)
|
2025-05-12 15:16:40 +02:00 |
|
Alex
|
d00563d830
|
Changed White Herb hold effect name (#6815)
|
2025-05-11 11:34:47 +02:00 |
|
Alex
|
0ad3f929ab
|
Fixes Berserk Gene infinite loop (#6813)
|
2025-05-11 11:34:16 +02:00 |
|
spindrift64
|
f4f82f2394
|
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814)
|
2025-05-10 22:55:28 +02:00 |
|
Alex
|
4342bfb91d
|
Refactor stockpile resets (#6810)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-10 20:09:38 +02:00 |
|
PhallenTree
|
48c08c0368
|
Illusion struct cleanup and many Illusion fixes (#6798)
|
2025-05-09 20:41:20 +02:00 |
|
Alex
|
6fe5f6530a
|
General MoveEnd clean up and Fell Stinger adjustments (#6674)
|
2025-05-07 00:30:43 +02:00 |
|
hedara90
|
fe2d7442af
|
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-05-03 10:54:49 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02: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
|
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 |
|
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 |
|
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 |
|
PhallenTree
|
91fc406b0a
|
Fixes Mirror Armor stat drops not being stopped by Substitute (#6675)
|
2025-04-22 19:54:04 +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
|
c4edfd2988
|
Fix gBattlerTarget OOB for Gravity and Perish Song (#6662)
|
2025-04-21 13:53:04 +02:00 |
|
cawtds
|
0069ec1f0c
|
Fix captivate-oblivious interaction and related test (#6653)
|
2025-04-21 11:01:01 +02:00 |
|
Alex
|
86969f9919
|
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-20 22:49:52 +02:00 |
|
hedara90
|
17b992bec5
|
Fixes some moves trying to load too much VRAM (#6633)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-04-18 17:16:46 -04:00 |
|
Alex
|
6b09480912
|
Fixes some restore issues (#6629)
|
2025-04-18 16:57:04 -04:00 |
|