13782 Commits

Author SHA1 Message Date
mitsunee
afa42f5d29
Standardize spelling of "paralyze" 2025-11-19 21:19:15 +01:00
mitsunee
c0569cd529
Standardize spelling of "synchronize" 2025-11-19 21:14:45 +01:00
AlexOn1ine
6a28506ee2 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
AlexOn1ine
6aa84c8fa1 Canceller -> Canceler rename 2025-11-19 16:06:52 +01:00
Frank DeBlasio
c9e83dadbd
Added missing 'coolness' string (#8274) 2025-11-19 15:27:34 +01:00
Alex
39ffda4245
Fixes End Turn Speed Order (#8289) 2025-11-19 15:14:59 +01:00
moostoet
8c2d31b792
Add AI flag AI_FLAG_KNOW_OPPONENT_PARTY to know all species in party (#8290) 2025-11-18 23:41:04 +01:00
moostoet
0f4d325467
Fix Fur Coat affecting confusion self-damage (#8267) 2025-11-18 23:34:36 +01:00
FosterProgramming
8f692ed055
Block selecting x items when contrary pokemon are at minimum stages (#8288) 2025-11-18 23:33:41 +01:00
FosterProgramming
4a69268bd5
Make rainbow effect anim change based on side (#8269) 2025-11-18 23:31:47 +01:00
FosterProgramming
a914c11b30
Fix max mushroom unable to be selected when one stat is maxed (#8287) 2025-11-18 23:12:11 +01:00
moostoet
5e40456f45
Fix AI_FLAG_DOUBLE_ACE_POKEMON sending duplicate Pokémon in doubles (#8279) 2025-11-18 19:33:49 +01:00
FosterProgramming
9b16204705
Fix not enough memory being allocated when moves load background in contests (#8284) 2025-11-18 17:50:15 +01:00
Alex
0999ca8ff9
Shell Trap tests and Fix for Encore interaction (#8268)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-11-18 15:29:19 +01:00
Martin Griffin
c5bbaeab5d STATIC_ASSERT for sizeof(struct ListMenu) 2025-11-18 00:34:07 +01:00
moostoet
7fd1404354
Fix Magic Coat reflecting hazard moves incorrectly when used by a partner (#8272) 2025-11-17 18:03:41 +01:00
Bivurnum
48f15b14a2
Follower NPCs no longer move if the player would be forced back onto the same tile. (#8260) 2025-11-16 21:15:06 +01:00
Bivurnum
13bae5d1b2
Bug Fix: NPC Followers not working on slow sideways stairs (#8257) 2025-11-16 11:15:43 -08:00
AlexOn1ine
ba74c076f6 pret merge 2025-11-16 12:01:13 +01:00
Estellar
1d754945dd Small bg drawing optimization 2025-11-15 19:41:08 -03:00
Alex
e445160c92
Adjust Canceler naming to contain only one l (#8258) 2025-11-15 18:44:16 +01:00
FosterProgramming
e472d277d2
Fix light flickering when different types of light sprite are present (#8043) 2025-11-15 15:14:17 +01:00
mitsunee
73ec0813e1
Standardize spelling of "canceler"
just a quick grep -r and regex substitution, but didn't see anything wrong in the diffs during a quick proofread
2025-11-15 12:11:32 +01:00
FosterProgramming
d9d3e51a9c
Fix mirage tower ceiling crumble color (#8081) 2025-11-15 12:03:16 +01:00
Zimmermann Gyula
772abe6e7d
Implement GSC berry/apricorn tree functionality. (#7777)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-11-14 20:28:55 +01:00
Frank DeBlasio
ca575f2701
Added Gen 6 contest combos (#8251) 2025-11-14 18:24:33 +01:00
Frank DeBlasio
1683b1ff59
Converted options text into COMPOUND_STRINGs (#8248) 2025-11-14 18:23:33 +01:00
Montblanc
90c5e1424f
Removed extra period in Pokéshi Doll description (#8252) 2025-11-14 11:42:51 +01:00
Alex
82d09571fd
Fixes Shell Trap not activating on contact but no damage (#8243) 2025-11-13 22:51:07 +01:00
Martin Griffin
555c603b67
Avoid illegal move retargeting in singles (#8217) 2025-11-13 13:51:35 +01:00
Martin Griffin
586571391f
GetEggSpecies: Only enabled species (#8221) 2025-11-13 13:50:35 +01:00
Linathan
8c83a25676
Fixed an issue related to same turn Encore targeting (#8230)
Co-authored-by: LinathanZel <LinathanZel@github.com>
2025-11-13 11:37:17 +01:00
FosterProgramming
db9460c670
Fix wrong palette for types sprites in hgss dex after catching mon (#8153)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-11-13 11:36:26 +01:00
Frank DeBlasio
6d09eb2402
Added contest config and cleaned up contest category variables (#8178) 2025-11-13 11:29:38 +01:00
Alex
ea442bca6d
Revert gBattleTurnCounter change (#8197) 2025-11-13 11:25:02 +01:00
FosterProgramming
d85f97b3f7
Fix mew sprite not appearing correctly (#8235) 2025-11-13 11:23:48 +01:00
Martin Griffin
30f6f1f8c1
HandleAction_UseMove minor cleanup (#8214) 2025-11-12 22:54:34 +01:00
Martin Griffin
16d80e9bb1
trysethelpinghand avoid illegal target (#8218) 2025-11-12 22:53:35 +01:00
Martin Griffin
2bb0d0249d
SpriteCB_EnemyShadow: Avoid use-after-free (#8220) 2025-11-12 22:52:31 +01:00
Martin Griffin
fe85da81fc
AI: Handle MOVE_UNAVAILABLE in last used moves (#8219) 2025-11-12 22:47:50 +01:00
FosterProgramming
eaa768fe79
Fix match call regression (#8227)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-11-12 22:22:57 +01:00
FosterProgramming
7d778af946
Fix wrong ditto sprite on capture (#8226) 2025-11-12 20:00:19 +01:00
Eduardo Quezada
1545e22d0a
Clean usage of gMovesInfo (#8234) 2025-11-12 19:29:45 +01:00
Martin Griffin
2373f0283b
moveend: Handle MOVE_UNAVAILABLE in MOVEEND_THIRD_MOVE_BLOCK (#8215) 2025-11-11 22:01:16 +01:00
Martin Griffin
44453888df
AccuracyCheck: Avoid calling GetMoveEffect with NO_ACC_CALC_CHECK_LOC… (#8222) 2025-11-11 22:00:03 +01:00
Martin Griffin
12b65b565b
DamageContext: chosenMove (#8224) 2025-11-11 21:59:18 +01:00
Martin Griffin
b8fc084daa
Avoid illegal GetBattlerAtPosition (#8225) 2025-11-11 21:57:04 +01:00
Alex
bb11d96d86
Merge branch 'upcoming' into 111125 2025-11-11 19:04:54 +01:00
Alex
f28abcab6a
Micro clean up in BattleStruct (#8177) 2025-11-11 17:42:27 +01:00
Alex
03b6200af5
Fixes Drain Punch / Parental Bond / Scale Shot interaction (#8198) 2025-11-11 17:41:56 +01:00