Salem
|
444437274c
|
remove obsolete check for steven when retrieving partner name (#6283)
|
2025-02-17 10:02:28 +01:00 |
|
moostoet
|
7cd614a0cd
|
Fix AI wrongly thinking it strikes first with priority even if player is using priority themselves (#6274)
|
2025-02-15 16:48:26 -05:00 |
|
PhallenTree
|
b1c597495b
|
Fixes Called moves ignoring redirection (#6267)
|
2025-02-14 13:47:02 +01:00 |
|
Alex
|
de8d25da55
|
Expand usage of IsBattlerAlly (rename from IsAlly) (#6251)
|
2025-02-14 12:31:21 +01:00 |
|
Alex
|
53727aa23d
|
Fixes ability Embody Aspect triggering multiple times (#6259)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-14 12:26:49 +01:00 |
|
Deokishisu
|
6d6b0f6c3b
|
Fix Extra task->tState++ and break in Task_DrawFieldMessageBox (#6261)
|
2025-02-14 10:11:37 +01:00 |
|
Alex
|
264e72c1a1
|
Use more accurate count in MovesInfo (#6260)
|
2025-02-13 20:22:10 -03:00 |
|
GriffinR
|
b464fdbbde
|
Fix collision comparison in PlayerNotOnBikeMoving
|
2025-02-13 15:37:18 -05:00 |
|
Alex
|
2b2d703c8a
|
Fixes Static Assert from pr #6174 (#6258)
|
2025-02-13 19:31:50 +01:00 |
|
Frank DeBlasio
|
d1b2b045d0
|
Moved sValidApprenticeMove into gMovesInfo (#6254)
|
2025-02-13 14:58:12 -03:00 |
|
moostoet
|
a42de40eb2
|
Add function to adjust AI scoring for generalized item effects (#6247)
|
2025-02-13 12:51:25 -05:00 |
|
GriffinR
|
f827022704
|
Merge pull request #2103 from fdeblasio/apprenticeIdHexToDec
Converted apprenctice IDs from hex to decimal
|
2025-02-13 12:39:51 -05:00 |
|
Frank
|
a0a8434e26
|
Converted apprenctice IDs from hex to decimal
|
2025-02-13 12:13:22 -05:00 |
|
Eduardo Quezada
|
845679471f
|
Added missing Dream Eater and Reflect Type tests (#6245)
|
2025-02-13 17:32:08 +01:00 |
|
Eduardo Quezada
|
9c4fbbf274
|
Merge branch '_RHH/master' into _RHH/upcoming
|
2025-02-13 13:06:32 -03:00 |
|
Pawkkie
|
f851fb536a
|
Improve Yawn and Status Switching (#6202)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-13 17:34:40 +01:00 |
|
Alex
|
8448e745ea
|
Adds a follower flag define to disable followers on the fly (#6174)
|
2025-02-13 17:33:59 +01:00 |
|
Alex
|
0438b66f63
|
Minor Clean up for CanAbilityX. Follow up for #6183 (#6252)
|
2025-02-13 17:33:21 +01:00 |
|
Bassoonian
|
5aeeb3365f
|
Merrp merge (12th of February) (#6244)
|
2025-02-13 16:19:40 +01:00 |
|
Bassoonian
|
35324497a6
|
Update src/event_object_movement.c
|
2025-02-13 13:35:38 +01:00 |
|
Hedara
|
ddc7877a94
|
Merge branch 'merrp-merge' of github.com:hedara90/pokeemerald-expansion into merrp-merge
|
2025-02-13 10:37:00 +01:00 |
|
Hedara
|
0da3e49889
|
Review comments
|
2025-02-13 10:36:52 +01:00 |
|
hedara90
|
7d1bbf62e1
|
Apply suggestions from code review
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-02-13 10:23:06 +01:00 |
|
hedara90
|
9aea7c8e3a
|
Changed bit order for follower graphicsId creation (#6249)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-12 23:36:37 +01:00 |
|
Zatsu
|
4f3326f3f4
|
fix for battle ui for add to party menu (#6229) (#6240)
|
2025-02-12 22:02:25 +01:00 |
|
hedara90
|
f20aebf878
|
Fixed multi battle forced switches (#6243)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-02-12 21:57:51 +01:00 |
|
AlexOn1ine
|
5ee5aa796a
|
merge rhh/upcoming
|
2025-02-12 21:01:21 +01:00 |
|
AlexOn1ine
|
ff47ca0f7a
|
fix healing after magic room ends
|
2025-02-12 20:16:02 +01:00 |
|
AlexOn1ine
|
f8b45028db
|
fix grassy terrain healing
|
2025-02-12 19:33:41 +01:00 |
|
AlexOn1ine
|
3c09e43a20
|
minor reviews
|
2025-02-12 18:51:50 +01:00 |
|
Hedara
|
a859f40e37
|
Review comments
|
2025-02-12 14:31:42 +01:00 |
|
Frank DeBlasio
|
0f0c8325c5
|
Replaced hardcoded numbers in DexNav with variables (#6241)
|
2025-02-12 09:44:45 -03: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 |
|
Eduardo Quezada
|
860c2f6cbc
|
Remove whitespace from trainers data file (#6234)
|
2025-02-12 00:27:33 +01:00 |
|
Alex
|
075cd4e924
|
Revert unintentional change (#6239)
|
2025-02-12 00:27:00 +01:00 |
|
GriffinR
|
45d1c7ca7d
|
Merge pull request #2086 from DizzyEggg/patch-5
extern void * const gNullScriptPtr;
|
2025-02-11 14:45:19 -05:00 |
|
GriffinR
|
07c897ad48
|
Merge pull request #2101 from GriffinRichards/heal-locations-file
Generate heal location constants automatically
|
2025-02-11 14:44:43 -05:00 |
|
GriffinR
|
eb8eeaec48
|
Merge pull request #2094 from hedara90/pc-align-fix
Fixed potential unaligned issue in PC screen
|
2025-02-11 14:42:19 -05:00 |
|
GriffinR
|
a4350005e7
|
Merge pull request #2092 from AsparagusEduardo/patch-2
Fixed Gen 1/2's Transform "pink color" reference
|
2025-02-11 14:40:34 -05:00 |
|
Alex
|
72de12609c
|
Fixes BATTLER_TURN_DAMAGED battler id (#6236)
|
2025-02-11 16:18:00 -03:00 |
|
Alex
|
cc9ca81c29
|
Add abstraction layer for battler positions (#6212)
|
2025-02-11 11:32:34 -05:00 |
|
Bassoonian
|
27f0fb068e
|
Pret merge (11th of February) (#6231)
|
2025-02-11 13:21:44 +01:00 |
|
AlexOn1ine
|
b4f17c7506
|
review comments
|
2025-02-11 12:06:16 +01:00 |
|
Hedara
|
e0e73983c7
|
Merge remote-tracking branch 'pret/master' into pret-merge-2025-02-11
|
2025-02-11 11:20:37 +01:00 |
|
明雅
|
846fe64789
|
Try a new solution to Fix Safari #6206 (#6228)
|
2025-02-10 15:55:57 +01:00 |
|
Ariel A
|
00c5ccbc89
|
Merge branch 'lighting' into lighting-expanded-id
|
2025-02-10 00:27:13 -05:00 |
|
Ariel A
|
02a49be4b2
|
Merge branch 'followers-expanded-id' into lighting-expanded-id
|
2025-02-10 00:27:09 -05:00 |
|
Ariel A
|
c8fb56d73b
|
Merge branch 'followers' into followers-expanded-id
|
2025-02-10 00:24:50 -05:00 |
|
Ariel A
|
a4e032c28d
|
Merge branch 'followers' into lighting
|
2025-02-10 00:19:48 -05:00 |
|