7396 Commits

Author SHA1 Message Date
GriffinR
dbff8c4360
Merge branch 'porymap-6' into generate-map-constants 2024-12-09 20:25:41 -05:00
hedara90
75eaf890a2
Evolution level 1 learn (#5791)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-09 13:21:30 +01:00
hedara90
09a8d051d4
Added the missing config to use new terrains (#5792)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-09 12:28:31 +01:00
Eduardo Quezada
66a2a16bbc Merge branch '_RHH/master' into _RHH/upcoming 2024-12-08 12:00:29 -03:00
Alex
3f3f4cfe1c
New Volt Switch Animation (#5729)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-07 15:52:13 +01:00
hedara90
54d372162f
Added NBSP and up+down arrows to all fonts (#5767)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-07 07:26:23 -03:00
PhallenTree
775ea3b564
Pursuit refactor (#5707) 2024-12-06 19:14:46 +01:00
Eduardo Quezada
29ef1cf9ad Stick to the new name 2024-12-05 21:00:55 -03:00
Pawkkie
da2a1e2aba
Destiny Bond fails on repeated use in Gen 7+ (#5652) 2024-12-05 22:29:20 +01:00
Eduardo Quezada
720b2daecc Improve Pyramid location documentaion 2024-12-05 18:25:27 -03:00
Philipp AUER
7744298788
Fix fixed point damage calculation off-by-1s (#5775)
Co-authored-by: sbird <sbird@no.tld>
2024-12-05 11:35:56 +00:00
Eduardo Quezada
458bd5ad4d Review changes pt 1 2024-12-05 07:56:49 -03:00
Eduardo Quezada
d151e00c70 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/lighting-expansion-v2 2024-12-04 19:15:48 -03:00
Eduardo Quezada
a92350fb53 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-04 18:55:56 -03:00
Pawkkie
599f4d339b
Adds SleepClauseBlock enum to CanBeSlept (#5773) 2024-12-04 21:54:31 +01:00
Eduardo Quezada
68b5b63ecb Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/hp_reduction 2024-12-04 12:04:47 -03:00
Eduardo Quezada
e4f8b4ccf0 Addressed review changes (minus encapsulation) 2024-12-04 11:31:28 -03:00
Eduardo Quezada
5c180a0b09
Added FONT_SHORT_NARROWER (#5101) 2024-12-04 06:30:19 -08:00
Frank DeBlasio
1b880a1185
Converted item-related variables to COMPOUND_STRINGs (#5714) 2024-12-03 23:11:59 +01:00
Alex
70224f0ea3
Fixes items preventing other switch in effects (#5732)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-12-03 11:15:29 -05:00
Martin Griffin
993663d9b0
Variadic IS_BATTLER_OF_TYPE and GetBattlerTypes (#5708) 2024-12-03 13:12:54 +01:00
Frank DeBlasio
a97cfaa068
Converts multi-choice options to COMPOUND_STRINGs (#5686) 2024-12-03 12:32:13 +01:00
Pawkkie
c8b0da2493
Add AI_FLAG_WEIGH_ABILITY_PREDICTION (#5636) 2024-12-03 12:28:22 +01:00
Pawkkie
b15f7ad4f1
Sleep Clause global config (#5762) 2024-12-02 16:35:28 -05:00
AlexOn1ine
8acb31339d rename critChance and moveDamage 2024-12-02 19:57:45 +01:00
AlexOn1ine
d95dbadccc merge rhh/upcoming 2024-12-02 19:00:55 +01:00
AlexOn1ine
aa61f24e81 clean up 2024-12-02 18:25:24 +01:00
Eduardo Quezada
7ac7ab8f6f Merge branch '_RHH/master' into _RHH/upcoming 2024-12-02 13:49:43 -03:00
AlexOn1ine
09c9d8a800 merge rhh/upcoming 2024-12-02 17:45:00 +01:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE (#5566)
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-02 09:06:03 +01:00
Eduardo Quezada
0322d51887
Split "Do nothing" move effects (#5613) 2024-12-02 09:05:04 +01:00
Eduardo Quezada
4635f0e0f8
Converted Stance Change to proper Form Change + Tests (#5749) 2024-12-01 22:36:25 +01:00
Eduardo Quezada
00cb7b36e1 Actually start 1.11.0 cycle 2024-12-01 15:36:39 -03:00
Eduardo Quezada
2e30e66e15 Begin 1.11.0 cycle 2024-12-01 15:33:42 -03:00
Eduardo Quezada
7e5327864e Start of 1.10.1 cycle 2024-12-01 15:27:01 -03:00
Eduardo Quezada
bd7a46f9c7 Version 1.10.0 2024-12-01 15:10:46 -03:00
Eduardo Quezada
720938f040 Fix conflicts 2024-12-01 14:28:26 -03:00
Eduardo Quezada
7010080465 Merge branch '_RHH/upcoming' into _RHH/pr/master/1.10.0 2024-12-01 14:28:12 -03:00
Eduardo Quezada
6fe935f1b8 Version 1.9.4 2024-12-01 14:04:13 -03:00
Alex
0ca588943b
Fixes choiced moves not locked in after ability block (#5738) 2024-12-01 13:45:35 +01:00
Eduardo Quezada
1a581c407c Merge branch '_RHH/master' into _RHH/upcoming 2024-12-01 08:11:32 -03:00
Alex
b3b0973fbb
Fixes Population Bomb / Triple Kick missing message (#5747) 2024-11-30 18:06:17 -05:00
hedara90
e4ef3a440f
Automatic Line Breaks, somewhat even lines (#5689)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-29 18:46:45 +01:00
Hedara
f6fdca615f Merge branch 'master' into master-to-upcoming 2024-11-29 11:32:12 +01:00
Alex
0f4b598984
Fixes Aegislash not reverting back (#5734) 2024-11-28 23:21:42 +01:00
Alex
88cdd8bdfb
Fixes Kee Maranga and Enigma Berry (#5727) 2024-11-28 11:22:32 +01:00
Alex
6b170d70f1
Fixes Red Card / Eject Pack interaction (#5724) 2024-11-27 14:05:11 -05:00
GriffinR
382ee9e276 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-11-23 16:10:33 -05:00
Alex
194f7644b8
Changes taget bit of Flower Shield (#5698) 2024-11-23 12:02:40 -05:00
AlexOn1ine
97b30cb712 simultaneous hp reduction 2024-11-23 08:35:01 +01:00