LOuroboros
|
4be4ec3081
|
metatitleBehavior -> metatileBehavior
|
2023-02-17 16:43:22 -03:00 |
|
GriffinR
|
bc3805f9d3
|
Fix two binary palettes
|
2023-02-17 13:27:39 -05:00 |
|
DizzyEggg
|
66d2f253a1
|
merge with master
|
2023-02-17 15:43:15 +01:00 |
|
Jaizu
|
31316dbfd2
|
Merge pull request #2529 from mrgriffin/rhh-battlescript-cmd-args
Readable BattleScript command arguments
|
2023-02-17 15:35:03 +01:00 |
|
DizzyEggg
|
0c523f9518
|
Fix Magic bounce powder moves against grass types (#2633)
* Fix Magic bounce powder moves against grass types
|
2023-02-17 13:55:51 +00:00 |
|
DizzyEggg
|
56c9564e7a
|
8th gen Howl's effect (#2700)
* Howl gen8 effect
|
2023-02-17 10:28:46 +00:00 |
|
Martin Griffin
|
0573aa455a
|
Introduce macros to parse battle script arguments
CMD_ARGS for regular commands, VARIOUS_ARGS for various commands, and
NATIVE_ARGS for callnative commands.
|
2023-02-17 10:05:57 +00:00 |
|
Eduardo Quezada D'Ottone
|
625a7622e2
|
Merge pull request #2697 from AsparagusEduardo/RHH/sync/pret_20230214
It's ya boi, pret merge! (pret merge 2023/02/16)
|
2023-02-16 21:57:41 -03:00 |
|
Eduardo Quezada
|
a60b179bcb
|
Incorporated fixes from upstream
|
2023-02-16 18:20:54 -03:00 |
|
DizzyEggg
|
d637ee3b13
|
Fix After You for gen8 (#2646)
Fix After You
|
2023-02-16 20:59:36 +00:00 |
|
DizzyEggg
|
6cdca24c31
|
use forced switch battler bit
|
2023-02-16 21:58:00 +01:00 |
|
DizzyEggg
|
d7f68a3893
|
IsAceMon - not isAceMon
|
2023-02-16 15:57:15 +01:00 |
|
Martin Griffin
|
6b08120d5f
|
Merge pull request #2695 from SBird1337/hydra/better-output
Improve Hydra output
|
2023-02-16 14:42:51 +00:00 |
|
ghoulslash
|
f4ef67d897
|
Merge pull request #2689 from DizzyEggg/grenja
Fix Battle Bond activating multiple times in battle
|
2023-02-16 09:36:02 -05:00 |
|
sbird
|
0d78b29902
|
[test, output] display KNOWN_FAILING in yellow
|
2023-02-16 15:31:28 +01:00 |
|
ghoulslash
|
6b0b427d93
|
Merge pull request #2680 from DizzyEggg/mirror_armor
Fix Mirror Armor against Clear Body
|
2023-02-16 09:29:04 -05:00 |
|
DizzyEggg
|
978d342953
|
use NUM_BATTLE_SIDES
|
2023-02-16 15:26:26 +01:00 |
|
ghoulslash
|
05bef50a1f
|
Merge pull request #2658 from DizzyEggg/one_vs_two_egg
Fix 1 vs 2 battles with eggs
|
2023-02-16 09:20:18 -05:00 |
|
ghoulslash
|
60a3da5811
|
Merge pull request #2691 from DizzyEggg/clang_scales
Fix Clanging Scales target and effect
|
2023-02-16 09:13:33 -05:00 |
|
DizzyEggg
|
4c18ed2bd4
|
remove comment
|
2023-02-16 15:11:48 +01:00 |
|
ghoulslash
|
8c81cf1e66
|
Merge pull request #2692 from DizzyEggg/shields_down
Fix Shield Down Ability pop-up
|
2023-02-16 09:11:24 -05:00 |
|
DizzyEggg
|
1c970afd6a
|
fix follow me working in singles (#2644)
* fix follow me working in singles
|
2023-02-16 10:53:29 +01:00 |
|
sbird
|
fea54c9277
|
[intro] add fading, refactor abort, align intro gfx
|
2023-02-16 10:43:50 +01:00 |
|
DizzyEggg
|
97f9c0a4d9
|
oof
|
2023-02-15 23:45:53 +01:00 |
|
DizzyEggg
|
f6a0c882d1
|
Fix Shield Down Ability pop-up
|
2023-02-15 23:44:00 +01:00 |
|
DizzyEggg
|
94651e77a5
|
Fix Clang Scales target and effect
|
2023-02-15 22:18:18 +01:00 |
|
Eduardo Quezada
|
7ddebb6671
|
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
# Conflicts:
# data/battle_ai_scripts.s
# src/menu_specialized.c
# src/mystery_gift_menu.c
|
2023-02-15 14:18:00 -03:00 |
|
Eduardo Quezada
|
b62e5aa72e
|
Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214
# Conflicts:
# src/battle_main.c
# src/field_specials.c
# src/trade.c
|
2023-02-15 14:11:03 -03:00 |
|
Eduardo Quezada
|
dbd02d3a56
|
Clarified Champion Ribbon's description to avoid being interpreted as needing to beat the champion in both RSE and FRLG.
|
2023-02-15 14:06:42 -03:00 |
|
Eduardo Quezada
|
bd54990333
|
Review changes
|
2023-02-15 13:56:11 -03:00 |
|
GriffinR
|
69fdf0faa4
|
Merge pull request #1853 from GriffinRichards/doc-contest-bar
Clarify AI_CV_AttackDown_UnknownTypeList
|
2023-02-15 11:29:57 -05:00 |
|
GriffinR
|
671c9c5353
|
Merge branch 'master' into doc-chat
|
2023-02-15 10:57:05 -05:00 |
|
GriffinR
|
ef950e6663
|
Merge pull request #1852 from GriffinRichards/doc-windows
Document window IDs
|
2023-02-15 10:47:13 -05:00 |
|
Alex
|
e4045a7a5f
|
z move pp color (#2690)
|
2023-02-15 16:19:09 +01:00 |
|
GriffinR
|
a322379feb
|
Merge branch 'master' into doc-windows
|
2023-02-15 10:04:48 -05:00 |
|
GriffinR
|
9c1c598160
|
GROUPTYPE_NONE to unsigned
|
2023-02-15 09:49:33 -05:00 |
|
DizzyEggg
|
3f0f7c6b7f
|
Fix Battle Bond activating multiple times in battle
|
2023-02-15 15:30:29 +01:00 |
|
Jaizu
|
e3e005b0cc
|
Merge pull request #2684 from LOuroboros/introFix
Fixed glitchy-looking water drops in the game's intro
|
2023-02-14 22:58:57 +01:00 |
|
LOuroboros
|
7885941d3c
|
Tweaked Task_HandleExpansionIntro to fix the water drops glitch
Thanks to Tustin2121.
|
2023-02-14 14:03:18 -03:00 |
|
ghoulslash
|
908b509401
|
Fix Round's Base Power calc, Add Turn order effects (#2602)
* fix round base power calc, add turn order change
* remove unused callnative cmd
* fix round turn order update
* fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-02-14 16:49:50 +01:00 |
|
ghoulslash
|
094554b3a3
|
Merge pull request #2681 from DizzyEggg/jaw_lock
Fix Jaw Lock locking player pokemon
|
2023-02-13 10:40:47 -05:00 |
|
DizzyEggg
|
2b4d2a7695
|
Fix Jaw Lock locking player pokemon
|
2023-02-13 16:27:21 +01:00 |
|
ghoulslash
|
d1ef53f93a
|
Merge pull request #2678 from AlexOn1ine/z_indicator_in_doubles
Z-Move Indicator was wrongly displayed in double battles
|
2023-02-13 08:52:06 -05:00 |
|
DizzyEggg
|
0577d8d04d
|
Fix Mirror Armor against Clear Body
|
2023-02-13 14:44:34 +01:00 |
|
ghoulslash
|
c399391891
|
Merge pull request #2677 from AlexOn1ine/z_moves_switch_order
Fix switching Z-Moves when pressing SELECT in battle
|
2023-02-13 08:41:58 -05:00 |
|
DizzyEggg
|
5d958e245a
|
Merge pull request #2669 from Jaizu/giga_impact_contests
Fix Giga Impact on contests.
|
2023-02-13 09:22:24 +01:00 |
|
Alex
|
2b32bfcdc1
|
add battlerId arg to ShowZMoveTriggerSprite
|
2023-02-12 19:39:14 +01:00 |
|
Eduardo Quezada
|
a937b3221a
|
Documented Ribbons
|
2023-02-11 23:16:24 -03:00 |
|
Eduardo Quezada
|
96865f66af
|
Updated term to modernFatefulEncounter
|
2023-02-11 22:36:42 -03:00 |
|
Eduardo Quezada
|
6da5e0a280
|
Rename eventLegal to fatefulEncounter
|
2023-02-11 17:13:53 -03:00 |
|