ghoulslash
|
81ed774c00
|
EndTurnEffectOrder Refactor (#6224)
|
2025-04-14 10:57:34 -04:00 |
|
Hedara
|
9afd8800f3
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-12 16:33:02 +02:00 |
|
Alex
|
4aca2fdcd3
|
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-04-10 15:01:02 +02:00 |
|
Hedara
|
e419606a10
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 12:48:18 +02:00 |
|
Hedara
|
2210e2d410
|
Merge branch 'master' into upcoming-master
|
2025-04-09 11:06:38 +02:00 |
|
Hedara
|
08a2ad2c98
|
Merge branch 'upcoming' into merrps-dns
|
2025-04-09 10:01:51 +02:00 |
|
AlexOn1ine
|
e8cc3c81f8
|
conflicts
|
2025-04-06 14:59:12 +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 |
|
AlexOn1ine
|
0c35879e02
|
conflicts
|
2025-04-01 19:11:55 +02:00 |
|
AlexOn1ine
|
ccebebf64f
|
31-03-25 Master merge
|
2025-03-31 18:23:46 +02:00 |
|
Alex
|
388389714b
|
Rename removelishtscreenreflect to removescreens (#6495)
|
2025-03-30 10:52:24 +02:00 |
|
Bassoonian
|
9a23f19575
|
19-03-25 master to upcoming merge (#6450)
|
2025-03-20 09:57:05 +01:00 |
|
Alex
|
adc2c61fe8
|
Unifies dynamic move category checks (#6443)
|
2025-03-19 23:06:08 +01:00 |
|
AlexOn1ine
|
3c632b8b44
|
19-03-25 master to upcoming merge
|
2025-03-19 17:12:47 +01:00 |
|
Alex
|
99a3d01877
|
Fixes dynamax reversion when ejected out + anim fix (#6416)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-03-17 19:57:38 +01:00 |
|
wiz1989
|
1e2aa18ffe
|
Added Dynamax/Gigantamax battle messages (#6440)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-03-17 19:16:43 +01:00 |
|
Deokishisu
|
eaf7549854
|
Replace Incorrect Slow Stairs Movement with Correct One (#6275)
|
2025-03-16 14:51:36 -07:00 |
|
ghoulslash
|
d44eff4e0c
|
fix red card overwriting gBattlerAttacker causing subsequent MOVEEND cases checking attacker not to trigger properly
|
2025-03-03 14:56:08 -05:00 |
|
AlexOn1ine
|
0a333dbdc8
|
merge rhh/upcoming
|
2025-02-28 00:21:07 +01:00 |
|
Eduardo Quezada
|
2428af66cd
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-02-20 19:17:59 -03:00 |
|
Alex
|
502b1c5087
|
Rename SetPhotonGeyser to a more general use and clean up (#6272)
|
2025-02-17 22:07:30 +01:00 |
|
Eduardo Quezada
|
9c4fbbf274
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-13 13:06:32 -03:00 |
|
hedara90
|
7d1bbf62e1
|
Apply suggestions from code review
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-13 10:23:06 +01:00 |
|
AlexOn1ine
|
5ee5aa796a
|
merge rhh/upcoming
|
2025-02-12 21:01:21 +01:00 |
|
Hedara
|
7426a98dc5
|
Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge
|
2025-02-12 13:34:28 +01:00 |
|
Eduardo Quezada
|
3507862164
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-12 09:30:59 -03:00 |
|
Ariel A
|
c8fb56d73b
|
Merge branch 'followers' into followers-expanded-id
|
2025-02-10 00:24:50 -05:00 |
|
Ariel A
|
ef05bbf394
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-02-10 00:11:38 -05:00 |
|
hedara90
|
174bc2f29f
|
Fixed typo in requests_effects (#6215)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-09 16:59:31 -05:00 |
|
AlexOn1ine
|
4babfd003e
|
rhh merge/upcoming
|
2025-02-09 14:04:21 +01:00 |
|
AlexOn1ine
|
f2bd88a7f9
|
EndTurnEffectsOrder Refactor
|
2025-02-09 13:48:08 +01:00 |
|
Zatsu
|
43bce41796
|
Add caught mon to full party by sending a different mon to the Box (#6058)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-02-09 00:54:58 +01:00 |
|
Alex
|
de9e9af1b7
|
Fixes Spectral Thief stealing boost at the wrong time (#6197)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
|
2025-02-07 16:24:05 -05:00 |
|
Alex
|
765a12f520
|
Convert max effects to normal move effects (#6143)
|
2025-02-06 21:02:39 -03:00 |
|
Eduardo Quezada
|
64c5113b23
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-02 14:18:13 -03:00 |
|
Alex
|
97d8bd2646
|
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154)
|
2025-01-31 22:02:26 +01:00 |
|
Eduardo Quezada
|
11bdbfb658
|
Fix compile issues
|
2025-01-26 16:35:05 -03:00 |
|
Eduardo Quezada
|
00241cf569
|
Merge remote-tracking branch '_merrp_origin/lighting-expanded-id' into _RHH/pr/upcoming/lighting-expansion-v2
# Conflicts:
# README.md
# asm/macros/event.inc
# data/scripts/pkmn_center_nurse.inc
# include/constants/event_objects.h
# include/constants/field_weather.h
# include/overworld.h
# include/palette.h
# include/sprite.h
# src/battle_controller_player.c
# src/data/object_events/object_event_graphics.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_weather.c
# src/overworld.c
# src/palette.c
# src/scrcmd.c
# src/sprite.c
|
2025-01-26 12:08:10 -03:00 |
|
Ariel A
|
c1d105c31c
|
Merge branch 'lighting' into lighting-expanded-id
|
2025-01-25 21:45:23 -05:00 |
|
Ariel A
|
bc034aaf73
|
Merge branch 'followers-expanded-id' into lighting-expanded-id
|
2025-01-25 21:42:02 -05:00 |
|
Ariel A
|
16c31d61b4
|
fix: removed fadescreenswapbuffers palette dependence, via hardware fade
|
2025-01-25 20:58:22 -05:00 |
|
Salem
|
01e8d8233e
|
Trainer Battle Parameter Consolidation (#5982)
|
2025-01-25 22:02:39 +01:00 |
|
Eduardo Quezada
|
26daf15ce0
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-24 18:29:28 -03:00 |
|
ghoulslash
|
774e61e74a
|
Add Script Cmd for Forcing Save Game (#6090)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-01-24 20:42:16 +01:00 |
|
DizzyEggg
|
4e0eab9e27
|
Remove gDecompressionBuffer (#6029)
|
2025-01-23 09:47:14 +01:00 |
|
Eduardo Quezada
|
a756bb501c
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2
|
2025-01-19 22:31:33 -03:00 |
|
Eduardo Quezada
|
f6a86a65ef
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-01-19 10:32:57 -03:00 |
|
Alex
|
9ed3b176f0
|
Pret merge (17 of January) (#6045)
|
2025-01-18 19:53:29 +01:00 |
|
ghoulslash
|
37cbae5e54
|
Fix Symbiosis Needing battler Argument + Tests (#6039)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-01-18 14:44:07 +01:00 |
|