Commit Graph

12445 Commits

Author SHA1 Message Date
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
GriffinR
d3d680c1dd Sort metatile labels alphabetically 2023-02-14 14:36:27 -05:00
LOuroboros
7885941d3c Tweaked Task_HandleExpansionIntro to fix the water drops glitch
Thanks to Tustin2121.
2023-02-14 14:03:18 -03:00
GriffinR
b656565af0 Standardize RS mossdeep gym metatile labels 2023-02-14 11:42:13 -05:00
GriffinR
0df56b808d Remove duplicate metatile label sections 2023-02-14 11:40:15 -05: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
d699d55ba3 Reformatted gNatureStatTable 2023-02-12 01:19:03 -03: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
Alex
d363ed8152 z indicator in double battles 2023-02-11 19:55:08 +01:00
Alex
ce416be297 z_move switch move bug 2023-02-11 18:32:07 +01:00
Eduardo Quezada D'Ottone
59f367b165
Merge pull request #2665 from SBird1337/refactor/rhh-credits
[intro] refactor expansion intro
2023-02-11 09:23:48 -03:00
Martin Griffin
f933ad3183 Build patchelf and hydra only for check 2023-02-10 18:06:15 +01:00
Martin Griffin
d59e576b51
Hydra: remove tmpnam (#2668)
* Use a PID-based filename instead of tmpnam

* Use FILENAME_MAX over L_tmpnam

---------

Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
2023-02-09 23:54:11 +01:00
Martin Griffin
074f1b544e Use variable in patchelf invocation 2023-02-09 23:29:14 +01:00
sbird
dac138cef6 [test] add some ability tests 2023-02-09 23:25:25 +01:00
sbird
4bcbb7c9e1 [intro] refactor expansion intro 2023-02-09 23:12:29 +01:00
ghoulslash
8ac3197c85
Merge pull request #2671 from DizzyEggg/spacial_rend
Fix Spacial Rend animation
2023-02-09 08:22:47 -05:00
ghoulslash
deb23fc7c6
Merge pull request #2648 from AlexOn1ine/pollen_puff
Fixes Pollen Puff issue #2611
2023-02-09 08:21:33 -05:00
ghoulslash
27933836b5
Merge pull request #2662 from AlexOn1ine/heal_pulse_v2
Add Logic for Heal Pulse effects in double battles
2023-02-09 08:18:00 -05:00
DizzyEggg
513ecd50ba Fix Spacial Rend animation 2023-02-09 13:24:23 +01:00
Jaizu
9f7267e48d Fix Giga Impact on contests. 2023-02-09 11:29:29 +01:00
GriffinR
c32fbf594a
Merge pull request #1851 from GriffinRichards/doc-fldspc
Document remaining field_specials task data
2023-02-08 22:34:57 -05:00
Eduardo Quezada D'Ottone
cd8bf15f3c
Merge pull request #2666 from DizzyEggg/base_stats_info
Fix SpeciesInfo(base stats) struct offset labels
2023-02-08 19:57:11 -03:00
DizzyEggg
0048e59e05 Fix SpeciesInfo struct offsets 2023-02-08 22:08:12 +01:00
GriffinR
c29cf5a5e5 Remove unnecessary version check 2023-02-08 13:34:38 -05:00
GriffinR
de56e400ff Sync clone object macro 2023-02-08 13:11:10 -05:00
GriffinR
118a9701c9 Add event type errors 2023-02-08 12:52:28 -05:00
GriffinR
db5edc49d7 Sync mapjson 2023-02-08 12:52:06 -05:00
Eduardo Quezada D'Ottone
8381b14c51
Implemented Xhyzi's RHH copyright intro (with config) (#2415)
* Rhh & Pret Copyright Screen

* Porygon recovered his voice

* Expansion text

---------

Co-authored-by: Xhyzi <xhyzdot@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
2023-02-08 15:54:12 +01:00